Bug 7598: [Follow-up] make strings in acquisitions JavaScript translatable

This follow-up addresses QA comments and moves punctuation and line
breaks out of the string to be translated.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/acq.js b/koha-tmpl/intranet-tmpl/prog/en/js/acq.js
index b1fdf58..9997768 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/js/acq.js
+++ b/koha-tmpl/intranet-tmpl/prog/en/js/acq.js
@@ -35,12 +35,6 @@ function isNull(f,noalert) {
     return true;
 }
 
-
-
-
-
-
-
 //Function returns false if v is not a number (if maybenull is 0, it also returns an error if the number is 0)
 function isNum(v,maybenull) {
     var n = new Number(v.value);
@@ -822,7 +816,7 @@ if ( newBudgetParent  ) { url +=  '&parent_id=' + newBudgetParent};
     if (result == '1') {
             return MSG_BUDGET_PARENT_ALLOCATION;
     } else if (result == '2') {
-            return MSG_BUDGET_PARENT_ALLOCATION;
+            return MSG_BUDGET_PERIOD_ALLOCATION;
     } else  {
             return false;
     }

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
index 44106ae..82a6647 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
@@ -3,8 +3,9 @@
 [% INCLUDE 'doc-head-close.inc' %]
 <script type="text/javascript">
 //<![CDATA[
-var MSG_BUDGET_PARENT_ALLOCATION = _("- Fund amount exceeds parent allocation\n");
-var MSG_PARENT_BENEATH_BUDGET = _("- New budget-parent is beneath budget\n");
+var MSG_BUDGET_PARENT_ALLOCATION = "- " + _("Fund amount exceeds parent allocation") + "\n";
+var MSG_BUDGET_PERIOD_ALLOCATION = "- " + _("Fund amount exceeds period allocation") + "\n";
+var MSG_PARENT_BENEATH_BUDGET = "- " + _("New budget-parent is beneath budget") + "\n";
 //]]>
 </script>