Index: openacs-4/packages/acs-lang/lib/messages-to-translate.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/lib/messages-to-translate.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-lang/lib/messages-to-translate.tcl	10 Jan 2007 21:22:03 -0000	1.7
+++ openacs-4/packages/acs-lang/lib/messages-to-translate.tcl	27 Jun 2015 16:23:12 -0000	1.8
@@ -50,7 +50,12 @@
         set key_split [split $message_key "."]
         set package_key_part [lindex $key_split 0]
         set message_key_part [lindex $key_split 1]
-        set translate_url "/acs-lang/admin/edit-localized-message?[export_vars {{message_key $message_key_part} {package_key $package_key_part} locale { return_url [ad_return_url] } }]"
+        set translate_url [export_vars -base /acs-lang/admin/edit-localized-message {
+	    {message_key $message_key_part}
+	    {package_key $package_key_part}
+	    locale
+	    {return_url [ad_return_url]}
+	}]
 
         set translated_p [lang::message::message_exists_p [ad_conn locale] $message_key]
         
Index: openacs-4/packages/acs-lang/tcl/lang-message-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/lang-message-procs.tcl,v
diff -u -r1.52 -r1.53
--- openacs-4/packages/acs-lang/tcl/lang-message-procs.tcl	27 Oct 2014 16:39:37 -0000	1.52
+++ openacs-4/packages/acs-lang/tcl/lang-message-procs.tcl	27 Jun 2015 16:23:12 -0000	1.53
@@ -705,7 +705,7 @@
     @author Peter Marklund
 } {
     # Make sure messages are in the cache
-    cache
+    lang::message::cache
 
     return [nsv_exists lang_message_$locale $key]        
 }
@@ -775,7 +775,7 @@
     @return A localized piece of text.
 } { 
     # Make sure messages are in the cache
-    cache
+    lang::message::cache
 
     # Make sure that a default of "" is transformed into Translation Missing
     # As per discussion on IRC on 2008-03-06
Index: openacs-4/packages/acs-lang/www/admin/batch-editor.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/batch-editor.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/acs-lang/www/admin/batch-editor.tcl	19 Jun 2015 17:58:53 -0000	1.9
+++ openacs-4/packages/acs-lang/www/admin/batch-editor.tcl	27 Jun 2015 16:23:12 -0000	1.10
@@ -172,7 +172,7 @@
                    {value "<a href=\"[ns_quotehtml $message_url]\">$package_key.$message_key</a>"}]]
     
     if { $description ne "" } {
-        set description_edit_url "edit-description?[export_vars { locale package_key message_key show }]"
+        set description_edit_url [export_vars -base edit-description { locale package_key message_key show }]
         set description "[ad_text_to_html -- $description] [subst { (<a href="[ns_quotehtml $description_edit_url]">edit</a>)}]"
 
         ad_form -extend -name batch_editor -form \
@@ -239,7 +239,7 @@
         }
     }        
 
-    ad_returnredirect "[ad_conn url]?[export_vars { locale package_key show page_start }]"
+    ad_returnredirect [export_vars -base [ad_conn url] { locale package_key show page_start }]
     ad_script_abort 
 }
 
@@ -276,7 +276,7 @@
     multirow append pagination \
         $text \
         "[lindex $keys $count] - [lindex $keys $end_page]" \
-        "batch-editor?[export_vars { { page_start $count } locale package_key show }]" \
+        [export_vars -base batch-editor { { page_start $count } locale package_key show }] \
         [expr {$count == $page_start}] \
         [expr {$count / 100}]
 }
@@ -302,9 +302,9 @@
 multirow foreach show_opts {
     set selected_p [string equal $show $value]
     if {$value eq "all"} {
-        set url "[ad_conn url]?[export_vars { locale package_key }]"
+        set url [export_vars -base [ad_conn url] { locale package_key }]
     } else { 
-        set url "[ad_conn url]?[export_vars { locale package_key {show $value} }]"
+        set url [export_vars -base [ad_conn url] { locale package_key {show $value} }]
     }
 }
 
Index: openacs-4/packages/acs-lang/www/admin/edit-description.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/edit-description.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-lang/www/admin/edit-description.tcl	26 Feb 2005 16:00:10 -0000	1.3
+++ openacs-4/packages/acs-lang/www/admin/edit-description.tcl	27 Jun 2015 16:23:12 -0000	1.4
@@ -19,9 +19,9 @@
 set default_locale_label [lang::util::get_label $default_locale]
 
 set page_title "Edit description"
-set context [list [list "package-list?[export_vars { locale }]" $locale_label] \
-                 [list "message-list?[export_vars { locale package_key message_key show }]" $package_key] \
-                 [list "edit-localized-message?[export_vars { locale package_key message_key show }]" "$package_key.$message_key"] \
+set context [list [list [export_vars -base package-list { locale }] $locale_label] \
+                 [list [export_vars -base message-list { locale package_key message_key show }] $package_key] \
+                 [list [export_vars -base edit-localized-message { locale package_key message_key show }] "$package_key.$message_key"] \
                  $page_title]
 
 
@@ -55,6 +55,6 @@
         -message_key $message_key \
         -description $description
 
-    ad_returnredirect "edit-localized-message?[export_vars { locale package_key message_key show }]"
+    ad_returnredirect [export_vars -base edit-localized-message { locale package_key message_key show }]
     ad_script_abort
 }
Index: openacs-4/packages/acs-lang/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/index.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/acs-lang/www/admin/index.tcl	8 Apr 2011 11:57:15 -0000	1.11
+++ openacs-4/packages/acs-lang/www/admin/index.tcl	27 Jun 2015 16:23:12 -0000	1.12
@@ -67,12 +67,12 @@
     order  by locale_label
 } {
     set escaped_locale [ns_urlencode $locale]
-    set msg_edit_url "package-list?[export_vars { locale }]"
-    set locale_edit_url "locale-edit?[export_vars { locale }]"
-    set locale_delete_url "locale-delete?[export_vars { locale }]"
-    set locale_make_default_url "locale-make-default?[export_vars { locale }]"
+    set msg_edit_url [export_vars -base package-list { locale }]
+    set locale_edit_url [export_vars -base locale-edit { locale }]
+    set locale_delete_url [export_vars -base locale-delete { locale }]
+    set locale_make_default_url [export_vars -base locale-make-default { locale }]
     set toggle_enabled_p [ad_decode $enabled_p "t" "f" "t"]
-    set locale_enabled_p_url "locale-set-enabled-p?[export_vars { locale {enabled_p $toggle_enabled_p} }]"
+    set locale_enabled_p_url [export_vars -base locale-set-enabled-p { locale {enabled_p $toggle_enabled_p} }]
     
     set num_translated_pretty [lc_numeric $num_translated]
     set num_untranslated [expr {$num_messages - $num_translated}]
Index: openacs-4/packages/acs-lang/www/admin/localized-message-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/localized-message-new.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/acs-lang/www/admin/localized-message-new.tcl	18 Apr 2008 06:48:43 -0000	1.11
+++ openacs-4/packages/acs-lang/www/admin/localized-message-new.tcl	27 Jun 2015 16:23:12 -0000	1.12
@@ -24,8 +24,8 @@
 set default_locale_label [lang::util::get_label $default_locale]
 
 set page_title "Create New Message"
-set context [list [list "package-list?[export_vars { locale }]" $locale_label] \
-                 [list "message-list?[export_vars { locale package_key show }]" $package_key] \
+set context [list [list [export_vars -base package-list { locale }] $locale_label] \
+                 [list [export_vars -base message-list { locale package_key show }] $package_key] \
                  $page_title]
 
 
Index: openacs-4/packages/acs-lang/www/admin/message-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/message-delete.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-lang/www/admin/message-delete.tcl	14 Jun 2015 00:11:01 -0000	1.7
+++ openacs-4/packages/acs-lang/www/admin/message-delete.tcl	27 Jun 2015 16:23:12 -0000	1.8
@@ -24,8 +24,8 @@
 set default_locale_label [lang::util::get_label $default_locale]
 
 set page_title "Delete Message"
-set context [list [list "package-list?[export_vars { locale }]" $locale_label] \
-                 [list "message-list?[export_vars { locale package_key show }]" $package_key] \
+set context [list [list [export_vars -base package-list { locale }] $locale_label] \
+                 [list [export_vars -base message-list { locale package_key show }] $package_key] \
                  $page_title]
 
 set form_export_vars [export_vars -form { locale package_key message_key show {confirm_p 1} }]
@@ -37,6 +37,6 @@
         -message_key $message_key \
         -locale $locale
 
-    ad_returnredirect "message-list?[export_vars { locale package_key show }]"
+    ad_returnredirect [export_vars -base message-list { locale package_key show }]
     ad_script_abort
 }
Index: openacs-4/packages/acs-lang/www/admin/message-list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/message-list.tcl,v
diff -u -r1.16 -r1.17
--- openacs-4/packages/acs-lang/www/admin/message-list.tcl	19 Jun 2015 17:58:53 -0000	1.16
+++ openacs-4/packages/acs-lang/www/admin/message-list.tcl	27 Jun 2015 16:23:12 -0000	1.17
@@ -114,16 +114,16 @@
     delete_url
     message_key_pretty
 } messages select_messages {} {
-    set edit_url "edit-localized-message?[export_vars { locale package_key message_key show {return_url {[ad_return_url]}} }]"
-    set delete_url "message-delete?[export_vars { locale package_key message_key show {return_url {[ad_return_url]}} }]"
+    set edit_url [export_vars -base { locale package_key message_key show {return_url [ad_return_url]} }]
+    set delete_url [export_vars -base message-delete { locale package_key message_key show {return_url [ad_return_url]} }]
     set message_key_pretty "$package_key.$message_key"
 }
 
 # TODO: PG
 # TODO: Create message
 
 
-set batch_edit_url "batch-editor?[export_vars { locale package_key show }]"
+set batch_edit_url [export_vars -base batch-editor { locale package_key show }]
 
 
 #####
@@ -144,9 +144,9 @@
 multirow foreach show_opts {
     set selected_p [string equal $show $value]
     if {$value eq "all"} {
-        set url "[ad_conn url]?[export_vars { locale package_key }]"
+        set url [export_vars -base [ad_conn url] { locale package_key }]
     } else { 
-        set url "[ad_conn url]?[export_vars { locale package_key {show $value} }]"
+        set url [export_vars -base [ad_conn url] { locale package_key {show $value} }]
     }
 }
 
Index: openacs-4/packages/acs-lang/www/admin/message-search.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/message-search.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-lang/www/admin/message-search.tcl	27 Oct 2014 16:39:39 -0000	1.5
+++ openacs-4/packages/acs-lang/www/admin/message-search.tcl	27 Jun 2015 16:23:12 -0000	1.6
@@ -17,7 +17,7 @@
 set default_locale_label [lang::util::get_label $default_locale]
 
 set page_title "Search Messages"
-set context [list [list "package-list?[export_vars { locale }]" $locale_label] $page_title]
+set context [list [list [export_vars -base package-list { locale }] $locale_label] $page_title]
 
 set default_locale en_US
 
@@ -64,18 +64,18 @@
         edit_url
         message_key_pretty
     } messages select_messages {} {
-        set edit_url "edit-localized-message?[export_vars { locale package_key message_key {return_url {[ad_return_url]} } }]"
-        set package_url "message-list?[export_vars { locale package_key }]"
+        set edit_url [export_vars -base edit-localized-message { locale package_key message_key {return_url [ad_return_url]} }]
+        set package_url [export_vars -base message-list { locale package_key }]
         set message_key_pretty "$package_key.$message_key"
     }
 
     if { $current_locale ne $default_locale } {
         if {$default_locale eq $search_locale} {
             set other_locale $locale_label
-            set other_search_url "[ad_conn url]?[export_vars { locale q {search_locale $current_locale} }]"
+            set other_search_url [export_vars -base [ad_conn url] { locale q {search_locale $current_locale} }]
         } else {
             set other_locale $default_locale_label
-            set other_search_url "[ad_conn url]?[export_vars { locale q {search_locale $default_locale} }]"
+            set other_search_url [export_vars -base [ad_conn url] { locale q {search_locale $default_locale} }]
         }
     }
 }
Index: openacs-4/packages/acs-lang/www/admin/package-list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/package-list.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/acs-lang/www/admin/package-list.tcl	27 Oct 2014 16:39:40 -0000	1.11
+++ openacs-4/packages/acs-lang/www/admin/package-list.tcl	27 Jun 2015 16:23:12 -0000	1.12
@@ -69,10 +69,10 @@
     set num_translated_pretty [lc_numeric $num_translated]
     set num_untranslated_pretty [lc_numeric $num_untranslated]
 
-    set batch_edit_url "batch-editor?[export_vars { locale package_key }]"
-    set view_messages_url "message-list?[export_vars { locale package_key }]"
-    set view_translated_url "message-list?[export_vars { locale package_key { show "translated" } }]"
-    set view_untranslated_url "message-list?[export_vars { locale package_key { show "untranslated" } }]"
+    set batch_edit_url [export_vars -base batch-editor { locale package_key }]
+    set view_messages_url [export_vars -base message-list { locale package_key }]
+    set view_translated_url [export_vars -base message-list { locale package_key { show "translated" } }]
+    set view_untranslated_url [export_vars -base message-list { locale package_key { show "untranslated" } }]
 }