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

Tue Oct 20 18:36:43 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  15263e625a6a47f3cbcf1d658038051cee7bf9d8 (commit)
       via  452f893e76fd2331525b16a1ff9aa0484588a189 (commit)
       via  e31653831065498341ce64d059b7fa3a8ca63da5 (commit)
       via  6c1a4433e2a1e3fd3ec8481bbccce299b07a590c (commit)
       via  453cd12773fc0c1b72958fd4d14b0f76569402d3 (commit)
      from  d1322bd42213caf6a79f012bef43c8040e1bf5dc (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 15263e625a6a47f3cbcf1d658038051cee7bf9d8
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Sep 29 14:26:58 2020 +0200

    Bug 25321: Remove 2 remaining occurrences of strings.inc

    They were used for browser.js

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

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

commit 452f893e76fd2331525b16a1ff9aa0484588a189
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Sep 29 11:12:23 2020 +0200

    Bug 25321: Remove PLACE_HOLD from results.js

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

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

commit e31653831065498341ce64d059b7fa3a8ca63da5
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Fri Aug 21 12:11:11 2020 +0000

    Bug 25321: Move translatable strings out of strings.inc into the corresponding JavaScript

    This patch moves string definitions out of strings.inc and into the
    corresponding JavaScript files.

    To test, apply the patch and test various pages in the staff interface:

    A few suggestions:

    - Perform a catalog search and view the detail page for a bibliographic record.
      - Confirm that the search results browser in the left-hand sidebar
        work correctly and that the title attributes of the controls are
        correct.
    - Locate a patron with multiple checkouts. View the checkout page and
      test the various controls in the table of checkouts: Renew, check in,
      return claims, etc.
    - View the list of holds on a patron's account. Test suspending and
      resuming holds.

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

      msgid "Checked in"
      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: Lucas Gass <lucas at bywatersolutions.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 5fa99d7d59ffe65a3533c79a637b50f04e904736)

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

commit 6c1a4433e2a1e3fd3ec8481bbccce299b07a590c
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Tue Aug 18 17:09:31 2020 +0000

    Bug 26240: Move translatable strings out of sms_providers.tt and into sms_providers.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 you must have the SMSSendDriver preference populated ("Email" is
    fine).

    - Apply the patch and go to Administration -> SMS cellular providers.
    - Click "New SMS provider."
    - The legend on the form's fieldset should read "Add an SMS cellular
      provider."
    - Add an SMS provider.
    - Edit an SMS provider.
    - The legend on the form's fieldset should read "Edit provider <provider
      name>"
    - If necessary, edit a patron's SMS settings to use one of your existing
      SMS providers.
    - From the list of SMS providers, click to delete the provider which is
      in use.
    - The error message should read "Are you sure you want to delete
      <provider name>? <number> patron(s) are using it!"
    - Click to delete a provider which isn't in use. The error message
      should read "Are you sure you want to delete <provider>?"

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

      msgid "Add an SMS cellular provider"
      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 9e06e62a7fa59228d5aa8b4dcf16205dc33e8897)

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

commit 453cd12773fc0c1b72958fd4d14b0f76569402d3
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Tue Aug 18 17:43:22 2020 +0000

    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.

    Signed-off-by: Alexis Ripetti <alexis.ripetti at inLibro.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 c2b14f6a1e1f4b80e2aab5ce111e67841b8b90a6)

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

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

Summary of changes:
 koha-tmpl/intranet-tmpl/js/browser.js              | 12 ++--
 .../intranet-tmpl/prog/en/includes/strings.inc     | 61 -----------------
 .../prog/en/modules/admin/sms_providers.tt         |  6 --
 .../prog/en/modules/catalogue/ISBDdetail.tt        |  1 -
 .../prog/en/modules/catalogue/MARCdetail.tt        |  1 -
 .../prog/en/modules/catalogue/detail.tt            |  1 -
 .../prog/en/modules/catalogue/labeledMARCdetail.tt |  1 -
 .../prog/en/modules/catalogue/moredetail.tt        |  1 -
 .../prog/en/modules/catalogue/results.tt           |  3 -
 .../prog/en/modules/catalogue/stockrotation.tt     |  1 -
 .../prog/en/modules/cataloguing/addbiblio.tt       |  1 -
 .../prog/en/modules/cataloguing/additem.tt         |  1 -
 .../prog/en/modules/circ/circulation.tt            |  1 -
 .../prog/en/modules/members/moremember.tt          |  1 -
 koha-tmpl/intranet-tmpl/prog/js/checkouts.js       | 78 +++++++++++-----------
 koha-tmpl/intranet-tmpl/prog/js/holds.js           | 50 +++++++-------
 koha-tmpl/intranet-tmpl/prog/js/pages/results.js   | 16 ++---
 koha-tmpl/intranet-tmpl/prog/js/sms_providers.js   |  8 +--
 18 files changed, 83 insertions(+), 161 deletions(-)
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc

hooks/post-receive
-- 
main Koha release repository