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, 17.05.x has been updated
via 485f2cdc7e44b16c90c9c6ba5a9861751e31c215 (commit)
from d45bc6ad530bc28b3065818e1fbd29c75af43cce (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 485f2cdc7e44b16c90c9c6ba5a9861751e31c215
Author: Marc Véron <veron at veron.ch>
Date: Sat May 20 09:18:10 2017 +0200
Bug 18641 - Translatability: Get rid of template directives in translations for *reserves.tt files
Template directives should not be exposed in translation, but lines like the following pop up in the translation tool:
Cancel [% IF TransferWhenCancelAllWaitingHolds %]and Transfer [% END %] All
This patch fixes it.
To test:
- Apply patch
- Verify that code changes make sense
- Verify that submit buttons of pendingreserves.tt and waitingreserves.tt
still work and display the same string as before
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Bug 18641: (RM-followup) for waitingreserves.tt
Code changed for waitingreserves.tt as asked for in comment #7
Bug 18641: Followup for pendingreserves.tt (less %s)
Change as of comment #13 to reduce %s
After creating a new translation for a "language" aa-AA, we have
the following in the file aa-AA-staff-prog.po
msgid ""
"(Inclusive, default is %s days ago to %s days ahead. Set other date ranges "
"as needed.)"
msgstr ""
msgid ""
"(Inclusive, default is %s days ago to today. Set other date ranges as "
"needed.)"
msgstr ""
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 78b30baf3fa975ab9eabc58733a2252b08d22f25)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
-----------------------------------------------------------------------
Summary of changes:
.../intranet-tmpl/prog/en/modules/circ/pendingreserves.tt | 8 +++++++-
.../intranet-tmpl/prog/en/modules/circ/waitingreserves.tt | 7 +++++--
2 files changed, 12 insertions(+), 3 deletions(-)
hooks/post-receive
--
main Koha release repository