From 5fd3cba91d69a5dadf6d6cc9cf8c902c6aa0f051 Mon Sep 17 00:00:00 2001 From: Rafal Kopaczka Date: Sat, 3 Sep 2016 18:06:47 +0200 Subject: [PATCH] [PASSED QA] Bug 17245: Untranslatable abbreviated names of seasons. Because seasons strings are not available through DateTime module, names of them where added in code, and templates. Bug 16289 adds new abbreviated form to the code, but not to the templates. This patch should fix the problem. To test: 1. Apply patch. 2. Run "misc/translator/translate update" for you language. 3. Check if names are in po/ file for language. 4. Check if generating next issue for serial and prediction patterns works correct. NOTE: or "create {language code}" instead of update. Signed-off-by: Mark Tompsett Signed-off-by: Katrin Fischer --- .../intranet-tmpl/prog/en/modules/serials/serials-collection.tt | 8 ++++++++ .../prog/en/modules/serials/showpredictionpattern.tt | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt index f723626..293c5bf 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt @@ -275,6 +275,14 @@ $(document).ready(function() { [% matches.0 %]Fall[% matches.1 %] [% ELSIF ( matches = serial.serialseq.match('(.*)Winter(.*)') ) %] [% matches.0 %]Winter[% matches.1 %] + [% ELSIF ( matches = prediction.number.match('(.*)Spr(.*)') ) %] + [% matches.0 %]Spr[% matches.1 %] + [% ELSIF ( matches = prediction.number.match('(.*)Sum(.*)') ) %] + [% matches.0 %]Sum[% matches.1 %] + [% ELSIF ( matches = prediction.number.match('(.*)Fal(.*)') ) %] + [% matches.0 %]Fal[% matches.1 %] + [% ELSIF ( matches = prediction.number.match('(.*)Win(.*)') ) %] + [% matches.0 %]Win[% matches.1 %] [% ELSE %] [% serial.serialseq %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/showpredictionpattern.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/showpredictionpattern.tt index e23f912..0df881a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/showpredictionpattern.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/showpredictionpattern.tt @@ -70,6 +70,14 @@ [% matches.0 %]Fall[% matches.1 %] [% ELSIF ( matches = prediction.number.match('(.*)Winter(.*)') ) %] [% matches.0 %]Winter[% matches.1 %] + [% ELSIF ( matches = prediction.number.match('(.*)Spr(.*)') ) %] + [% matches.0 %]Spr[% matches.1 %] + [% ELSIF ( matches = prediction.number.match('(.*)Sum(.*)') ) %] + [% matches.0 %]Sum[% matches.1 %] + [% ELSIF ( matches = prediction.number.match('(.*)Fal(.*)') ) %] + [% matches.0 %]Fal[% matches.1 %] + [% ELSIF ( matches = prediction.number.match('(.*)Win(.*)') ) %] + [% matches.0 %]Win[% matches.1 %] [% ELSE %] [% prediction.number %] [% END %] -- 2.7.4