From c81350b6200ce62c180f6fd301ed3406db893835 Mon Sep 17 00:00:00 2001 From: Rafal Kopaczka Date: Sat, 3 Sep 2016 18:06:47 +0200 Subject: [PATCH] Bug 17245: Untranslatable abbreviated names of seasons. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Kyle M Hall (cherry picked from commit 4da3bf5e48fa3462d2f3eca0f3c45f64dc9bb5b2) Signed-off-by: Frédéric Demians --- .../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 9a79ecaa32..ea2564b252 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 @@ -278,6 +278,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 da045631f2..488e484cdf 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/showpredictionpattern.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/showpredictionpattern.tt @@ -65,6 +65,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.39.5