Index: openacs-4/packages/acs-lang/www/admin/export-messages.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/export-messages.adp,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/acs-lang/www/admin/export-messages.adp	9 Dec 2003 13:41:52 -0000	1.1.2.1
+++ openacs-4/packages/acs-lang/www/admin/export-messages.adp	10 Dec 2003 10:21:25 -0000	1.1.2.2
@@ -20,9 +20,11 @@
   Export complete.
 </p>
 
-<p>
-  Catalog files are stored in the directory <b>@catalog_dir@</b>.
-</p>
+<if @package_key@ not nil>
+  <p>
+    Catalog files are stored in the directory <b>@catalog_dir@</b>.
+  </p>
+</if>
 
 <p>
   <b>&raquo;</b> <a href="@return_url@">Return</a>
Index: openacs-4/packages/acs-lang/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/index.adp,v
diff -u -r1.14.2.2 -r1.14.2.3
--- openacs-4/packages/acs-lang/www/admin/index.adp	9 Dec 2003 13:41:52 -0000	1.14.2.2
+++ openacs-4/packages/acs-lang/www/admin/index.adp	10 Dec 2003 10:21:25 -0000	1.14.2.3
@@ -25,6 +25,15 @@
   <b>&raquo;</b> <a href="lookup">Look up message</a>
 </p>
 
+<if @site_wide_admin_p@>
+  <p>
+    <b>&raquo;</b> <a href="@import_url@" title="Imports messages system-wide from catalog files" onclick="return confirm('Are you sure you want to import all I18N messages from catalog files?');">Import all messages</a>
+  </p>
+  <p>
+    <b>&raquo;</b> <a href="@export_url@" title="Export messages system-wide to catalog files" onclick="return confirm('Are you sure you want to export all I18N messages to catalog files?');">Export all messages</a>
+  </p>
+</if>
+
 <h2>Installed Locales</h2>
 
 <table cellpadding="0" cellspacing="0" border="0">
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.6.2.1 -r1.6.2.2
--- openacs-4/packages/acs-lang/www/admin/index.tcl	20 Nov 2003 05:45:13 -0000	1.6.2.1
+++ openacs-4/packages/acs-lang/www/admin/index.tcl	10 Dec 2003 10:21:25 -0000	1.6.2.2
@@ -17,15 +17,17 @@
 set page_title "Administration of Localization"
 set context [list]
 
+set site_wide_admin_p [acs_user::site_wide_admin_p]
 
 set timezone_p [lang::system::timezone_support_p]
 
 set timezone [lang::system::timezone]
 
 set translator_mode_p [lang::util::translator_mode_p]
 
+set import_url [export_vars -base import-messages]
+set export_url [export_vars -base export-messages]
 
-
 set parameter_url [export_vars -base "/shared/parameters" { {package_id {[ad_conn package_id]} } { return_url {[ad_return_url]} } }]
 
 
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.5.2.1 -r1.5.2.2
--- openacs-4/packages/acs-lang/www/admin/message-list.tcl	9 Dec 2003 13:41:52 -0000	1.5.2.1
+++ openacs-4/packages/acs-lang/www/admin/message-list.tcl	10 Dec 2003 10:21:25 -0000	1.5.2.2
@@ -30,10 +30,7 @@
 set page_title $package_key
 set context [list [list [export_vars -base package-list { locale }] $locale_label] $page_title]
 
-set site_wide_admin_p [permission::permission_p \
-                           -party_id [ad_conn user_id] \
-                           -object_id [acs_lookup_magic_object security_context_root] \
-                           -privilege "admin"]
+set site_wide_admin_p [acs_user::site_wide_admin_p]
 
 set export_messages_url [export_vars -base "export-messages" { package_key locale { return_url {[ad_return_url]} } }]
 set import_messages_url [export_vars -base "import-messages" { package_key locale { return_url {[ad_return_url]} } }]
Index: openacs-4/packages/acs-lang/www/admin/package-list.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/package-list.adp,v
diff -u -r1.4.2.1 -r1.4.2.2
--- openacs-4/packages/acs-lang/www/admin/package-list.adp	9 Dec 2003 13:41:52 -0000	1.4.2.1
+++ openacs-4/packages/acs-lang/www/admin/package-list.adp	10 Dec 2003 10:21:25 -0000	1.4.2.2
@@ -8,7 +8,7 @@
 
 <include src="/packages/acs-lang/lib/conflict-link" locale="@current_locale@" />
 
-<if @locale_enabled_p@>
+<if @locale_enabled_p@ and @site_wide_admin_p@>
   <p>
     <b>&raquo;</b> <a href="@import_all_url@" title="Imports all messages for this locale from the catalog files">Import all messages for this locale</a>
   </p>
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.4.2.1 -r1.4.2.2
--- openacs-4/packages/acs-lang/www/admin/package-list.tcl	9 Dec 2003 13:41:52 -0000	1.4.2.1
+++ openacs-4/packages/acs-lang/www/admin/package-list.tcl	10 Dec 2003 10:21:25 -0000	1.4.2.2
@@ -29,11 +29,11 @@
 set context [list $page_title]
 
 set locale_enabled_p [expr [lsearch [lang::system::get_locales] $current_locale] != -1]
+set site_wide_admin_p [acs_user::site_wide_admin_p]
 
 
 
 
-
 #####
 #
 # Package/message list
@@ -114,6 +114,5 @@
 }
 
 
-set import_all_url [export_vars -base import-messages { { locale $current_locale } }]
-set export_all_url [export_vars -base export-locale-to-files { { locale $current_locale } }]
-
+set import_all_url [export_vars -base import-messages { { locale $current_locale } {return_url {[ad_return_url]}} }]
+set export_all_url [export_vars -base export-messages { { locale $current_locale } {return_url {[ad_return_url]}} }]