[open-ils-commits] r19282 - in trunk: Open-ILS/xul/staff_client/server/locale/en-US Open-ILS/xul/staff_client/server/serial build/i18n build/i18n/po (dbs)
svn at svn.open-ils.org
svn at svn.open-ils.org
Tue Jan 25 01:17:50 EST 2011
Author: dbs
Date: 2011-01-25 01:17:46 -0500 (Tue, 25 Jan 2011)
New Revision: 19282
Added:
trunk/build/i18n/po/serial.properties/
Modified:
trunk/Open-ILS/xul/staff_client/server/locale/en-US/serial.properties
trunk/Open-ILS/xul/staff_client/server/serial/editor_base.js
trunk/build/i18n/Makefile
Log:
Teach the i18n Makefile how to handle serial.properties
Also check in the POT for serial.properties and some other
foobar.label matches for foobar.accesskey (does not have
an effect on properties files but hopefully if we're
consistent then the pattern will be evident for entities).
Noting in passing that there are a number of "foobar(s)"
comined singular/plural labels that should be split to
support translation.
Modified: trunk/Open-ILS/xul/staff_client/server/locale/en-US/serial.properties
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/locale/en-US/serial.properties 2011-01-25 06:16:45 UTC (rev 19281)
+++ trunk/Open-ILS/xul/staff_client/server/locale/en-US/serial.properties 2011-01-25 06:17:46 UTC (rev 19282)
@@ -2,55 +2,55 @@
staff.serial.editor_base.handle_update.success=Save Successful
staff.serial.sbsum_editor.count=1 summary
staff.serial.sbsum_editor.count.plural=%1$s summaries
-staff.serial.sbsum_editor.modify=Modify Basic Summary
+staff.serial.sbsum_editor.modify.label=Modify Basic Summary
staff.serial.sbsum_editor.modify.accesskey=M
staff.serial.sisum_editor.count=1 summary
staff.serial.sisum_editor.count.plural=%1$s summaries
-staff.serial.sisum_editor.modify=Modify Index Summary
+staff.serial.sisum_editor.modify.label=Modify Index Summary
staff.serial.sisum_editor.modify.accesskey=M
staff.serial.sssum_editor.count=1 summary
staff.serial.sssum_editor.count.plural=%1$s summaries
-staff.serial.sssum_editor.modify=Modify Supplement Summary
+staff.serial.sssum_editor.modify.label=Modify Supplement Summary
staff.serial.sssum_editor.modify.accesskey=M
staff.serial.scap_editor.count=1 caption and pattern
staff.serial.scap_editor.count.plural=%1$s caption and patterns
-staff.serial.scap_editor.create=Create Caption and Pattern(s)
+staff.serial.scap_editor.create.label=Create Caption and Pattern(s)
staff.serial.scap_editor.create.accesskey=C
-staff.serial.scap_editor.modify=Modify Caption and Pattern(s)
+staff.serial.scap_editor.modify.label=Modify Caption and Pattern(s)
staff.serial.scap_editor.modify.accesskey=M
staff.serial.scap_editor.notes=Caption and Pattern Notes
staff.serial.sdist_editor.count=1 distribution
staff.serial.sdist_editor.count.plural=%1$s distributions
-staff.serial.sdist_editor.create=Create Distribution(s)
+staff.serial.sdist_editor.create.label=Create Distribution(s)
staff.serial.sdist_editor.create.accesskey=C
-staff.serial.sdist_editor.modify=Modify Distribution(s)
+staff.serial.sdist_editor.modify.label=Modify Distribution(s)
staff.serial.sdist_editor.modify.accesskey=M
staff.serial.sdist_editor.notes=Distribution Notes
staff.serial.siss_editor.count=1 issuance
staff.serial.siss_editor.count.plural=%1$s issuances
-staff.serial.siss_editor.create=Create Issuance(s)
+staff.serial.siss_editor.create.label=Create Issuance(s)
staff.serial.siss_editor.create.accesskey=C
-staff.serial.siss_editor.modify=Modify Issuance(s)
+staff.serial.siss_editor.modify.label=Modify Issuance(s)
staff.serial.siss_editor.modify.accesskey=M
staff.serial.siss_editor.notes=Issuance Notes
staff.serial.sitem_editor.count=1 item
staff.serial.sitem_editor.count.plural=%1$s items
-staff.serial.sitem_editor.create=Create Item(s)
+staff.serial.sitem_editor.create.label=Create Item(s)
staff.serial.sitem_editor.create.accesskey=C
-staff.serial.sitem_editor.modify=Modify Item(s)
+staff.serial.sitem_editor.modify.label=Modify Item(s)
staff.serial.sitem_editor.modify.accesskey=M
staff.serial.sitem_editor.notes=Item Notes
staff.serial.sstr_editor.count=1 stream
staff.serial.sstr_editor.count.plural=%1$s streams
-staff.serial.sstr_editor.create=Create Stream(s)
+staff.serial.sstr_editor.create.label=Create Stream(s)
staff.serial.sstr_editor.create.accesskey=C
-staff.serial.sstr_editor.modify=Modify Stream(s)
+staff.serial.sstr_editor.modify.label=Modify Stream(s)
staff.serial.sstr_editor.modify.accesskey=M
staff.serial.ssub_editor.count=1 subscription
staff.serial.ssub_editor.count.plural=%1$s subscriptions
-staff.serial.ssub_editor.create=Create Subscription(s)
+staff.serial.ssub_editor.create.label=Create Subscription(s)
staff.serial.ssub_editor.create.accesskey=C
-staff.serial.ssub_editor.modify=Modify Subscription(s)
+staff.serial.ssub_editor.modify.label=Modify Subscription(s)
staff.serial.ssub_editor.modify.accesskey=M
staff.serial.ssub_editor.notes=Subscription Notes
staff.serial.manage_subs.add.error=error adding object in manage_subs.js:
Modified: trunk/Open-ILS/xul/staff_client/server/serial/editor_base.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/serial/editor_base.js 2011-01-25 06:16:45 UTC (rev 19281)
+++ trunk/Open-ILS/xul/staff_client/server/serial/editor_base.js 2011-01-25 06:17:46 UTC (rev 19282)
@@ -153,12 +153,12 @@
if (obj[fm_type_plural].length > 0 && obj[fm_type_plural][0].isnew()) {
obj.mode = 'create';
if (obj.can_have_notes) $(obj.xul_id_prefix + '_notes').setAttribute('hidden','true');
- $(obj.xul_id_prefix + '_save').setAttribute('label', $('serialStrings').getString('staff.serial.' + fm_type + '_editor.create'));
+ $(obj.xul_id_prefix + '_save').setAttribute('label', $('serialStrings').getString('staff.serial.' + fm_type + '_editor.create.label'));
$(obj.xul_id_prefix + '_save').setAttribute('accesskey', $('serialStrings').getString('staff.serial.' + fm_type + '_editor.create.accesskey'));
} else if (obj.mode == 'create') { // switching from create to modify
obj.mode = 'modify';
if (obj.can_have_notes) $(obj.xul_id_prefix + '_notes').setAttribute('hidden','false');
- $(obj.xul_id_prefix + '_save').setAttribute('label', $('serialStrings').getString('staff.serial.' + fm_type + '_editor.modify'));
+ $(obj.xul_id_prefix + '_save').setAttribute('label', $('serialStrings').getString('staff.serial.' + fm_type + '_editor.modify.label'));
$(obj.xul_id_prefix + '_save').setAttribute('accesskey', $('serialStrings').getString('staff.serial.' + fm_type + '_editor.modify.accesskey'));
}
/*else {
Modified: trunk/build/i18n/Makefile
===================================================================
--- trunk/build/i18n/Makefile 2011-01-25 06:16:45 UTC (rev 19281)
+++ trunk/build/i18n/Makefile 2011-01-25 06:17:46 UTC (rev 19282)
@@ -91,6 +91,7 @@
@pot2po $(PROGRESS) -i po/reports.js/reports.js.pot -o $(PO)/reports.js/$(LOCALE).po
@pot2po $(PROGRESS) -i po/reservation.js/reservation.js.pot -o $(PO)/reservation.js/$(LOCALE).po
@pot2po $(PROGRESS) -i po/selfcheck.js/selfcheck.js.pot -o $(PO)/selfcheck.js/$(LOCALE).po
+ @pot2po $(PROGRESS) -i po/serial.properties/serial.properties.pot -o $(PO)/serial.properties/$(LOCALE).po
@pot2po $(PROGRESS) -i po/vandelay.dtd/vandelay.dtd.pot -o $(PO)/vandelay.dtd/$(LOCALE).po
@pot2po $(PROGRESS) -i po/AutoFieldWidget.js/AutoFieldWidget.js.pot -o $(PO)/AutoFieldWidget.js/$(LOCALE).po
@pot2po $(PROGRESS) -i po/TranslatorPopup.js/TranslatorPopup.js.pot -o $(PO)/TranslatorPopup.js/$(LOCALE).po
@@ -135,6 +136,7 @@
@pot2po $(PROGRESS) -i po/reports.js/reports.js.pot -o $(PO)/reports.js/$(LOCALE).po -t $(PO)/reports.js/$(LOCALE).po
@pot2po $(PROGRESS) -i po/reservation.js/reservation.js.pot -o $(PO)/reservation.js/$(LOCALE).po -t $(PO)/reservation.js/$(LOCALE).po
@pot2po $(PROGRESS) -i po/selfcheck.js/selfcheck.js.pot -o $(PO)/selfcheck.js/$(LOCALE).po -t $(PO)/selfcheck.js/$(LOCALE).po
+ @pot2po $(PROGRESS) -i po/serial.properties/serial.properties.pot -o $(PO)/serial.properties/$(LOCALE).po -t $(PO)/serial.properties/$(LOCALE).po
@pot2po $(PROGRESS) -i po/vandelay.dtd/vandelay.dtd.pot -o $(PO)/vandelay.dtd/$(LOCALE).po -t $(PO)/vandelay.dtd/$(LOCALE).po
@pot2po $(PROGRESS) -i po/AutoFieldWidget.js/AutoFieldWidget.js.pot -o $(PO)/AutoFieldWidget.js/$(LOCALE).po -t $(PO)/AutoFieldWidget.js/$(LOCALE).po
@pot2po $(PROGRESS) -i po/TranslatorPopup.js/TranslatorPopup.js.pot -o $(PO)/TranslatorPopup.js/$(LOCALE).po -t $(PO)/TranslatorPopup.js/$(LOCALE).po
@@ -201,6 +203,7 @@
@moz2po -P $(PROGRESS) -o $(PO)/common.properties/common.properties.pot -i $(SERVER_PROPSDIR)/en-US/common.properties 2>&1
@moz2po -P $(PROGRESS) -o $(PO)/multiclass_search_help.html/multiclass_search_help.html.pot -i $(SERVER_PROPSDIR)/en-US/multiclass_search_help.html 2>&1
@moz2po -P $(PROGRESS) -o $(PO)/patron.properties/patron.properties.pot -i $(SERVER_PROPSDIR)/en-US/patron.properties 2>&1
+ @moz2po -P $(PROGRESS) -o $(PO)/serial.properties/serial.properties.pot -i $(SERVER_PROPSDIR)/en-US/serial.properties 2>&1
# There are some hacky things we need to do to make po2moz happy,
# like ensure that the .po file has either ".dtd" or ".properties" in
@@ -230,6 +233,7 @@
@po2moz $(PROGRESS) -i $(PO)/common.properties/$(LOCALE).properties.po -o $(PROJECT)/$(LOCALE)/common.properties -t $(SERVER_PROPSDIR)/en-US/common.properties 2>&1
@po2moz $(PROGRESS) -i $(PO)/multiclass_search_help.html/$(LOCALE).html.po -o $(PROJECT)/$(LOCALE)/multiclass_search_help.html -t $(SERVER_PROPSDIR)/en-US/multiclass_search_help.html 2>&1
@po2moz $(PROGRESS) -i $(PO)/patron.properties/$(LOCALE).properties.po -o $(PROJECT)/$(LOCALE)/patron.properties -t $(SERVER_PROPSDIR)/en-US/patron.properties 2>&1
+ @po2moz $(PROGRESS) -i $(PO)/serial.properties/$(LOCALE).properties.po -o $(PROJECT)/$(LOCALE)/serial.properties -t $(SERVER_PROPSDIR)/en-US/serial.properties 2>&1
sql2pot:
@scripts/db-seed-i18n.py --pot $(SQLSRCDIR)/$(SQLSRCFILE) --output $(PO)/db.seed/$(SQLPOT)
@@ -276,6 +280,7 @@
cp $(PROJECT)/$(LOCALE)/lang.dtd $(DTDDIR)/$(LOCALE)/
cp $(PROJECT)/$(LOCALE)/opac.dtd $(DTDDIR)/$(LOCALE)/
cp $(PROJECT)/$(LOCALE)/reports.dtd $(DTDDIR)/$(LOCALE)/
+ cp $(PROJECT)/$(LOCALE)/serial.properties $(SERVER_PROPSDIR)/$(LOCALE)/.
cp $(PROJECT)/$(LOCALE)/vandelay.dtd $(DTDDIR)/$(LOCALE)/
cp $(PROJECT)/$(LOCALE)/$(FMIDLENTITY) $(DTDDIR)/$(LOCALE)/
@scripts/merge_ils_events.py --master $(EVTSRC) --localization $(PROJECT)/$(LOCALE)/$(EVTXML) --output $(EVTSRC)
Copied: trunk/build/i18n/po/serial.properties (from rev 19281, branches/rel_2_0/build/i18n/po/serial.properties)
More information about the open-ils-commits
mailing list