[open-ils-commits] r8434 - in trunk/Open-ILS/xul/staff_client/server: admin cat locale/en-US

svn at svn.open-ils.org svn at svn.open-ils.org
Sat Jan 19 16:01:14 EST 2008 

Author: dbs
Date: 2008-01-19 15:35:15 -0500 (Sat, 19 Jan 2008)
New Revision: 8434

Added:
   trunk/Open-ILS/xul/staff_client/server/locale/en-US/admin.properties
Modified:
   trunk/Open-ILS/xul/staff_client/server/admin/font_settings.xul
   trunk/Open-ILS/xul/staff_client/server/admin/offline_manage_xacts.xul
   trunk/Open-ILS/xul/staff_client/server/cat/copy_buckets.xul
   trunk/Open-ILS/xul/staff_client/server/locale/en-US/cat.properties
Log:
Server-side XUL uses server-side message catalogs


Modified: trunk/Open-ILS/xul/staff_client/server/admin/font_settings.xul
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/admin/font_settings.xul	2008-01-19 20:33:26 UTC (rev 8433)
+++ trunk/Open-ILS/xul/staff_client/server/admin/font_settings.xul	2008-01-19 20:35:15 UTC (rev 8434)
@@ -128,8 +128,8 @@
 	]]>
 	</script>
 
-	<messagecatalog id="commonStrings" src="chrome://open_ils_staff_client/locale/common.properties"/>
-	<messagecatalog id="adminStrings" src="chrome://open_ils_staff_client/locale/admin.properties"/>
+	<messagecatalog id="commonStrings" src='/xul/server/locale/<!--#echo var="locale"-->/common.properties'/>
+	<messagecatalog id="adminStrings" src='/xul/server/locale/<!--#echo var="locale"-->/admin.properties'/>
 
 	<groupbox orient="vertical">
 		<caption label="&staff.server.admin.font.sound.caption;"/>

Modified: trunk/Open-ILS/xul/staff_client/server/admin/offline_manage_xacts.xul
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/admin/offline_manage_xacts.xul	2008-01-19 20:33:26 UTC (rev 8433)
+++ trunk/Open-ILS/xul/staff_client/server/admin/offline_manage_xacts.xul	2008-01-19 20:35:15 UTC (rev 8434)
@@ -52,8 +52,8 @@
 
 	]]>
 	</script>
-	<messagecatalog id="commonStrings" src="chrome://open_ils_staff_client/locale/common.properties"/>
-	<messagecatalog id="adminStrings" src="chrome://open_ils_staff_client/locale/admin.properties"/>
+	<messagecatalog id="commonStrings" src="/xul/server/locale/<!--#echo var='locale'-->/common.properties"/>
+	<messagecatalog id="adminStrings" src="/xul/server/locale/<!--#echo var='locale'-->/admin.properties"/>
 
 	<vbox id="admin_offline_manage_xacts_main" flex="1">
 

Modified: trunk/Open-ILS/xul/staff_client/server/cat/copy_buckets.xul
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/cat/copy_buckets.xul	2008-01-19 20:33:26 UTC (rev 8433)
+++ trunk/Open-ILS/xul/staff_client/server/cat/copy_buckets.xul	2008-01-19 20:35:15 UTC (rev 8434)
@@ -35,7 +35,7 @@
 		function my_init() {
 			try {
 				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-		                if (typeof JSAN == 'undefined') { throw( "The JSAN library object is missing."); }
+				if (typeof JSAN == 'undefined') { throw( document.getElementById("commonStrings").getString('common.jsan.missing') ); }
 				JSAN.errorLevel = "die"; // none, warn, or die
 				JSAN.addRepository('/xul/server/');
 				JSAN.use('util.error'); g.error = new util.error();
@@ -60,13 +60,11 @@
 				);
 	
 				if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
-					try { window.xulG.set_tab_name('Copy Buckets'); } catch(E) { alert(E); }
+					try { window.xulG.set_tab_name(document.getElementById("catStrings").getString('cat.copy_buckets.tab')); } catch(E) { alert(E); }
 				}
 
 			} catch(E) {
-				var err_msg = "!! This software has encountered an error.  Please tell your friendly " +
-					"system administrator or software developer the following:\n" 
-					+ 'cat.copy_buckets.xul\n' + E + '\n';
+				var err_msg = document.getElementById("commonStrings").getFormattedString('common.exception', ["cat/copy_buckets.xul", E]);
 				try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
 				alert(err_msg);
 			}
@@ -75,6 +73,7 @@
 	]]>
 	</script>
 
+	<messagecatalog id="commonStrings" src="/xul/server/locale/<!--#echo var='locale' -->/common.properties"/>
 	<messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale' -->/cat.properties"/>
 
 	<commandset id="copy_buckets_cmds">

Copied: trunk/Open-ILS/xul/staff_client/server/locale/en-US/admin.properties (from rev 8431, trunk/Open-ILS/xul/staff_client/chrome/locale/en-US/admin.properties)
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/locale/en-US/admin.properties	                        (rev 0)
+++ trunk/Open-ILS/xul/staff_client/server/locale/en-US/admin.properties	2008-01-19 20:35:15 UTC (rev 8434)
@@ -0,0 +1,29 @@
+staff.admin.font_settings.sound=Sound preference saved to file system.
+staff.admin.font_settings.save=Global Font saved to file system.
+staff.admin.font_settings.sound.disabled=Sound is now disabled.
+staff.admin.font_settings.sound.enabled=Sound is now enabled.
+staff.admin.font_settings.status_msg.ALL_FONTS_SMALLER=Global Font Adjust set to Smaller than Default
+staff.admin.font_settings.status_msg.ALL_FONTS_DEFAULT=Global Font Adjust set to Default
+staff.admin.font_settings.status_msg.ALL_FONTS_LARGER=Global Font Adjust set to Larger than Default
+staff.admin.font_settings.status_msg.ALL_FONTS_XX_SMALL=Global Font set to XX-Small
+staff.admin.font_settings.status_msg.ALL_FONTS_X_SMALL=Global Font set to X-Small
+staff.admin.font_settings.status_msg.ALL_FONTS_SMALL=Global Font set to Small
+staff.admin.font_settings.status_msg.ALL_FONTS_MEDIUM=Global Font set to Medium
+staff.admin.font_settings.status_msg.ALL_FONTS_LARGE=Global Font set to Large
+staff.admin.font_settings.status_msg.ALL_FONTS_X_LARGE=Global Font set to X-Large
+staff.admin.font_settings.status_msg.ALL_FONTS_XX_LARGE=Global Font set to XX-Large
+staff.admin.font_settings.status_msg.ALL_FONTS_5PT=Global Font set to 5pt
+staff.admin.font_settings.status_msg.ALL_FONTS_6PT=Global Font set to 6pt
+staff.admin.font_settings.status_msg.ALL_FONTS_7PT=Global Font set to 7pt
+staff.admin.font_settings.status_msg.ALL_FONTS_8PT=Global Font set to 8pt
+staff.admin.font_settings.status_msg.ALL_FONTS_9PT=Global Font set to 9pt
+staff.admin.font_settings.status_msg.ALL_FONTS_10PT=Global Font set to 10pt
+staff.admin.font_settings.status_msg.ALL_FONTS_11PT=Global Font set to 11pt
+staff.admin.font_settings.status_msg.ALL_FONTS_12PT=Global Font set to 12pt
+staff.admin.font_settings.status_msg.ALL_FONTS_13PT=Global Font set to 13pt
+staff.admin.font_settings.status_msg.ALL_FONTS_14PT=Global Font set to 14pt
+staff.admin.font_settings.status_msg.ALL_FONTS_15PT=Global Font set to 15pt
+staff.admin.font_settings.status_msg.ALL_FONTS_16PT=Global Font set to 16pt
+staff.admin.font_settings.status_msg.ALL_FONTS_17PT=Global Font set to 17pt
+staff.admin.font_settings.status_msg.ALL_FONTS_18PT=Global Font set to 18pt
+staff.admin.font_settings.status_msg.ALL_FONTS_DEFAULT=Global Font Adjust set to Default

Modified: trunk/Open-ILS/xul/staff_client/server/locale/en-US/cat.properties
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/locale/en-US/cat.properties	2008-01-19 20:33:26 UTC (rev 8433)
+++ trunk/Open-ILS/xul/staff_client/server/locale/en-US/cat.properties	2008-01-19 20:35:15 UTC (rev 8434)
@@ -1,2 +1,3 @@
 cat.barcode_for_item=The barcode for the item is %1$s
 cat.batch_operation_failed=The whole batch operation failed. %1$s
+cat.copy_buckets.tab=Copy Buckets

More information about the open-ils-commits mailing list