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 -r1.20.2.5 -r1.20.2.6
--- openacs-4/packages/acs-templating/tcl/acs-integration-procs.tcl	21 Oct 2013 06:21:24 -0000	1.20.2.5
+++ openacs-4/packages/acs-templating/tcl/acs-integration-procs.tcl	7 Jul 2014 18:51:31 -0000	1.20.2.6
@@ -106,6 +106,7 @@
         #
 
         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 {(<[^>]*)(\x002\(\x001[^\x001]*\x001\)\x002)([^>]*>)} $parsed_template {\2\1\3} parsed_template] } {}
@@ -136,13 +137,11 @@
                 set after [string range $parsed_template [lindex $indices 1]+1 end]
 
                 set key [string range $parsed_template [lindex $key 0] [lindex $key 1]]
+                lassign [split $key "."] package_key message_key
 
-                set keyv [split $key "."]
-                set package_key [lindex $keyv 0]
-                set message_key [lindex $keyv 1]
+                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] } }]
 
-                set edit_url [export_vars -base "[apm_package_url_from_key "acs-lang"]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] } {
                     set edit_link "<a href=\"$edit_url\" title=\"$key\" style=\"color: green;\"><b>o</b></a>"
                 } else {
@@ -151,7 +150,8 @@
                         set edit_link "<a href=\"$edit_url\" title=\"$key\" style=\"background-color: yellow; color: red;\"><b>*</b></a>"
                     } else {
                         # Message key missing entirely
-                        set new_url [export_vars -base "[apm_package_url_from_key "acs-lang"]admin/localized-message-new" { { locale en_US } package_key message_key { return_url [ad_return_url] } }]
+                        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 "<a href=\"$new_url\" title=\"$key\" style=\"background-color: red; color: white;\"><b>@</b></a>"
                     }
                 }
@@ -168,3 +168,10 @@
     }
 }
 
+#
+# Local variables:
+#    mode: tcl
+#    tcl-indent-level: 4
+#    indent-tabs-mode: nil
+# End:
+