From b7078ab3e346aa8fe914da31c747b04e531f372e Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Mon, 17 Aug 2020 18:40:10 +0000
Subject: [PATCH] Bug 26230: Move translatable strings out of
 item_search_fields.tt and into item_search_fields.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 -> Item search fields.
- If necessary, add a new search field.
- From the table of search fields, click the "Delete" button for one of
  the fields.
- You should get a confirmation: "Are you sure you want to delete this
  field?"

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 the string pulled from
  koha-tmpl/intranet-tmpl/prog/js/item_search_fields.js for translation:

  #: koha-tmpl/intranet-tmpl/prog/js/item_search_fields.js:18
  msgid "Are you sure you want to delete this field?"
  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: Alexis Ripetti <alexis.ripetti@inLibro.com>
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
(cherry picked from commit 2c98f4849ddad3494e936a0b4ea39eca247dd9f2)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
---
 .../prog/en/modules/admin/items_search_fields.tt             | 3 ---
 koha-tmpl/intranet-tmpl/prog/js/item_search_fields.js        | 5 +++--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt
index dfc0d4f118..b68b6bd77f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt
@@ -115,9 +115,6 @@
 
 [% MACRO jsinclude BLOCK %]
     [% Asset.js("js/admin-menu.js") | $raw %]
-    <script>
-        var MSG_ITEM_SEARCH_DELETE_CONFIRM = _("Are you sure you want to delete this field?");
-    </script>
     [% Asset.js("js/item_search_fields.js") | $raw %]
 [% END %]
 
diff --git a/koha-tmpl/intranet-tmpl/prog/js/item_search_fields.js b/koha-tmpl/intranet-tmpl/prog/js/item_search_fields.js
index 32418b5d29..6080798e75 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/item_search_fields.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/item_search_fields.js
@@ -1,3 +1,4 @@
+/* global __ */
 $(document).ready(function(){
     $("#add_field_form").hide();
     $("#new_search_field").on("click",function(e){
@@ -14,11 +15,11 @@ $(document).ready(function(){
     });
     $(".field-delete").on("click",function(){
         $(this).parent().parent().addClass("highlighted-row");
-        if( confirm( MSG_ITEM_SEARCH_DELETE_CONFIRM )){
+        if (confirm( __("Are you sure you want to delete this field?") )) {
             return true;
         } else {
             $(this).parent().parent().removeClass("highlighted-row");
             return false;
         }
     });
-});
\ No newline at end of file
+});
-- 
2.39.5