Index: openacs-4/packages/dotlrn-fs/www/all-objects.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-fs/www/all-objects.tcl,v
diff -u -r1.18 -r1.18.2.1
--- openacs-4/packages/dotlrn-fs/www/all-objects.tcl	29 Jun 2018 17:27:19 -0000	1.18
+++ openacs-4/packages/dotlrn-fs/www/all-objects.tcl	1 Mar 2019 11:14:32 -0000	1.18.2.1
@@ -36,7 +36,7 @@
 
 set user_id [ad_conn user_id]
 
-set days_singular_or_plural [ad_decode $n_past_days "1" [_ dotlrn-fs.day] [_ dotlrn-fs.days]]
+set days_singular_or_plural [expr {$n_past_days == 1 ? [_ dotlrn-fs.day] : [_ dotlrn-fs.days]}]
 
 form create n_past_days_form -has_submit 1
 
@@ -100,11 +100,11 @@
     switch $type {
 	"folder" {
 	    set name_url "[site_node_object_map::get_url -object_id $object_id]?folder_id=$object_id"
-	    set content_size "$content_size item[ad_decode $content_size 1 {} s]"
+	    set content_size "$content_size item[expr {$content_size > 1 ? {s} : {}}]"
 	}
 	"url" {
 	    set name_url "${parent_url}url-goto?url_id=$object_id"
-	    set content_size "$content_size byte[ad_decode $content_size 1 {} s]"
+	    set content_size "$content_size byte[expr {$content_size > 1 ? {s} : {}}]"
 	}
 	default {
 	    set name_url "${parent_url}download/$file_upload_name?version_id=$live_revision" 
Index: openacs-4/packages/dotlrn-bm/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-bm/www/admin/index.tcl,v
diff -u -r1.7 -r1.7.2.1
--- openacs-4/packages/dotlrn-bm/www/admin/index.tcl	29 Jun 2018 17:27:19 -0000	1.7
+++ openacs-4/packages/dotlrn-bm/www/admin/index.tcl	1 Mar 2019 11:23:18 -0000	1.7.2.1
@@ -48,7 +48,7 @@
 db_multirow -extend {send_date_pretty message_url status_pretty} message_list get_mail_messages {} {
     set send_date_pretty [lc_time_fmt $send_date %q]
     set message_url "[lindex [site_node::get_url_from_object_id -object_id $package_id] 0]one?bulk_mail_id=$bulk_mail_id"
-    set status_pretty [ad_decode $status sent [_ bulk-mail.Sent] pending [_ bulk-mail.Pending] [_ bulk-mail.Cancelled]]
+    set status_pretty [switch $status { "sent" {_ bulk-mail.Sent} "pending" {_ bulk-mail.Pending} default {_ bulk-mail.Cancelled} }]
 }
 
 ad_return_template