[koha-commits] main Koha release repository branch master updated. v3.16.00-20-g8a32843
Git repo owner
gitmaster at git.koha-community.org
Fri May 23 16:45:16 CEST 2014
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, master has been updated
via 8a32843ebf8ba959ac2af95cf76caae71209b8db (commit)
via 47f7cc89008313444c40e2051355e8b4684d342d (commit)
from 41def6af1dc574cee0b88ce99a2af1d983809b1c (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 8a32843ebf8ba959ac2af95cf76caae71209b8db
Author: Galen Charlton <gmc at esilibrary.com>
Date: Fri May 23 15:02:27 2014 +0000
Bug 11392: (follow-up) fix syntax error in template
In the two FOREACH loops introduced by the patch, wrap
the module and action names with quotes. This fixes a
problem where parsing the template crashes with the following
error:
Template process failed: file error - parse error - .../viewlog.tt line 83: unexpected token (RETURN)
[% FOREACH actx IN [ ADD DELETE MODIFY ISSUE RETURN CREATE ] %] at .../C4/Templates.pm line 132.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 47f7cc89008313444c40e2051355e8b4684d342d
Author: Pasi Kallinen <pasi.kallinen at pttk.fi>
Date: Fri May 9 13:40:14 2014 +0300
Bug 11392: Allow translating the viewlog module and action names
When viewing the logs, the user can see module and action,
such as "SYSTEMPREFERENCE", "MEMBERS" or "CREATE", "MODIFY", etc.
These texts are not translatable.
This patch allows translating those. It also adds the missing "CREATE"
action to the pulldown.
To test:
1) Go browse the system logs. Note the contents of the "Action" and
"Module" -pulldowns, and the contents of those columns in the log table.
2) Apply patch
3) Go browse the system logs again. The pull-downs should work, and
show the same values as before (plus "Create" for Action), and the
Action and Module -columns in the log table should not be in ALL CAPS.
4) cd misc/translator
5) perl translate update xx-YY
6) Check that the po/xx-YY-i-staff-t-prog-v-3006000.po contains the
values for the pull-downs in it. (Look for eg. "System prefs")
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
-----------------------------------------------------------------------
Summary of changes:
.../intranet-tmpl/prog/en/modules/tools/viewlog.tt | 51 ++++++++++++++------
1 file changed, 35 insertions(+), 16 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list