Attachment 108535 Details for Bug 26242 – Bug 26242: Move translatable strings out of results.tt and into results.js

[patch] Bug 26242: Move translatable strings out of results.tt and into results.js

Bug-26242-Move-translatable-strings-out-of-results.patch (text/plain), 6.23 KB, created by Owen Leonard on 2020-08-18 17:59:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Leonard

Created: 2020-08-18 17:59:05 UTC

Size: 6.23 KB

patch

obsolete

>From ce5f6c63845f2e9ef19119b6a907f16e63369a4b Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Tue, 18 Aug 2020 17:43:22 +0000
>Subject: [PATCH] Bug 26242: Move translatable strings out of results.tt and
> into results.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 and perform a catalog search which will return
> multiple results.
>- Without checking any checkboxes, click the "Add to Cart" button. You
> should see a message, "No item was selected."
>- The same should happen if you select an item from the "Add to list"
> menu or click the "Place hold" button.
>- Click the "Select all" link to check all checkboxes.
>- Click the "Place hold" button.
>- You will inevitably get a "One or more selected items cannot be placed
> on hold." message. If you were to want to complete this process you
> would have to painstakingly sift through each search result to find
> which item couldn't be placed on hold so that you could uncheck the
> corresponding checkbox. Luckily this test plan doesn't require you to
> do that.
>- If you don't get an error message you're living in a catalog utopia
> unlike any I have ever seen.
>
>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/pages/results.js for translation,
> e.g.:
>
> msgid "Nothing is selected"
> 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.
>---
> .../intranet-tmpl/prog/en/modules/catalogue/results.tt | 2 --
> koha-tmpl/intranet-tmpl/prog/js/pages/results.js | 14 +++++++-------
> 2 files changed, 7 insertions(+), 9 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
>index 72cd9a00a4..928e133d38 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
>@@ -710,8 +710,6 @@
> [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") | $raw %]
> [% Asset.js("js/coce.js") | $raw %]
> <script>
>- var MSG_NO_ITEM_SELECTED = _("Nothing is selected.");
>- var MSG_NON_RESERVES_SELECTED = _("One or more selected items cannot be placed on hold.");
> var PREF_AmazonCoverImages = parseInt( "[% Koha.Preference('AmazonCoverImages') | html %]", 10);
> var q_array = new Array(); // will hold search terms, if present
> var PREF_LocalCoverImages = parseInt( "[% Koha.Preference('LocalCoverImages') | html %]", 10);
>diff --git a/koha-tmpl/intranet-tmpl/prog/js/pages/results.js b/koha-tmpl/intranet-tmpl/prog/js/pages/results.js
>index 6c3a488575..b6d44a9ba6 100644
>--- a/koha-tmpl/intranet-tmpl/prog/js/pages/results.js
>+++ b/koha-tmpl/intranet-tmpl/prog/js/pages/results.js
>@@ -1,4 +1,4 @@
>-/* global KOHA biblionumber new_results_browser addMultiple vShelfAdd openWindow search_result SEARCH_RESULTS PREF_AmazonCoverImages PREF_LocalCoverImages PREF_IntranetCoce PREF_CoceProviders CoceHost CoceProviders addRecord delSingleRecord PREF_BrowseResultSelection resetSearchContext addBibToContext delBibToContext getContextBiblioNumbers MSG_NO_ITEM_SELECTED MSG_NO_ITEM_SELECTED holdfor_cardnumber holdforclub strQuery MSG_NON_RESERVES_SELECTED PREF_NotHighlightedWords PLACE_HOLD __ */
>+/* global KOHA biblionumber new_results_browser addMultiple vShelfAdd openWindow search_result SEARCH_RESULTS PREF_AmazonCoverImages PREF_LocalCoverImages PREF_IntranetCoce PREF_CoceProviders CoceHost CoceProviders addRecord delSingleRecord PREF_BrowseResultSelection resetSearchContext addBibToContext delBibToContext getContextBiblioNumbers holdfor_cardnumber holdforclub strQuery PREF_NotHighlightedWords PLACE_HOLD __ */
> 
> if( PREF_AmazonCoverImages ){
> $(window).load(function() {
>@@ -227,7 +227,7 @@ function clearAll () {
> function placeHold () {
> var checkedItems = $(".selection:checked");
> if ($(checkedItems).size() == 0) {
>- alert(MSG_NO_ITEM_SELECTED);
>+ alert( __("Nothing is selected") );
> return false;
> }
> var bibs = "";
>@@ -235,7 +235,7 @@ function placeHold () {
> $(checkedItems).each(function() {
> var bib = $(this).val();
> if ($("#reserve_" + bib).size() == 0) {
>- alert(MSG_NON_RESERVES_SELECTED);
>+ alert( __("One or more selected items cannot be placed on hold.") );
> badBibs = true;
> return false;
> }
>@@ -263,7 +263,7 @@ function browse_selection () {
> browser.create(1, search_result.query_cgi, search_result.limit_cgi, search_result.sort_by, bibnums, bibnums.length);
> window.location = '/cgi-bin/koha/catalogue/detail.pl?biblionumber=' + bibnums[0] + '&searchid='+browser.searchid;
> } else {
>- alert(MSG_NO_ITEM_SELECTED);
>+ alert( __("Nothing is selected") );
> }
> return false;
> }
>@@ -271,7 +271,7 @@ function browse_selection () {
> function addToList () {
> var checkedItems = $(".selection:checked");
> if ($(checkedItems).size() == 0) {
>- alert(MSG_NO_ITEM_SELECTED);
>+ alert( __("Nothing is selected") );
> return false;
> }
> var bibs = "";
>@@ -314,9 +314,9 @@ function verify_images() {
> var w = this.width;
> var h = this.height;
> if ((w == 1) || (h == 1)) {
>- $(this).parent().html(''+__("No cover image available")+'');
>+ $(this).parent().html(''+ __("No cover image available") +'');
> } else if ((this.complete != null) && (!this.complete)) {
>- $(this).parent().html(''+__("No cover image available")+'');
>+ $(this).parent().html(''+ __("No cover image available") +'');
> }
> }
> });
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 26242: 108535 | 109772 | 109992 | 110891