[koha-commits] main Koha release repository branch master updated. v3.14.00-1151-g8e364c4
Git repo owner
gitmaster at git.koha-community.org
Mon May 5 06:42:18 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 8e364c4c6adc45bef191a297ce7757d63fa1e806 (commit)
via 507944e41bec4987c9ef8c75c436332bdb727df2 (commit)
via 98309138a694f70383b36c03148ca291a835d5b9 (commit)
from e4f2326063047ce818ea12d6506a74cd01170476 (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 8e364c4c6adc45bef191a297ce7757d63fa1e806
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Tue Nov 19 14:30:21 2013 +0100
Bug 11262: Don't require hardcoded translations for seasonal numbering pattern to work
This patch removes the use of POSIX::strftime which is based on the
locales of the system.
The DateTime module translates month and day name with success, without
any locale installed.
For the saesons, I use the way used in Koha: write the word in
templates. On this way the translate script will match them and allow
translators to translate them.
This patch adds a regression: the season names are not translated
following the locale selected.
This could be done when bug 8044 will be pushed.
Test plan:
0/ Update your po files and translate the season name.
1/ Create a numbering pattern using season.
example:
Name: Seasonal
Numbering formula: {X}
X: Season, Add=1, Every=1, Set back to 0 when more than 3, formatting
"name of season"
And test the prediction pattern with:
frequency: 1/3 month
First issue : 2013-09-21
length: 12 months
X begins with 2 (21th Septembre is Fall)
2/ Click on the test pattern button, you should get:
Fall 21/09/2013
Winter 21/12/2013
Spring 21/03/2014
Summer 21/06/2014
Change the locale and verify the season names are *not* translated.
Change the Koha language and verify the season names are translated.
3/ Create a numbering pattern using day or month name.
example:
Name: day
Numbering formula: {X}
X: day, Add=1, Every=1, Set back to 0 when more than 6, formatting "name
of day"
Frequency: 1/day
First issue: 2013-11-18
length: 1 month
X begins with 0
You should get:
Monday 18/11/2013
Tuesday 19/11/2013
Wednesday 20/11/2013
[...]
Sunday 15/12/2013
Monday 16/12/2013
Tuesday 17/12/2013
change the locale and verify the day names are translated.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Work as described. No koha-qa errors
Tested on top of Bug 11265 and Bug 11263,
and solved merge conflict
Updating PO file gives seasons to translate.
Tested using seasons, day and month
Only note is different behavior
1) To use seasons you need to use staff in desired language
2) To use day and month only need to select locale
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
No regressions found. Passes koha-qa.pl, t and xt
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Tested this again on top of 11263 and it works as described.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 507944e41bec4987c9ef8c75c436332bdb727df2
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Thu Dec 12 11:27:26 2013 +0100
Bug 11263: Use all languages instead of just the translated ones
This patch produces the same dropdown list as the one in the adv search.
With this way, it won't be necessary to install additional templates to
fill the locale list.
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 98309138a694f70383b36c03148ca291a835d5b9
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Tue Nov 19 14:21:38 2013 +0100
Bug 11263: do not use system locales settings for subscriptions
The locales list for subscriptions should not be retrieved from the
locales of the system.
This patch retrieves the locales list from the Koha DB (in the same way
as pref language and opaclanguages).
Test plan:
Edit a subscription (or a numbering pattern) and verify the list of
languages is the same as languages available in Koha.
Note: with this patch we loose the saeson translation, it is
normal. See report linked.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Work as described. No koha-qa errors.
New locale is retrieved from installed languages.
I wonder if that list can be restricted to
'enabled' ones (parsing syspref language value).
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Passes QA script and all tests.
Works according to description.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Serials.pm | 48 +++++++++-----------
.../prog/en/modules/serials/serials-collection.tt | 12 ++++-
.../en/modules/serials/showpredictionpattern.tt | 14 +++++-
.../prog/en/modules/serials/subscription-add.tt | 8 ++--
.../modules/serials/subscription-numberpatterns.tt | 4 +-
serials/subscription-add.pl | 17 ++++---
serials/subscription-numberpatterns.pl | 14 +++---
7 files changed, 68 insertions(+), 49 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list