[koha-commits] main Koha release repository branch 20.05.x updated. v20.05.04-81-g91b7881f4f

Tue Oct 20 19:55:32 CEST 2020

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, 20.05.x has been updated
       via  91b7881f4f886753f4819413d2452eafe9f5e463 (commit)
       via  2e7999477e9b9eec167d506b011477fec760141c (commit)
       via  3e69b43940696d63c1be7959334b75460af611cd (commit)
       via  d0fe29041d5213fe048577fa1f2fea0f36fdd651 (commit)
      from  47b3349aa0b69c0e3d9d962b2a3c7b8eceb4b520 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 91b7881f4f886753f4819413d2452eafe9f5e463
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Tue Sep 29 11:17:34 2020 +0000

    Bug 25320: (follow-up) Remove obsolete include file

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 1ac0850a336d2bb3e5d0bd3ad990e61a34b3dd65)

    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>

commit 2e7999477e9b9eec167d506b011477fec760141c
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Thu Jun 18 14:28:38 2020 +0000

    Bug 25320: Move translatable strings out of merge-record-strings.inc into merge-record.js

    This patch eliminates the use of a separate include file containing
    translatable strings in favor of embedding translatable strings in the
    JavaScript itself.

    To test, apply the patch and clear your browser cache if necessary.

     - Perform a catalog search in the staff interface.
     - Select two results to merge. Click Edit -> Merge records.
     - Click "Next" on the "Merging records" page.
     - On the "Source records" page click the second tab where all the
       checkboxes are unchecked.
       - Check the box for a tag which is non-repeatable, e.g. 245.
         - You should see a message, "The field is non-repeatable and
           already exists in the destination record. Therefore, you cannot add it."
       - Check the box for a subfield which is non-repeatable, e.g. 245$a.
         - You should see a message, "The subfield is non-repeatable and
           already exists in the destination record. Therefore, you cannot
           add it."

    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 prog/js/merge-record.js for
       translation, e.g.:

       #: koha-tmpl/intranet-tmpl/prog/js/merge-record.js:72
       msgctxt "Bibliographic record"
       msgid ""
       "The field is non-repeatable and already exists in the destination
       record. "
       "Therefore, you cannot add it."
       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 string should appear.

    Signed-off-by: David Nind <david at davidnind.com>

    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

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

    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>

commit 3e69b43940696d63c1be7959334b75460af611cd
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Tue Sep 29 11:29:29 2020 +0000

    Bug 26291: (follow-up) Correct stray MSG instances

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 654eda8edc6fb82a13553b3e9b55ea1264177aca)

    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>

commit d0fe29041d5213fe048577fa1f2fea0f36fdd651
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Mon Aug 24 18:25:35 2020 +0000

    Bug 26291: Move translatable strings out of z3950_search.inc into z3950_search.js

    This patch moves translatable strings out of z3950_search.inc into
    z3950_search.js, wrapped in the double-underscore function for
    translation.

    To test, apply the patch and go to Cataloging.

     - Click "New from Z39.50/SRU"
     - In the search form, uncheck all search targets and submit the form.
       You should get an error: "Please choose at least one external target"
     - Peform a search which will return multiple pages of results.
     - Test  that you can enter a number in the "Go to page" form to
       navigate to a specific page.
     - Enter a non-number in the field and submit. You should get an error,
       "The page entered is not a number."
     - Enter a number in the field which is greater than the number of pages
       of results. Submitting the form should trigger an error, "The page
       should be a number between 1 and 10."

     - Perform the same tests from the other Z39.50 search results
       interfaces:
       - Acquisitions -> Add to basket -> From an external source.
       - Authorities -> New authority -> New from Z39.50/SRU.

    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/z3950_search.js for translation,
      e.g.:

      msgid "The page entered is not a number."
      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 <david at davidnind.com>

    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 45558c35e3a425f749029088424f1eedd898c938)

    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>

-----------------------------------------------------------------------

Summary of changes:
 .../prog/en/includes/merge-record-strings.inc      |  7 -------
 .../prog/en/includes/z3950_search.inc              | 23 +---------------------
 .../prog/en/modules/acqui/z3950_search.tt          |  2 +-
 .../prog/en/modules/authorities/merge.tt           |  1 -
 .../prog/en/modules/cataloguing/merge.tt           |  1 -
 .../en/modules/cataloguing/z3950_auth_search.tt    |  2 +-
 .../prog/en/modules/cataloguing/z3950_search.tt    |  6 +++---
 koha-tmpl/intranet-tmpl/prog/js/merge-record.js    |  4 ++--
 koha-tmpl/intranet-tmpl/prog/js/z3950_search.js    | 20 ++++++++++++++++---
 9 files changed, 25 insertions(+), 41 deletions(-)
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/merge-record-strings.inc

hooks/post-receive
-- 
main Koha release repository