Backport reports i18n fixes (r11219, r11220, r11221) from trunk

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_4@11222 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/web/js/dojo/openils/reports/nls/reports.js b/Open-ILS/web/js/dojo/openils/reports/nls/reports.js
index 75f355a..3f61b84 100644 (file)
--- a/Open-ILS/web/js/dojo/openils/reports/nls/reports.js
+++ b/Open-ILS/web/js/dojo/openils/reports/nls/reports.js
@@ -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",

diff --git a/Open-ILS/web/opac/locale/en-US/reports.dtd b/Open-ILS/web/opac/locale/en-US/reports.dtd
index 7a7ffed..2a2993e 100644 (file)
--- a/Open-ILS/web/opac/locale/en-US/reports.dtd
+++ b/Open-ILS/web/opac/locale/en-US/reports.dtd
@@ -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:">

diff --git a/Open-ILS/web/reports/oils_rpt_common.xhtml b/Open-ILS/web/reports/oils_rpt_common.xhtml
index 4cbb83a..c1b4302 100644 (file)
--- a/Open-ILS/web/reports/oils_rpt_common.xhtml
+++ b/Open-ILS/web/reports/oils_rpt_common.xhtml
@@ -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>

diff --git a/Open-ILS/web/reports/xul/template_builder.xul b/Open-ILS/web/reports/xul/template_builder.xul
index e91555b..0e771ee 100644 (file)
--- a/Open-ILS/web/reports/xul/template_builder.xul
+++ b/Open-ILS/web/reports/xul/template_builder.xul
@@ -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>