From 0ab782c7424f7b67a5fdfd58ad53098fe7d5b2e0 Mon Sep 17 00:00:00 2001
From: Blou <philippe.blouin@inlibro.com>
Date: Wed, 12 Feb 2014 12:03:08 -0500
Subject: [PATCH] Bug 11752 - wrong periodicity in OPAC details

This fixes bootstrap and prog by modifying the description displayed in the OPAC's detail of serials.

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 intranet.

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 <chris@bigballofwax.co.nz>
---
 .../bootstrap/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 d63593e..4a0dca9 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 @@
                                 <div id="subscriptionline[% subscription_LOO.subscriptionid %]" style="border-bottom:1px solid #EEE;">
                                     <h3>Subscription information for [% subscription_LOO.bibliotitle %]</h3>
                                     <p>
-                                        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 546bc15..60ecee3 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 %]
 <div id="subscriptionline[% subscription_LOO.subscriptionid %]" style="border-bottom:1px solid #EEE;">
 <h3>Subscription information for [% subscription_LOO.bibliotitle %]</h3>
-		<p>The current subscription began on [% subscription_LOO.startdate %] and is issued every
+		<p>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
-- 
1.8.5.3