From a7fb98694abdedef206215c82be505e8960f6529 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 17 Aug 2020 12:26:39 +0000 Subject: [PATCH] Bug 26225: Move translatable strings out of audio_alerts.tt and into audio_alerts.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 -> Audio alerts. - Click the "Delete selected alerts" button without checking any checkboxes. You should see an error: "Check the box next to the alert you want to delete." - Check the checkbox for an existing sound and click "Delete selected alerts." You should get a confirmation message, "Are you sure you want to delete the selected audio alerts?" - Click "New alert." - Without filling any details, click the "Play sound" button. You should see an error message, "Please select or enter a sound." 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/audio_alerts.js for translation, e.g.: msgid "Are you sure you want to delete the selected audio alerts?" 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 Signed-off-by: Jonathan Druart (cherry picked from commit ac12b9c6485332f6ca34bb3d4a98c0c341bfe943) Signed-off-by: Lucas Gass --- .../intranet-tmpl/prog/en/modules/admin/audio_alerts.tt | 5 ----- koha-tmpl/intranet-tmpl/prog/js/audio_alerts.js | 8 +++++--- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt index b88377ff1a..4587214c0e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt @@ -137,11 +137,6 @@ [% MACRO jsinclude BLOCK %] [% Asset.js("js/admin-menu.js") | $raw %] - [% Asset.js("js/audio_alerts.js") | $raw %] [% END %] [% INCLUDE 'intranet-bottom.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/js/audio_alerts.js b/koha-tmpl/intranet-tmpl/prog/js/audio_alerts.js index 997c72a412..0fa22dc430 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/audio_alerts.js +++ b/koha-tmpl/intranet-tmpl/prog/js/audio_alerts.js @@ -1,3 +1,5 @@ +/* global __ */ + $( document ).ready(function() { var checkboxes = $("#delete-alert-form input[type='checkbox']"); var checkedcheckboxes = 0; @@ -37,7 +39,7 @@ $( document ).ready(function() { if( soundfield.val() !== '' ){ playSound( soundfield.val() ); } else { - alert( MSG_AUDIO_EMPTY_SOUND ); + alert( __("Please select or enter a sound.") ); } }); @@ -59,9 +61,9 @@ $( document ).ready(function() { $('#delete-alert-form').on('submit', function() { if( checkedcheckboxes == 1 ){ - return confirm( MSG_AUDIO_CONFIRM_DELETE ); + return confirm( __("Are you sure you want to delete the selected audio alerts?") ); } else { - alert( MSG_AUDIO_CHECK_CHECKBOXES ); + alert( __("Check the box next to the alert you want to delete.") ); return false; } }); -- 2.39.5