[open-ils-commits] r7656 - in
trunk/Open-ILS/xul/staff_client/chrome/content: admin cat circ main
svn at svn.open-ils.org
svn at svn.open-ils.org
Thu Aug 9 14:08:57 EDT 2007
Author: miker
Date: 2007-08-09 14:05:47 -0400 (Thu, 09 Aug 2007)
New Revision: 7656
Modified:
trunk/Open-ILS/xul/staff_client/chrome/content/admin/survey_wizard.xul
trunk/Open-ILS/xul/staff_client/chrome/content/cat/opac.xul
trunk/Open-ILS/xul/staff_client/chrome/content/circ/offline.xul
trunk/Open-ILS/xul/staff_client/chrome/content/circ/offline_checkin.js
trunk/Open-ILS/xul/staff_client/chrome/content/circ/offline_checkin.xul
trunk/Open-ILS/xul/staff_client/chrome/content/circ/offline_checkout.js
trunk/Open-ILS/xul/staff_client/chrome/content/circ/offline_checkout.xul
trunk/Open-ILS/xul/staff_client/chrome/content/main/bindings.xml
Log:
i18n fixation from Dan Scott and miker
Modified: trunk/Open-ILS/xul/staff_client/chrome/content/admin/survey_wizard.xul
===================================================================
--- trunk/Open-ILS/xul/staff_client/chrome/content/admin/survey_wizard.xul 2007-08-09 18:03:38 UTC (rev 7655)
+++ trunk/Open-ILS/xul/staff_client/chrome/content/admin/survey_wizard.xul 2007-08-09 18:05:47 UTC (rev 7656)
@@ -56,10 +56,10 @@
]]>
</script>
- <stringbundleset id="adminSet">
- <stringbundle id="commonStrings" src="chrome://open_ils_staff_client/locale/common.properties"/>
- <stringbundle id="adminStrings" src="chrome://open_ils_staff_client/locale/admin.properties"/>
- </stringbundleset>
+
+ <messagecatalog id="commonStrings" src="chrome://open_ils_staff_client/locale/common.properties"/>
+ <messagecatalog id="adminStrings" src="chrome://open_ils_staff_client/locale/admin.properties"/>
+
<!-- Layout to be filled in by overlays and javascript -->
<wizardpage id="page1"/>
Modified: trunk/Open-ILS/xul/staff_client/chrome/content/cat/opac.xul
===================================================================
--- trunk/Open-ILS/xul/staff_client/chrome/content/cat/opac.xul 2007-08-09 18:03:38 UTC (rev 7655)
+++ trunk/Open-ILS/xul/staff_client/chrome/content/cat/opac.xul 2007-08-09 18:05:47 UTC (rev 7656)
@@ -309,10 +309,10 @@
]]>
</script>
- <stringbundleset id="catBundleSet">
- <stringbundle id="commonStrings" src="chrome://open_ils_staff_client/locale/common.properties"/>
- <stringbundle id="catStrings" src="chrome://open_ils_staff_client/locale/cat.properties"/>
- </stringbundleset>
+
+ <messagecatalog id="commonStrings" src="chrome://open_ils_staff_client/locale/common.properties"/>
+ <messagecatalog id="catStrings" src="chrome://open_ils_staff_client/locale/cat.properties"/>
+
<vbox flex="1">
<deck id="top_pane"/>
Modified: trunk/Open-ILS/xul/staff_client/chrome/content/circ/offline.xul
===================================================================
--- trunk/Open-ILS/xul/staff_client/chrome/content/circ/offline.xul 2007-08-09 18:03:38 UTC (rev 7655)
+++ trunk/Open-ILS/xul/staff_client/chrome/content/circ/offline.xul 2007-08-09 18:05:47 UTC (rev 7656)
@@ -30,11 +30,14 @@
<script type="text/javascript" src="chrome://open_ils_staff_client/content/main/JSAN.js"/>
<script>
<![CDATA[
- var circStrings = document.getElementById('circStrings');
- var commonStrings = document.getElementById('commonStrings');
+ var circStrings;
+ var commonStrings;
function my_init() {
try {
+ circStrings = document.getElementById('circStrings');
+ commonStrings = document.getElementById('commonStrings');
+
netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
if (typeof JSAN == 'undefined') { throw(commonStrings.getString('common.jsan.missing')); }
JSAN.errorLevel = "die"; // none, warn, or die
Modified: trunk/Open-ILS/xul/staff_client/chrome/content/circ/offline_checkin.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/chrome/content/circ/offline_checkin.js 2007-08-09 18:03:38 UTC (rev 7655)
+++ trunk/Open-ILS/xul/staff_client/chrome/content/circ/offline_checkin.js 2007-08-09 18:05:47 UTC (rev 7656)
@@ -1,7 +1,11 @@
-var commonStrings = document.getElementById('commonStrings');
-var circStrings = document.getElementById('circStrings');
+var commonStrings;
+var circStrings;
+
function my_init() {
try {
+ commonStrings = document.getElementById('commonStrings');
+ circStrings = document.getElementById('circStrings');
+
netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
if (typeof JSAN == 'undefined') { throw(commonStrings.getString('common.jsan.missing')); }
JSAN.errorLevel = "die"; // none, warn, or die
Modified: trunk/Open-ILS/xul/staff_client/chrome/content/circ/offline_checkin.xul
===================================================================
--- trunk/Open-ILS/xul/staff_client/chrome/content/circ/offline_checkin.xul 2007-08-09 18:03:38 UTC (rev 7655)
+++ trunk/Open-ILS/xul/staff_client/chrome/content/circ/offline_checkin.xul 2007-08-09 18:05:47 UTC (rev 7656)
@@ -29,10 +29,10 @@
<script type="text/javascript" src="chrome://open_ils_staff_client/content/main/JSAN.js"/>
<script type="text/javascript" src="offline_checkin.js"/>
- <stringbundleset id="circBundleSet">
- <stringbundle id="commonStrings" src="chrome://open_ils_staff_client/locale/common.properties"/>
- <stringbundle id="circStrings" src="chrome://open_ils_staff_client/locale/circ.properties"/>
- </stringbundleset>
+
+ <messagecatalog id="commonStrings" src="chrome://open_ils_staff_client/locale/common.properties"/>
+ <messagecatalog id="circStrings" src="chrome://open_ils_staff_client/locale/circ.properties"/>
+
<groupbox flex="1">
<caption label="&staff.circ.offline_checkin.main.label;"/>
Modified: trunk/Open-ILS/xul/staff_client/chrome/content/circ/offline_checkout.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/chrome/content/circ/offline_checkout.js 2007-08-09 18:03:38 UTC (rev 7655)
+++ trunk/Open-ILS/xul/staff_client/chrome/content/circ/offline_checkout.js 2007-08-09 18:05:47 UTC (rev 7656)
@@ -1,8 +1,11 @@
-var commonStrings = document.getElementById('commonStrings');
-var circStrings = document.getElementById('circStrings');
+var commonStrings;
+var circStrings;
function my_init() {
try {
+ commonStrings = document.getElementById('commonStrings');
+ circStrings = document.getElementById('circStrings');
+
netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
if (typeof JSAN == 'undefined') { throw(commonStrings.getString('common.jsan.missing')); }
JSAN.errorLevel = "die"; // none, warn, or die
@@ -77,7 +80,7 @@
if (file._file.exists()) { g.delta = file.get_object()[0]; file.close(); } else { g.delta = 0; }
} catch(E) {
- var err_msg = commonStrings.getFormattedMessage('common.exception', ["circ/offline_checkout.xul", E]);
+ var err_msg = commonStrings.getFormattedString('common.exception', ["circ/offline_checkout.xul", E]);
try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
alert(err_msg);
}
Modified: trunk/Open-ILS/xul/staff_client/chrome/content/circ/offline_checkout.xul
===================================================================
--- trunk/Open-ILS/xul/staff_client/chrome/content/circ/offline_checkout.xul 2007-08-09 18:03:38 UTC (rev 7655)
+++ trunk/Open-ILS/xul/staff_client/chrome/content/circ/offline_checkout.xul 2007-08-09 18:05:47 UTC (rev 7656)
@@ -29,10 +29,10 @@
<script type="text/javascript" src="chrome://open_ils_staff_client/content/main/JSAN.js"/>
<script type="text/javascript" src="offline_checkout.js"/>
- <stringbundleset id="circBundleSet">
- <stringbundle id="commonStrings" src="chrome://open_ils_staff_client/locale/common.properties"/>
- <stringbundle id="circStrings" src="chrome://open_ils_staff_client/locale/circ.properties"/>
- </stringbundleset>
+
+ <messagecatalog id="commonStrings" src="chrome://open_ils_staff_client/locale/common.properties"/>
+ <messagecatalog id="circStrings" src="chrome://open_ils_staff_client/locale/circ.properties"/>
+
<groupbox flex="1">
<caption label="&staff.circ.offline_checkout.main.label;"/>
Modified: trunk/Open-ILS/xul/staff_client/chrome/content/main/bindings.xml
===================================================================
--- trunk/Open-ILS/xul/staff_client/chrome/content/main/bindings.xml 2007-08-09 18:03:38 UTC (rev 7655)
+++ trunk/Open-ILS/xul/staff_client/chrome/content/main/bindings.xml 2007-08-09 18:05:47 UTC (rev 7656)
@@ -6,9 +6,8 @@
xmlns:xbl="http://www.mozilla.org/xbl">
<binding id="messagecatalog">
- <resources>
- </resources>
-
+ <resources/>
+
<content>
<children>
</children>
@@ -137,7 +136,7 @@
<![CDATA[
try {
var x = new XMLHttpRequest();
- x.open("GET","/xul/server/util/sprintf.js",false);
+ x.open("GET","chrome://open_ils_staff_client/content/util/sprintf.js",false);
x.send(null);
if (x.responseText) {
eval(x.responseText);
More information about the open-ils-commits
mailing list