[open-ils-commits] r11222 - in branches/rel_1_4/Open-ILS/web: js/dojo/openils/reports/nls opac/locale/en-US reports reports/xul

svn at svn.open-ils.org svn at svn.open-ils.org
Sun Nov 16 10:26:27 EST 2008


Author: dbs
Date: 2008-11-16 10:26:26 -0500 (Sun, 16 Nov 2008)
New Revision: 11222

Modified:
   branches/rel_1_4/Open-ILS/web/js/dojo/openils/reports/nls/reports.js
   branches/rel_1_4/Open-ILS/web/opac/locale/en-US/reports.dtd
   branches/rel_1_4/Open-ILS/web/reports/oils_rpt_common.xhtml
   branches/rel_1_4/Open-ILS/web/reports/xul/template_builder.xul
Log:
Backport reports i18n fixes (r11219, r11220, r11221) from trunk

Modified: branches/rel_1_4/Open-ILS/web/js/dojo/openils/reports/nls/reports.js
===================================================================
--- branches/rel_1_4/Open-ILS/web/js/dojo/openils/reports/nls/reports.js	2008-11-16 15:21:39 UTC (rev 11221)
+++ branches/rel_1_4/Open-ILS/web/js/dojo/openils/reports/nls/reports.js	2008-11-16 15:26:26 UTC (rev 11222)
@@ -123,7 +123,7 @@
 	"TEMPLATE_CONF_NOT_IN": "Field does not match one of list (comma separated):",
 	"TEMPLATE_CONF_IN": "Field matches one of list (comma separated):",
 	"TEMPLATE_CONF_DEFAULT": "Value ${0}:",
-	"TEMPLATE_CONF_CONFIRM_SAVE": "Name : ${0}\nDescription: $[1}\nSave Template?",
+	"TEMPLATE_CONF_CONFIRM_SAVE": "Name : ${0}\nDescription: ${1}\nSave Template?",
 	"TEMPLATE_CONF_SUCCESS_SAVE": "Template ${0} was successfully saved.",
 	
 	"TRANSFORMS_BARE": "Raw Data",

Modified: branches/rel_1_4/Open-ILS/web/opac/locale/en-US/reports.dtd
===================================================================
--- branches/rel_1_4/Open-ILS/web/opac/locale/en-US/reports.dtd	2008-11-16 15:21:39 UTC (rev 11221)
+++ branches/rel_1_4/Open-ILS/web/opac/locale/en-US/reports.dtd	2008-11-16 15:26:26 UTC (rev 11222)
@@ -66,6 +66,7 @@
 
 <!ENTITY reports.oils_rpt_common.action_succeeded "Action Succeeded">
 <!ENTITY reports.oils_rpt_common.action_failed "Action Failed">
+<!ENTITY reports.oils_rpt_common.generic_calendar_button "Date selector">
 
 
 <!ENTITY reports.oils_rpt_editor.template_name "Template Name:">
@@ -188,6 +189,7 @@
 <!ENTITY reports.xul.template_builder.params.label "Params">
 <!ENTITY reports.xul.template_builder.applicable_datatypes.label "Applicable Datatypes">
 <!ENTITY reports.xul.template_builder.output_type.label "Output Type">
+<!ENTITY reports.xul.template_builder.source_add.label "Add Selected Fields">
 <!ENTITY reports.xul.template_builder.template_config_caption.label "Template Configuration">
 <!ENTITY reports.xul.template_builder.name.label "Name:">
 <!ENTITY reports.xul.template_builder.description.label "Description:">

Modified: branches/rel_1_4/Open-ILS/web/reports/oils_rpt_common.xhtml
===================================================================
--- branches/rel_1_4/Open-ILS/web/reports/oils_rpt_common.xhtml	2008-11-16 15:21:39 UTC (rev 11221)
+++ branches/rel_1_4/Open-ILS/web/reports/oils_rpt_common.xhtml	2008-11-16 15:26:26 UTC (rev 11222)
@@ -87,7 +87,7 @@
 <button style='padding: 0px;' id='generic_calendar_button' class='hide_me'>
 	<img src="/opac/common/js/jscalendar/img.gif"
 		style="cursor: pointer; border: 1px solid red; padding: 0px; margin: -3px;"
-		title="Date selector"
+		title="&reports.oils_rpt_common.generic_calendar_button;"
 		onmouseover="this.style.background='red';"
 		onmouseout="this.style.background=''" />
 </button>

Modified: branches/rel_1_4/Open-ILS/web/reports/xul/template_builder.xul
===================================================================
--- branches/rel_1_4/Open-ILS/web/reports/xul/template_builder.xul	2008-11-16 15:21:39 UTC (rev 11221)
+++ branches/rel_1_4/Open-ILS/web/reports/xul/template_builder.xul	2008-11-16 15:26:26 UTC (rev 11222)
@@ -135,7 +135,7 @@
 				</hbox>
 				<hbox>
 					<spacer flex="1"/>
-					<button label="Add Selected Fields" id="source-add" oncommand="addReportAtoms()"/>
+					<button label="&reports.xul.template_builder.source_add.label;" id="source-add" oncommand="addReportAtoms()"/>
 				</hbox>
 			</vbox>
 		</hbox>



More information about the open-ils-commits mailing list