[koha-commits] main Koha release repository branch 19.11.x updated. v19.11.03-36-g6805597ea3

Fri Mar 6 01:00:36 CET 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, 19.11.x has been updated
       via  6805597ea3dde2744ca6bd526a1d6f1a4f92d308 (commit)
       via  9192dead205003ec562e08d9435a6d4c305c528b (commit)
       via  c31d1d54365d0c2fa2ce8337992a7ceab4045b37 (commit)
       via  701d2f64fca9f4f5eb266bc6557b9991498e2c17 (commit)
       via  841a0e573d23dbfb42fc07ab87676c5b95b64fab (commit)
      from  07af2a5645303ad35b45fabc3ed966f2ab55899e (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 6805597ea3dde2744ca6bd526a1d6f1a4f92d308
Author: Julian Maurice <julian.maurice at biblibre.com>
Date:   Fri Feb 14 09:46:01 2020 +0100

    Bug 24661: Fix inclusion of locale-related javascript files

    2 js files (Gettext.js, i18n.js) + 1 generated js file (locale_data.js)
    were added by bug 21156. Their URL are broken and the files are not loaded.

    Use Template::Toolkit plugin Asset to include these files, and exclude
    locale_data.js when language is english, because obviously translations
    are not needed in this case.

    Test plan:
    1. Just make sure the files mentioned above are loaded correctly when in
       English and in other languages as well

    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

    Signed-off-by: Joy Nelson <joy at bywatersolutions.com>

commit 9192dead205003ec562e08d9435a6d4c305c528b
Author: Julian Maurice <julian.maurice at biblibre.com>
Date:   Wed Feb 26 20:09:52 2020 +0100

    Bug 24734: Fix paths in LangInstaller.pm for JS files

    Use intrahtdocs and opachtdocs in order to get the correct paths for all
    kind of installations

    Test plan:
    1. With a dev install, run ./translator create/update/install xx-XX and
       verify that there is no error message
    2. With a standard install, run ./translator create/update/install xx-XX
       and verify that there is no error message

    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    Tested for dev/single/standard installs, no errors,
    just a (normal) warn from po2json.

    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

    Signed-off-by: Joy Nelson <joy at bywatersolutions.com>

commit c31d1d54365d0c2fa2ce8337992a7ceab4045b37
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date:   Fri Feb 14 11:42:54 2020 +0000

    Bug 21156: (RM follow-up) Correction to added filters

    These lines required url filters rather than uri filters, my mistake :(

    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

    Signed-off-by: Joy Nelson <joy at bywatersolutions.com>

commit 701d2f64fca9f4f5eb266bc6557b9991498e2c17
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date:   Mon Feb 10 14:13:04 2020 +0000

    Bug 21156: (RM follow-up) Add missing filters

    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

    Signed-off-by: Joy Nelson <joy at bywatersolutions.com>

commit 841a0e573d23dbfb42fc07ab87676c5b95b64fab
Author: Julian Maurice <julian.maurice at biblibre.com>
Date:   Mon Jan 4 21:08:29 2016 +0100

    Bug 21156: Add plural translation capabilities to JS files

    It adds Javascript equivalent of Koha::I18N's exported subroutines, and
    they are used the same way.

    String extraction is done only on *.js files and require gettext 0.19
    (available in Debian jessie, and also in wheezy-backports)

    It adds Javascript library Gettext.js for handling translation and a
    Perl script po2json to transform PO file into JSON.

    Gettext.js and po2json both come from Locale::Simple.
    There are several tools named po2json. It's simpler to integrate this
    one into Koha than to check if the good one is installed on the system.
    Locale::Simple is not needed.

    To avoid polluting the global namespace too much, this patch also
    introduce a global JS object named Koha and add some stuff in Koha.i18n

    Test plan:
    1. Add a translatable string in a JS file. For example, add this:
         alert(__nx("There is one item", "There are {count} items", 3,
         {count: 3}));
       to staff-global.js
    2. cd misc/translator && ./translate update fr-FR
    3. Open misc/translator/po/fr-FR-messages-js.po, verify that your
       string is present, and translate it
    4. cd misc/translator && ./translate install fr-FR
    5. (Optional) Verify that
       koha-tmpl/intranet-tmpl/prog/fr-FR/js/locale_data.js exists and
       contains your translation
    6. Open your browser on the staff main page, change language and verify
       that the message is translated
    7. Repeat 1-6 on OPAC side

    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    Works well, translation is OK and test message is displayed correctly.
    Current qa-tool error is a false positive.
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

    Signed-off-by: Joy Nelson <joy at bywatersolutions.com>

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

Summary of changes:
 C4/Installer/PerlDependencies.pm                   |    2 +-
 koha-tmpl/intranet-tmpl/js/Gettext.js              | 1264 ++++++++++++++++++++
 koha-tmpl/intranet-tmpl/js/i18n.js                 |   51 +
 .../prog/en/includes/doc-head-close.inc            |   10 +
 koha-tmpl/opac-tmpl/bootstrap/js/Gettext.js        | 1264 ++++++++++++++++++++
 koha-tmpl/opac-tmpl/bootstrap/js/i18n.js           |   51 +
 misc/translator/LangInstaller.pm                   |   70 +-
 misc/translator/po2json                            |  249 ++++
 8 files changed, 2950 insertions(+), 11 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/js/Gettext.js
 create mode 100644 koha-tmpl/intranet-tmpl/js/i18n.js
 create mode 100644 koha-tmpl/opac-tmpl/bootstrap/js/Gettext.js
 create mode 100644 koha-tmpl/opac-tmpl/bootstrap/js/i18n.js
 create mode 100755 misc/translator/po2json

hooks/post-receive
-- 
main Koha release repository