From 7f1e949ea0e8d05b641ddbcb4582a3e1bc913ecd Mon Sep 17 00:00:00 2001 From: Blou Date: Wed, 12 Feb 2014 12:03:08 -0500 Subject: [PATCH] Bug 11752: display the correct frequency for serial subscriptions in OPAC details This fixes bootstrap and prog by modifying the description displayed in the OPAC's detail of serials. RM NOTE: this patch does not cover the case where custom serial frequencies have been defined. TESTING to reproduce - create/find a serial with a 1/week periodicity (4 in the database) - Find it in the opac-detail.pl, click "more details" at the bottom - validate the string. Before the patch, it will say: "The current subscription began on 2013-12-06 and is issued every 3 weeks for 26 issues" The "every 3 weeks" is clearly wrong. In fact any periodicity chosen would display a wrong description, not matching the staff interface. After the patch, the display is corrected. As a bonus, the "every 2 years" now has a description, where it had none before. Signed-off-by: Chris Cormack Signed-off-by: Kyle M Hall Signed-off-by: Galen Charlton --- .../en/modules/opac-serial-issues.tt | 33 ++++++++++--------- .../prog/en/modules/opac-serial-issues.tt | 33 ++++++++++--------- 2 files changed, 36 insertions(+), 30 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt index 9967f887ad..fe91f8ba4c 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt @@ -39,42 +39,45 @@

Subscription information for [% subscription_LOO.bibliotitle %]

- The current subscription began on [% subscription_LOO.startdate %] and is issued every + The current subscription began on [% subscription_LOO.startdate %] and is issued [% IF ( subscription_LOO.periodicity1 ) %] - day + twice per day [% END %] [% IF ( subscription_LOO.periodicity2 ) %] - week + every day [% END %] [% IF ( subscription_LOO.periodicity3 ) %] - 2 weeks + three times per week [% END %] [% IF ( subscription_LOO.periodicity4 ) %] - 3 weeks + every week [% END %] [% IF ( subscription_LOO.periodicity5 ) %] - month + every 2 weeks [% END %] [% IF ( subscription_LOO.periodicity6 ) %] - 2 months + every 3 weeks [% END %] [% IF ( subscription_LOO.periodicity7 ) %] - 3 months - [% END %] - [% IF ( subscription_LOO.periodicity13 ) %] - 4 months + every month [% END %] [% IF ( subscription_LOO.periodicity8 ) %] - quarter + every 2 months [% END %] [% IF ( subscription_LOO.periodicity9 ) %] - 2 quarters + every quarter [% END %] [% IF ( subscription_LOO.periodicity10 ) %] - year + twice per year [% END %] [% IF ( subscription_LOO.periodicity11 ) %] - 2 years + every year + [% END %] + [% IF ( subscription_LOO.periodicity12 ) %] + every 2 years + [% END %] + [% IF ( subscription_LOO.periodicity13 ) %] + irregularly [% END %] [% IF ( subscription_LOO.arrival1 ) %] on Monday diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-serial-issues.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-serial-issues.tt index 5d590a99c5..3c1574ac7c 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-serial-issues.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-serial-issues.tt @@ -21,42 +21,45 @@ [% FOREACH subscription_LOO IN subscription_LOOP %]

Subscription information for [% subscription_LOO.bibliotitle %]

-

The current subscription began on [% subscription_LOO.startdate %] and is issued every +

The current subscription began on [% subscription_LOO.startdate %] and is issued [% IF ( subscription_LOO.periodicity1 ) %] - day + twice per day [% END %] [% IF ( subscription_LOO.periodicity2 ) %] - week + every day [% END %] [% IF ( subscription_LOO.periodicity3 ) %] - 2 weeks + three times per week [% END %] [% IF ( subscription_LOO.periodicity4 ) %] - 3 weeks + every week [% END %] [% IF ( subscription_LOO.periodicity5 ) %] - month + every 2 weeks [% END %] [% IF ( subscription_LOO.periodicity6 ) %] - 2 months + every 3 weeks [% END %] [% IF ( subscription_LOO.periodicity7 ) %] - 3 months - [% END %] - [% IF ( subscription_LOO.periodicity13 ) %] - 4 months + every month [% END %] [% IF ( subscription_LOO.periodicity8 ) %] - quarter + every 2 months [% END %] [% IF ( subscription_LOO.periodicity9 ) %] - 2 quarters + every quarter [% END %] [% IF ( subscription_LOO.periodicity10 ) %] - year + twice per year [% END %] [% IF ( subscription_LOO.periodicity11 ) %] - 2 years + every year + [% END %] + [% IF ( subscription_LOO.periodicity12 ) %] + every 2 years + [% END %] + [% IF ( subscription_LOO.periodicity13 ) %] + irregularly [% END %] [% IF ( subscription_LOO.arrival1 ) %] on Monday -- 2.39.5