Attachment 90255 Details for Bug 14242 – Bug 14242: (follow-up) Move English strings out of JavaScript

[patch] Bug 14242: (follow-up) Move English strings out of JavaScript

Bug-14242-follow-up-Move-English-strings-out-of-Ja.patch (text/plain), 2.49 KB, created by Maryse Simard on 2019-05-31 19:37:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Maryse Simard

Created: 2019-05-31 19:37:29 UTC

Size: 2.49 KB

patch

obsolete

>From ec3681ce2774ac4c745e01239399d01579054d76 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Mon, 13 May 2019 14:01:53 +0000
>Subject: [PATCH] Bug 14242: (follow-up) Move English strings out of JavaScript
>
>In order for English strings to be translatable they must be defined in
>the template, not in the JS file.
>
>Signed-off-by: Maryse Simard <maryse.simard@inlibro.com>
>---
> koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt | 4 ++--
> koha-tmpl/opac-tmpl/bootstrap/js/autofill.js                 | 7 ++-----
> 2 files changed, 4 insertions(+), 7 deletions(-)
>
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt
>index 02d6386..092fd9d 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt
>@@ -390,7 +390,8 @@
> [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") | $raw %]
> [% INCLUDE 'datatables.inc' %]
> <script>
>-    //<![CDATA[
>+    var MSG_UNDO_AUTOFILL_SUGGESTION =  _("Undo");
>+    var MSG_SEARCH_GOOGLE_BOOKS = _("Search Google Books");
>     [% IF ( loggedinusername ) %]
>         function enableCheckboxActions(){
>             // Enable/disable controls if checkboxes are checked
>@@ -465,6 +466,5 @@
>         });
>         [% END %]
>     });
>-//]]>
> </script>
> [% END %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/js/autofill.js b/koha-tmpl/opac-tmpl/bootstrap/js/autofill.js
>index 327566f..d3c2e46 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/js/autofill.js
>+++ b/koha-tmpl/opac-tmpl/bootstrap/js/autofill.js
>@@ -25,13 +25,10 @@
>         self.$elm = $(elm);
>         self.fields = fields;
> 
>-        var UNDO_STRING = _("Undo");
>-        var GOOGLE_BOOKS_STRING = _("Search Google Books");
>-
>         /* decorate element as autofiller */
>         var $inputgroup = $('<div class="input-prepend">');
>-        self.$undo = $('<span class="add-on" style="display:none;cursor:pointer;">' + UNDO_STRING + '</span>');
>-        self.$fillbtn = $('<span class="add-on" style="cursor:pointer;">' + GOOGLE_BOOKS_STRING + '</span>');
>+        self.$undo = $('<span class="add-on" style="display:none;cursor:pointer;">' + MSG_UNDO_AUTOFILL_SUGGESTION + '</span>');
>+        self.$fillbtn = $('<span class="add-on" style="cursor:pointer;">' + MSG_SEARCH_GOOGLE_BOOKS + '</span>');
>         self.$error = $('<span class="add-on" style="display:none;"></span>');
>         self.$elm.wrap($inputgroup);
>         self.$elm.after(self.$error);
>-- 
>2.7.4

Actions: View | Diff | Splinter Review

Attachments on bug 14242: 42002 | 55949 | 56061 | 56062 | 56070 | 56071 | 56072 | 56073 | 56074 | 56075 | 84760 | 84761 | 84762 | 84763 | 84764 | 84840 | 85031 | 85032 | 85033 | 85034 | 85035 | 89643 | 89662 | 90157 | 90158 | 90159 | 90160 | 90161 | 90162 | 90250 | 90251 | 90252 | 90253 | 90254 | 90255 | 103527 | 103528 | 103529 | 103530 | 103531 | 103532 | 103533 | 108695 | 108696 | 108697 | 108698 | 108699 | 108700 | 108701 | 110141 | 110142 | 110143 | 110144 | 110145 | 110146 | 110147 | 110148 | 110493 | 110494 | 110495 | 110496 | 110497 | 110498 | 110499 | 110500 | 110501 | 110990 | 112597 | 112598 | 112599 | 112600 | 112601 | 112602 | 112603 | 112604 | 112605 | 112606 | 112607 | 113162 | 113163 | 113164 | 113165 | 113166 | 113167 | 116620 | 116712 | 116968 | 116989 | 125380 | 125381 | 125382 | 131219 | 131220 | 131221 | 131222 | 133985 | 133986 | 133987 | 133988 | 134273 | 134274 | 134275 | 134276 | 134277 | 134278