From 5cdbf8980998a71cbf3ada3d2ca46ea577db505d Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 17 Feb 2022 16:20:30 +0100 Subject: [PATCH] Bug 20511: Make seasons translatable in prediction pattern The season is stored in the DB in English and but not translated when displayed on the interface. This patch will translate the different seasons and their short form ('Spr' for 'Spring'). Test plan: Update the PO of the language you like Edit po/xx-XX-messages.po and translate the season names Setup a new language and use it for the staff interface Create a new subscription using the "Seasonal" subscription pattern Generate new serial items and confirm that the seasons are correctly translated when displayed Sponsored-by: Orex Digital Signed-off-by: Florian Bontemps --- .../en/includes/locales/subscriptions.inc | 14 +++++++++++++ .../prog/en/modules/catalogue/detail.tt | 11 +++++++--- .../prog/en/modules/serials/claims.tt | 3 ++- .../prog/en/modules/serials/routing.tt | 6 ++++-- .../en/modules/serials/serials-collection.tt | 21 ++----------------- .../en/modules/serials/subscription-detail.tt | 3 ++- 6 files changed, 32 insertions(+), 26 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/locales/subscriptions.inc diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/locales/subscriptions.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/locales/subscriptions.inc new file mode 100644 index 0000000000..c32720c813 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/locales/subscriptions.inc @@ -0,0 +1,14 @@ +[% USE I18N %] +[%~ BLOCK numbering_patterns_i18n ~%] + + [%~ SET spring = I18N.t('Spring') ~%] + [%~ SET summer = I18N.t('Summer') ~%] + [%~ SET autumn = I18N.t('Autumn') ~%] + [%~ SET winter = I18N.t('Winter') ~%] + [%~ SET spr = I18N.t('Spr') ~%] + [%~ SET sum = I18N.t('Sum') ~%] + [%~ SET fal = I18N.t('Fal') ~%] + [%~ SET win = I18N.t('Win') ~%] + + [%~ pattern.replace('Spr', spr).replace('Sum', sum).replace('Fal', fal).replace('Win', win).replace('Spring', spring).replace('Summer', summer).replace('Autumn', autumn).replace('Winter', winter) | html ~%] +[%~ END ~%] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt index 905fd07bd3..3135cc9c4f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -9,6 +9,7 @@ [% USE Price %] [% USE TablesSettings %] [% PROCESS 'i18n.inc' %] +[% PROCESS 'locales/subscriptions.inc' %] [% IF Koha.Preference('AmazonAssocTag') %] [% AmazonAssocTag = '?tag=' _ Koha.Preference('AmazonAssocTag') %] @@ -421,12 +422,16 @@ Note that permanent location is a code, and location may be an authval. [% item.enumchron | html %] [% IF ( item.serialseq && item.enumchron!=item.serialseq ) %] -- - [% item.serialseq | html %] + + [% PROCESS numbering_patterns_i18n pattern => item.serialseq %] + [% END %] [% ELSIF item.enumchron %] [% item.enumchron | html %] [% ELSIF item.serialseq %] - [% item.serialseq | html %] + + [% PROCESS numbering_patterns_i18n pattern => item.serialseq %] + [% END %] [% IF ( item.publisheddate ) %] ([% item.publisheddate | $KohaDates %]) @@ -740,7 +745,7 @@ Note that permanent location is a code, and location may be an authval. [% FOREACH latestserial IN subscription.latestserials %] - [% latestserial.serialseq | html %] + [% PROCESS numbering_patterns_i18n pattern => latestserial.serialseq %] [% latestserial.planneddate | $KohaDates %] [% latestserial.publisheddate | $KohaDates %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt index 9c9278a7f2..8e5a92c03c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt @@ -6,6 +6,7 @@ [% INCLUDE 'doc-head-open.inc' %] [% IF ( supplierid ) -%] Claims for [% suppliername | html %] [% END %] › Claims › Serials › Koha [% INCLUDE 'doc-head-close.inc' %] +[% PROCESS 'locales/subscriptions.inc' %] @@ -156,7 +157,7 @@ [% missingissue.title | html %] [% missingissue.issn | html %] - [% missingissue.serialseq | html %] + [% PROCESS numbering_patterns_i18n pattern => missingissue.serialseq %] [% IF ( missingissue.status1 ) %]Expected[% END %] [% IF ( missingissue.status3 ) %]Late[% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt index 6d4974a8d3..0bb08518d4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt @@ -7,6 +7,7 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'serials-search.inc' %] +[% PROCESS 'locales/subscriptions.inc' %]