[koha-commits] main Koha release repository branch 20.05.x updated. v20.05.04-70-g2e71e8373d
Git repo owner
gitmaster at git.koha-community.org
Tue Oct 20 18:54:10 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 2e71e8373dcf977a0a7b5ffd55b0bf6ceac6b83e (commit)
via 83e6b28d8127938d8b1e26512de9b93dc72bf591 (commit)
via 7ede1c5493fd73ee4ae527fc7d36c7e5025bea92 (commit)
via 9cd67c8489fffe9700d76328c4d30774df83a87c (commit)
via 1d7a7d4b0fec814489be1e433037666d57ac7ccc (commit)
from 556860275d6b21743fc94ed7e96d22676dc3682b (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 2e71e8373dcf977a0a7b5ffd55b0bf6ceac6b83e
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Aug 14 18:12:09 2020 +0000
Bug 26217: Move translatable strings out of templates into acq.js
This patch removes the definition of translatable strings out of
templates and into the JavaScript file, using the new JS i81n function.
To test:
- Apply the patch, go to acquisitions, and view a vendor.
- Click "Uncertain prices" in the sidebar menu.
- In the table of orders, enter something in the "price" form field
which isn't a valid price. You should get an error message.
- Test the validation of fund amounts: Go to Administration -> Budgets
and create an active budget if necessary.
- Add a fund to that budget. Try to save the fund with a fund amount
which exceed the amount in the budget.
- You should get an error message: "Fund amount exceeds period
allocation"
- Add a fund with valid data and then go to Administration -> Funds and
locate the fun you just created.
- Use the "Actions" menu to add a sub fund to that fund.
- Try to save this new fund with an amount which exceeds the amount in
the parent fund.
- You should get an error message, "Fund amount exceeds parent
allocation."
Note: I was unable to properly test the error message "New budget-parent
is beneath budget." I couldn't figure out how to trigger 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
koha-tmpl/intranet-tmpl/prog/js/acq.js for translation, e.g.:
msgid "Fund amount exceeds period allocation"
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 912d911db2eff822b3a964cc84f7d2653d696815)
Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>
commit 83e6b28d8127938d8b1e26512de9b93dc72bf591
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed Aug 19 18:33:28 2020 +0000
Bug 26256: Move translatable strings out of templates and into serials-toolbar.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 go to Serials and search for a subscription.
- Open the detail page for an open subscription.
- Click the "Close" button. You should get a confirmation, "Are you
sure you want to close this subscription?"
- Confirm that you want to close it.
- When the page reloads, click the "Reopen" button. You should get a
confirmation, "Are you sure you want to reopen this subscription?"
- Cancel.
- Choose Edit -> Delete subscription. You should get a confirmation,
"Are you sure you want to delete this subscription?"
- Perform the same tests from the "Serial collection" page.
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/serials-toolbar.js for translation,
e.g.:
msgid "Are you sure you want to delete this subscription?"
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: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit ea72b15480c7230c03e7620e9900dc32ae0691c5)
Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>
commit 7ede1c5493fd73ee4ae527fc7d36c7e5025bea92
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Fri Sep 25 20:24:20 2020 +0000
Bug 26243: (QA follow-up) Switch quotes to avoid translation issues
The QA script warned about text in single quotes which can be
a problem for languages like French that need to be able to use
these quotes in their translations.
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 124560556efea775ceb04c77a0ef77cbc130f894)
Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>
commit 9cd67c8489fffe9700d76328c4d30774df83a87c
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Aug 18 18:45:56 2020 +0000
Bug 26243: Move translatable strings out of templates and into circulation.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 check out to a patron.
- If there are none on the account, add a new message using the "Add a
new message" link.
- Click "Delete" for that message.
- You should get a confirmation message, "Are you sure you want to
delete this message? This cannot be undone."
- If necessary, enable the ExportCircHistory system preference.
- Check out to a patron who has one or more items checked out.
- Wihtout checking any checkboxes, click the "Export" button at the
bottom of the page.
- You should get an error message, "You must select checkout(s) to
export."
- Add a restriction the patron's account.
- Delete the restriction. You should get a confirmation message, "Remove
restriction?"
- Perform the same tests from the patron detail page.
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/circulation.js for translation,
e.g.:
msgid "You must select checkout(s) to export"
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 111b14dc965d51561add33d94eaf18616a815e88)
Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>
commit 1d7a7d4b0fec814489be1e433037666d57ac7ccc
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Jul 31 17:19:00 2020 +0000
Bug 26118: Move translatable strings out of tags/review.tt and into tags-review.js
This patch removes the section of the tags review template which defined
strings for translation. They can now be embedded in the JavaScript
file, wrapped in the __() function.
To test, apply the patch and clear your browser cache if necessary.
- Go to Tools -> Tags and perform some actions which will trigger the
use of translated strings in the interface. For instance:
- Approving and rejecting tags
- Testing tags which are approved, rejected, or unclassified.
- Status messages for these operations should work correctly.
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/tags-review.js for
translation, e.g.:
msgid "Both subfield values should be filled or empty."
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 b1a3aeb0624700627a2cb4e1069190e596d50d12)
Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>
-----------------------------------------------------------------------
Summary of changes:
.../prog/en/modules/acqui/uncertainprice.tt | 1 -
.../prog/en/modules/admin/aqbudgets.tt | 7 ------
.../prog/en/modules/circ/circulation.tt | 5 +---
.../prog/en/modules/members/moremember.tt | 5 +---
.../prog/en/modules/serials/serials-collection.tt | 3 ---
.../prog/en/modules/serials/serials-home.tt | 5 +---
.../prog/en/modules/serials/serials-search.tt | 3 ---
.../prog/en/modules/serials/subscription-detail.tt | 3 ---
.../intranet-tmpl/prog/en/modules/tags/review.tt | 16 -------------
koha-tmpl/intranet-tmpl/prog/js/acq.js | 8 +++----
.../intranet-tmpl/prog/js/pages/circulation.js | 4 ++--
.../intranet-tmpl/prog/js/pages/tags-review.js | 28 +++++++++++-----------
koha-tmpl/intranet-tmpl/prog/js/serials-toolbar.js | 8 +++----
13 files changed, 27 insertions(+), 69 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list