Index: openacs-4/packages/acs-lang/www/admin/edit-localized-message.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/edit-localized-message.tcl,v
diff -u -r1.19 -r1.20
--- openacs-4/packages/acs-lang/www/admin/edit-localized-message.tcl	14 Jun 2015 00:11:01 -0000	1.19
+++ openacs-4/packages/acs-lang/www/admin/edit-localized-message.tcl	19 Jun 2015 17:58:53 -0000	1.20
@@ -51,7 +51,7 @@
 set delete_url [export_vars -base message-delete { locale package_key message_key show {return_url {[ad_return_url]}} }]
 
 
-ad_form -name message -form {
+ad_form -name message_form -form {
     {locale:text(hidden),optional {value $current_locale}}
     {package_key:text(hidden),optional {value $package_key}}
     {message_key:text(hidden),optional {value $message_key}}
@@ -69,17 +69,17 @@
 } 
 
 if { $default_locale ne $current_locale } {
-    ad_form -extend -name message -form {
+    ad_form -extend -name message_form -form {
         {original_message:text(inform)
             {label "$default_locale_label Message"}
         }
     }
 }
     
-ad_form -extend -name message -form {
+ad_form -extend -name message_form -form {
     {message:text(textarea)
         {label "$locale_label Message"} 
-        {html { rows 6 cols 40 }}
+        {html { rows 6 cols 40 } }
     }
     {comment:text(textarea),optional
         {label "Comment"}
@@ -122,12 +122,12 @@
     } else {
         set message $original_message
     }
-    set original_message [ad_quotehtml $original_message]
+    set original_message [ns_quotehtml $original_message]
 
     if { $description eq "" } {
-        set description [subst {(<a href="$description_edit_url">add description</a>)}]
+        set description [subst {(<a href="[ns_quotehtml $description_edit_url]">add description</a>)}]
     } else {
-        set description "[ad_text_to_html -- $description] [subst { (<a href="$description_edit_url">edit</a>)}]"
+        set description "[ad_text_to_html -- $description] [subst { (<a href="[ns_quotehtml $description_edit_url]">edit</a>)}]"
     }
 
     # Augment the audit trail with info on who created the first message
@@ -162,7 +162,11 @@
             }
         } 
 
-        set first_translated_message "<ul> <li>First translated by [acs_community_member_link -user_id $creation_user_id -label $creation_user_name] on $creation_date</li></ul>"
+        set first_translated_message [subst {
+	    <ul> <li>First translated by
+	    [acs_community_member_link -user_id $creation_user_id -label $creation_user_name] on $creation_date
+	    </li></ul>
+	}]
     } else {
         set first_translated_message ""
     }
@@ -182,7 +186,7 @@
     lang::message::register -comment $comment $locale $package_key $message_key $message
 
     if { $return_url eq "" } {
-        set return_url "[ad_conn url]?[export_vars { locale package_key message_key show }]"
+        set return_url [export_vars -base [ad_conn url] { locale package_key message_key show }]
     }
     ad_returnredirect $return_url
     ad_script_abort