From e3737f5005860c3fbffd88e0202b2747a2e7933f Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 17 Aug 2020 13:04:27 +0000 Subject: [PATCH] Bug 26225: Move translatable strings out of biblio_framework.tt and into biblio_framework.js This patch removes the definition of translatable strings out of templates and into the corresponding JavaScript file, using the new JS i81n function. To test: - Apply the patch, go to Administration -> MARC bibliographic framework. - Click Actions -> Export and save the file. - Click Actions -> Import. - Select a file which isn't CSV or ODS. You should get an error message, "Please select a CSV (.csv) or ODS (.ods) spreadsheet file." - Select the file you exported previously and click "Import." You should see an error message, "Are you sure you want to replace the fields and subfields for the default framework structure? ..." - Click "OK." You should see a message in the modal window, "Importing to framework:..." - Edit your exported framework file in such a way that it isn't a valid framework export. - Repeat the process of importing the file. You should get an error message, "Error importing the framework..." 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/biblio_framework.js for translation, e.g.: msgid "Please select a CSV (.csv) or ODS (.ods) spreadsheet file" 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. https://bugs.koha-community.org/show_bug.cgi?id=26226 Signed-off-by: David Nind Signed-off-by: Katrin Fischer Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart (cherry picked from commit 1eb0fe4e5ea87423d4c3c936ad7320634a42c54e) Signed-off-by: Lucas Gass --- .../prog/en/modules/admin/biblio_framework.tt | 4 ---- koha-tmpl/intranet-tmpl/prog/js/biblio_framework.js | 11 ++++++----- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt index bfb8b36e35..a49009b3b0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt @@ -286,10 +286,6 @@ [% INCLUDE 'datatables.inc' %] [% Asset.js("js/admin-menu.js") | $raw %] [% Asset.js("js/biblio_framework.js") | $raw %] diff --git a/koha-tmpl/intranet-tmpl/prog/js/biblio_framework.js b/koha-tmpl/intranet-tmpl/prog/js/biblio_framework.js index 1b1337b044..b49fbe9b4f 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/biblio_framework.js +++ b/koha-tmpl/intranet-tmpl/prog/js/biblio_framework.js @@ -1,3 +1,4 @@ +/* global __ */ /* Import/Export from/to spreadsheet */ var importing = false; @@ -32,14 +33,14 @@ var matches = new RegExp("\\?error_import_export=(.+)$").exec(window.location.search); if (matches && matches.length > 1) { - alert( MSG_IMPORT_ERROR + " %s".format(decodeURIComponent(matches[1]))); + alert( __("Error importing the framework") + " %s".format(decodeURIComponent(matches[1]))); } $('input.input_import').change( function() { var filename = $(this).val(); if ( ! /(?:\.csv|\.ods|\.xml)$/.test(filename)) { $(this).css("background-color","yellow"); - alert( MSG_SELECT_FILE_FORMAT ); + alert( __("Please select a CSV (.csv) or ODS (.ods) spreadsheet file.") ); $(this).val(""); $(this).css("background-color","white"); } @@ -53,9 +54,9 @@ var obj = $('#' + id + ' input:file'); if (/(?:\.csv|\.ods|\.xml)$/.test(obj.val())) { var frameworkcode = $('#' + id + ' input:hidden[name=frameworkcode]').val(); - var MSG_OVERWRITE_WARNING = _("Are you sure you want to replace the fields and subfields for the " + frameworkcode + " framework structure? The existing structure will be overwritten! For safety reasons, it is recommended to use the export option to make a backup first."); + var MSG_OVERWRITE_WARNING = __("Are you sure you want to replace the fields and subfields for the %s framework structure? The existing structure will be overwritten! For safety reasons, it is recommended to use the export option to make a backup first.").format( frameworkcode ); if (confirm( MSG_OVERWRITE_WARNING )) { - $('#importing_' + frameworkcode).find("span").html(MSG_IMPORTING_TO_FRAMEWORK.format("" + frameworkcode + "", "" + obj.val().replace(new RegExp("^.+[/\\\\]"),"") + "")); + $('#importing_' + frameworkcode).find("span").html( __("Importing to framework: %s. Importing from file: %s.").format("" + frameworkcode + "", "" + obj.val().replace(new RegExp("^.+[/\\\\]"), "") + "")); if (navigator.userAgent.toLowerCase().indexOf('msie') != -1) { var timestamp = new Date().getTime(); $('#importing_' + frameworkcode).find("img").attr('src', template_path + '/img/spinner-small.gif' + '?' +timestamp); @@ -69,7 +70,7 @@ return false; } obj.css("background-color","yellow"); - alert( MSG_SELECT_FILE_FORMAT ); + alert( __("Please select a CSV (.csv) or ODS (.ods) spreadsheet file.") ); obj.val(""); obj.css("background-color","white"); return false; -- 2.39.5