From 9537ac4a8f9c8a4330a196e8d3dded926e6cba59 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 14 Aug 2020 18:12:09 +0000 Subject: [PATCH] Bug 26217: Move translatable strings out of templates into acq.js This patch removes the definition of translatable strings out of templates and into the JavaScript file, using the new JS i81n function. To test: - Apply the patch, go to acquisitions, and view a vendor. - Click "Uncertain prices" in the sidebar menu. - In the table of orders, enter something in the "price" form field which isn't a valid price. You should get an error message. - Test the validation of fund amounts: Go to Administration -> Budgets and create an active budget if necessary. - Add a fund to that budget. Try to save the fund with a fund amount which exceed the amount in the budget. - You should get an error message: "Fund amount exceeds period allocation" - Add a fund with valid data and then go to Administration -> Funds and locate the fun you just created. - Use the "Actions" menu to add a sub fund to that fund. - Try to save this new fund with an amount which exceeds the amount in the parent fund. - You should get an error message, "Fund amount exceeds parent allocation." Note: I was unable to properly test the error message "New budget-parent is beneath budget." I couldn't figure out how to trigger it. TESTING TRANSLATABILITY - Update a translation, e.g. fr-FR: > cd misc/translator > perl translate update fr-FR - Open the corresponding .po file for JavaScript strings, e.g. misc/translator/po/fr-FR-messages-js.po - Locate strings pulled from koha-tmpl/intranet-tmpl/prog/js/acq.js for translation, e.g.: msgid "Fund amount exceeds period allocation" msgstr "" - Edit the "msgstr" string however you want (it's just for testing). - Install the updated translation: > perl translate install fr-FR - Switch to your newly translated language in the staff client and repeat the test plan above. The translated strings should appear. Signed-off-by: David Nind Signed-off-by: Katrin Fischer --- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt | 1 - koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt | 7 ------- koha-tmpl/intranet-tmpl/prog/js/acq.js | 8 ++++---- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt index 940127c0ca..20f1fbe302 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt @@ -156,7 +156,6 @@ uncheckbox( form, ordernumber ); }); }); - var MSG_INVALIDPRICE = _("ERROR: Price is not a valid number, please check the price and try again!"); [% Asset.js("js/acq.js") | $raw %] [% END %] 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 ce88e2865c..0fc2223de9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt @@ -449,13 +449,6 @@ [% MACRO jsinclude BLOCK %] [% Asset.js("js/acq.js") | $raw %] - - - [% Asset.js("js/acq.js") | $raw %] [% IF op == 'add_form' %]