Index: openacs-4/packages/acs-templating/tcl/acs-integration-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/acs-integration-procs.tcl,v diff -u -N -r1.26 -r1.27 --- openacs-4/packages/acs-templating/tcl/acs-integration-procs.tcl 24 Aug 2018 13:35:24 -0000 1.26 +++ openacs-4/packages/acs-templating/tcl/acs-integration-procs.tcl 24 Aug 2018 13:36:43 -0000 1.27 @@ -2,9 +2,9 @@ Interface to the ACS for the ArsDigita Templating System Procedures in this file only make sense if you use the template system together with the ArsDigita Community System - + @author Christian Brechbuehler - + @cvs-id $Id$ } @@ -19,10 +19,10 @@ -string:boolean {template ""} } { - This function is a wrapper for sundry template:: procs. Will set the - template for the current page to the file named in 'template'. + This function is a wrapper for sundry template:: procs. Will set the + template for the current page to the file named in 'template'. - @param template Name of template file + @param template Name of template file @param string If specified, will return the resulting page to the caller string instead sending it to the connection. @@ -31,7 +31,7 @@ template::set_file \ [template::util::url_to_file $template [ad_conn file]] } - + if { $string_p } { return [template::adp_parse \ [template::util::url_to_file $template [ad_conn file]] {}] @@ -87,7 +87,7 @@ ad_proc adp_parse_ad_conn_file {} { - + Handle a request for an adp and/or Tcl file in the template system based on the current setting of [ad_conn file]. This file is registered via rp_register_extension_handler @@ -109,17 +109,17 @@ set parsed_template [template::adp_parse $themed_template {}] if {$parsed_template ne ""} { - + # # acs-lang translator mode # if { [lang::util::translator_mode_p] } { set apm_package_url [apm_package_url_from_key "acs-lang"] - + # Attempt to move all message keys outside of tags while { [regsub -all {(<[^>]*)(\x02\(\x01[^\x01]*\x01\)\x02)([^>]*>)} $parsed_template {\2\1\3} parsed_template] } {} - + # Attempt to move all message keys outside of statements regsub -all -nocase {(]*>[^<]*)(\x02\(\x01[^\x01]*\x01\)\x02)([^<]*]*>)} $parsed_template {\2\1\3} parsed_template @@ -148,7 +148,7 @@ set key [string range $parsed_template [lindex $key 0] [lindex $key 1]] lassign [split $key "."] package_key message_key - set edit_url [export_vars -base "${apm_package_url}admin/edit-localized-message" { + set edit_url [export_vars -base "${apm_package_url}admin/edit-localized-message" { { locale {[ad_conn locale]} } package_key message_key { return_url [ad_return_url] } }] if { [lang::message::message_exists_p [ad_conn locale] $key] } { @@ -159,7 +159,7 @@ set edit_link [subst {*}] } else { # Message key missing entirely - set new_url [export_vars -base "${apm_package_url}admin/localized-message-new" { + set new_url [export_vars -base "${apm_package_url}admin/localized-message-new" { { locale en_US } package_key message_key { return_url [ad_return_url] } }] set edit_link [subst {@}] @@ -199,4 +199,3 @@ # tcl-indent-level: 4 # indent-tabs-mode: nil # End: -