Index: openacs-4/packages/acs-admin/www/auth/batch-job.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/auth/batch-job.tcl,v diff -u -N -r1.17.2.2 -r1.17.2.3 --- openacs-4/packages/acs-admin/www/auth/batch-job.tcl 16 Dec 2019 17:55:12 -0000 1.17.2.2 +++ openacs-4/packages/acs-admin/www/auth/batch-job.tcl 26 Sep 2020 10:43:42 -0000 1.17.2.3 @@ -11,7 +11,7 @@ auth::sync::job::get -job_id $job_id -array batch_job -set page_title "\#acs-admin.One_batch_job\#" +set page_title "#acs-admin.One_batch_job#" set context [list \ [list "." "[_ acs-admin.Authentication]"] \ [list [export_vars -base authority { {authority_id $batch_job(authority_id)} }] "$batch_job(authority_pretty_name)"] $page_title] @@ -22,68 +22,71 @@ -display_buttons {} \ -form { {authority_pretty_name:text(inform) - {label "\#acs-admin.Authority_name\#"} + {label "#acs-admin.Authority_name#"} } {job_start_time:text(inform) - {label "\#acs-admin.Start_time\#"} + {label "#acs-admin.Start_time#"} } {job_end_time:text(inform) - {label "\#acs-admin.End_time\#"} + {label "#acs-admin.End_time#"} } {run_time_seconds:text(inform) - {label "\#acs-admin.Running_time\#"} + {label "#acs-admin.Running_time#"} {after_html " [_ acs-admin.seconds]"} } {interactive_p:text(inform) - {label "\#acs-admin.Interactive\#"} + {label "#acs-admin.Interactive#"} } {snapshot_p:text(inform) - {label "\#acs-admin.Snapshot\#"} + {label "#acs-admin.Snapshot#"} } {message:text(inform) - {label "\#acs-admin.Message"} + {label "#acs-admin.Message#"} } - {creation_user:text(inform) - {label "\#acs-admin.Creation_user\#"} + {creation_user:text(inform),noquote + {label "#acs-admin.Creation_user#"} } {doc_start_time:text(inform) - {label "\#acs-admin.Document_start_time\#"} + {label "#acs-admin.Document_start_time#"} } {doc_end_time:text(inform) - {label "\#acs-admin.Document_end_time\#"} + {label "#acs-admin.Document_end_time#"} } {doc_status:text(inform) - {label "\#acs-admin.Document_status\#"} + {label "#acs-admin.Document_status#"} } {doc_message:text(inform) - {label "\#acs-admin.Document_message\#"} + {label "#acs-admin.Document_message#"} } - {document_download:text(inform) - {label "\#acs-admin.Document\#"} + {document_download:text(inform),noquote + {label "#acs-admin.Document#"} } {num_actions:text(inform) - {label "\#acs-admin.Number_of_actions\#"} + {label "#acs-admin.Number_of_actions#"} } {num_problems:text(inform) - {label "\#acs-admin.Number_of_problems\#"} + {label "#acs-admin.Number_of_problems#"} } } -on_request { foreach element_name [array names batch_job] { # Make certain columns pretty for display if { [regexp {_p$} $element_name] } { set $element_name [expr {$batch_job($element_name) eq "t" ? - "[_ acs-kernel.common_Yes]" : "[_ acs-kernel.common_No]"}] + [_ acs-kernel.common_Yes] : [_ acs-kernel.common_No]}] } elseif { $element_name eq "creation_user" && $batch_job($element_name) ne "" } { set $element_name [acs_community_member_link -user_id $batch_job($element_name)] } else { set $element_name [ns_quotehtml $batch_job($element_name)] } + ns_log notice "element_name $element_name '[set $element_name]'" } set job_start_time [lc_time_fmt $batch_job(job_start_time) "%x %X"] set job_end_time [lc_time_fmt $batch_job(job_end_time) "%x %X"] - set document_download "[_ acs-admin.download]" + set document_download [subst { + [_ acs-admin.download] + }] } list::create \ @@ -94,37 +97,37 @@ -page_query_name pagination \ -elements { entry_time_pretty { - label "\#acs-admin.Timestamp\#" + label "#acs-admin.Timestamp#" link_url_eval {$entry_url} - link_html { title "\#acs-admin.View_log_entry\#" } + link_html { title "#acs-admin.View_log_entry#" } } operation { - label "\#acs-admin.Operation\#" + label "#acs-admin.Operation#" } username { - label "\#acs-admin.Username\#" + label "#acs-admin.Username#" link_url_col user_url } success_p { - label "\#acs-admin.Success\#" + label "#acs-admin.Success#" display_template { - \#acs-admin.Yes\# + #acs-admin.Yes# - \#acs-admin.No\# + #acs-admin.No# } } short_message { - label "\#acs-admin.Message\#" + label "#acs-admin.Message#" } } -filters { job_id { hide_p 1 } success_p { - label "\#acs-admin.Success\#" + label "#acs-admin.Success#" values { { Success t } { Failure f }