From 5f25f70077a2652f644e0d7735a5598b5a6fccac Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Fri, 16 Jun 2023 14:29:42 +0000
Subject: [PATCH] Bug 34038: Fix incorrect use of __() in .tt and .inc files

This patch corrects instances of the double-underscore function being
used in .tt and .inc files where the single-underscore function should
be used instead.

To test, apply the patch and update a translation, e.g. fr-FR:

  > cd misc/translator
  > perl translate update fr-FR

- Open the corresponding .po file for JavaScript strings, in this case
  misc/translator/po/fr-FR-staff-prog.po
- Confirm that the strings are now in the .po file for translation. You
  should find these lines:

- koha-tmpl/intranet-tmpl/prog/en/includes/js-biblio-format.inc: "No
  title."
- koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt:
  "Check in and add to bundle"
  "Ignore holds and add to bundle"
- koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step1.tt:
  "Please enter only a barcode, or only a biblionumber."
- koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_add_items.tt:
  "Please enter only barcodes, or only biblionumbers."
- koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt:
  "Please specify a content for 'Default'"

- Check fr-FR-opac-bootstrap.po for these lines:

- koha-tmpl/opac-tmpl/bootstrap/en/includes/calendar.inc:
  "Please enter a valid date (should match %s)."
- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt:
  "No item was selected"
- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt,
  koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt,
  koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt:
  "No item was selected"

Signed-off-by: David Cook <dcook@prosentient.com.au>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit d1d9f4698eb2f959964d83d22b2079f07286a7c4)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
(cherry picked from commit f558474af319b4d95898f3046ac646c9fdeaaae3)
Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
---
 .../intranet-tmpl/prog/en/includes/js-biblio-format.inc   | 2 +-
 .../intranet-tmpl/prog/en/modules/catalogue/detail.tt     | 2 +-
 .../prog/en/modules/course_reserves/add_items-step1.tt    | 2 +-
 .../prog/en/modules/course_reserves/batch_add_items.tt    | 2 +-
 .../prog/en/modules/tools/additional-contents.tt          | 2 +-
 koha-tmpl/opac-tmpl/bootstrap/en/includes/calendar.inc    | 2 +-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt   | 4 ++--
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt  | 2 +-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt  | 6 +++---
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt  | 8 ++++----
 10 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/js-biblio-format.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/js-biblio-format.inc
index 5f73dc683a..498a7a44e9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/js-biblio-format.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/js-biblio-format.inc
@@ -23,7 +23,7 @@
                 if (biblio.title != null && biblio.title != '') {
                     title += escape_str(biblio.title);
                 } else {
-                    title += __("No title");
+                    title += _("No title");
                 }
                 title += '</span>';
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
index 3e634f8583..ff0c4ef9db 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
@@ -1812,7 +1812,7 @@
                           } else if (response.error_code === 'checked_out') {
                               const button = $('<button type="button">')
                                 .addClass('btn btn-xs')
-                                .text(__("Check in and add to bundle"))
+                                .text(_("Check in and add to bundle"))
                                 .on('click', function () {
                                     addToBundle(url, { external_id: barcode, force_checkin: true });
                                 });
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step1.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step1.tt
index 751c89ac1c..346f54d3a6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step1.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step1.tt
@@ -78,7 +78,7 @@
             $("input[type='submit']").click(function(e){
                 if ( $("#biblionumber").val().length > 0 && $("#barcode").val().length > 0 ) {
                     e.preventDefault();
-                    alert(__("Please enter only a barcode, or only a biblionumber."));
+                    alert(_("Please enter only a barcode, or only a biblionumber."));
                 }
             });
         });
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_add_items.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_add_items.tt
index eb4e674a24..f0d175fb09 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_add_items.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_add_items.tt
@@ -225,7 +225,7 @@
             $("input[type='submit']").click(function(e){
                 if ( $("#biblionumbers").val().length > 0 && $("#barcodes").val().length > 0 ) {
                     e.preventDefault();
-                    alert(__("Please enter only barcodes, or only biblionumbers."));
+                    alert(_("Please enter only barcodes, or only biblionumbers."));
                 }
             });
         });
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt
index ad0aab33fc..48fe5fd43d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt
@@ -644,7 +644,7 @@
                             [% END %]
 
                             if ( ! content.length > 0 ) {
-                                alert(__("Please specify a content for 'Default'"));
+                                alert(_("Please specify a content for 'Default'"));
                                 return false;
                             }
                         }
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/calendar.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/calendar.inc
index 867498fae0..2a486d2b21 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/calendar.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/calendar.inc
@@ -101,7 +101,7 @@
         },
     });
 
-    var MSG_PLEASE_ENTER_A_VALID_DATE = ( __("Please enter a valid date (should match %s).") );
+    var MSG_PLEASE_ENTER_A_VALID_DATE = ( _("Please enter a valid date (should match %s).") );
 
     function is_valid_date(date) {
         // An empty string is considered as a valid date for convenient reasons.
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt
index 559e601596..e585ebe827 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt
@@ -374,7 +374,7 @@
                         $("#tag_hides").hide();
                         $("#tagsel_form").show();
                     } else {
-                        alert( __("No item was selected") );
+                        alert( _("No item was selected") );
                     }
                 }
 
@@ -389,7 +389,7 @@
                 function tagAdded() {
                     var checkedBoxes = $("input:checkbox:checked");
                     if (!$(checkedBoxes).size()) {
-                        alert( __("No item was selected") );
+                        alert( _("No item was selected") );
                         return false;
                     }
 
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt
index 27eac82106..53c4efe416 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt
@@ -656,7 +656,7 @@
             [% END %]
 
             if ($(".confirmjs:checked").size() == 0) {
-                alert( __("No item was selected") );
+                alert( _("No item was selected") );
                 return false;
             }
 
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt
index 062628b7b4..d0b1a9dd61 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt
@@ -603,7 +603,7 @@
                 if (checkedCount > 0) {
                     holdBiblioNums(checkedBiblioNums);
                 } else {
-                    alert( __("No item was selected") );
+                    alert( _("No item was selected") );
                 }
             }
 
@@ -618,7 +618,7 @@
             function tagSelected() {
                 var checkedBoxes = $(".searchresults :checkbox:checked");
                 if ($(checkedBoxes).size() == 0) {
-                    alert( __("No item was selected") );
+                    alert( _("No item was selected") );
                 } else {
                     $("#tagsel_tag").hide();
                     $(".resort").hide();
@@ -637,7 +637,7 @@
             function tagAdded() {
                 var checkedBoxes = $(".searchresults :checkbox:checked");
                 if ($(checkedBoxes).size() == 0) {
-                    alert( __("No item was selected") );
+                    alert( _("No item was selected") );
                     return false;
                 }
 
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
index 8c1c8d8145..981fd41f36 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
@@ -821,7 +821,7 @@ var MSG_CONFIRM_REMOVE_SHARE = _("Are you sure you want to remove this share?");
     function holdSelections() {
         var checkedBoxes = $("input:checkbox:checked");
         if ($(checkedBoxes).size() == 0) {
-            alert( __("No item was selected") );
+            alert( _("No item was selected") );
         } else {
             var bibs = "";
             $(checkedBoxes).each(function(){
@@ -839,7 +839,7 @@ var MSG_CONFIRM_REMOVE_SHARE = _("Are you sure you want to remove this share?");
             $(".tag_hides").hide();
             $("#tagsel_form").show();
         } else {
-            alert( __("No item was selected") );
+            alert( _("No item was selected") );
         }
     }
 
@@ -854,7 +854,7 @@ var MSG_CONFIRM_REMOVE_SHARE = _("Are you sure you want to remove this share?");
     function tagAdded() {
         var checkedBoxes = $("input:checkbox:checked");
         if (!$(checkedBoxes).size()) {
-            alert( __("No item was selected") );
+            alert( _("No item was selected") );
             return false;
         }
 
@@ -976,7 +976,7 @@ $(function() {
                     return confirmDelete(MSG_REMOVE_ONE_FROM_LIST);
                 }
             } else {
-                alert( __("No item was selected") );
+                alert( _("No item was selected") );
                 return false;
             }
         });
-- 
2.39.5