From bcd6b896ea3e10c73cca4b34d9030024205b784b Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 18 Jul 2013 11:30:35 -0400 Subject: [PATCH] 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 Signed-off-by: Galen Charlton (cherry picked from commit b38187d8b004316b17d1e67753d638e96bb62bb8) Signed-off-by: Tomas Cohen Arazi (cherry picked from commit c4bf7d825141261a8a1563790f4e4a767647a779) Signed-off-by: Bernardo Gonzalez Kriegel (cherry picked from commit c4bf7d825141261a8a1563790f4e4a767647a779) --- koha-tmpl/intranet-tmpl/prog/en/js/acq.js | 8 +------- .../intranet-tmpl/prog/en/modules/admin/aqbudgets.tt | 5 +++-- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/acq.js b/koha-tmpl/intranet-tmpl/prog/en/js/acq.js index e5d3401f2e..88c3fbac44 100644 --- 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 901fd21504..895db8baef 100644 --- 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' %] -- 2.39.5