From b1b0d88e114357a7bb4adb6d1a55c7dd767796c1 Mon Sep 17 00:00:00 2001
From: Katrin Fischer <Katrin.Fischer.83@web.de>
Date: Sun, 22 Sep 2013 16:20:19 +0200
Subject: [PATCH] Bug 6739: (follow-up) yet more fixes

- Fixes a typo in one of the OPAC messages: "you account"
- Fixes the updatedatabase script to use 1 instead of yes for the
  system preference default matching the sysprefs.sql file.
- Fixes capitalization "Don't Block" in system preference
  description.
- Adding . to the end of the warning, when renewals are blocked.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
---
 installer/data/mysql/updatedatabase.pl                          | 2 +-
 .../intranet-tmpl/prog/en/modules/admin/preferences/opac.pref   | 2 +-
 koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt             | 2 +-
 koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt                | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 9fc0be3fc4..e436b24039 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -7146,7 +7146,7 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
         INSERT INTO systempreferences (variable,value,explanation,options,type)
         VALUES (
             'BlockExpiredPatronOpacActions',
-            'yes',
+            '1',
             'Set whether an expired patron can perform opac actions such as placing holds or renew books, can be overridden on a per patron-type basis',
             NULL,
             'YesNo'
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
index d31d10af79..f16c0064ef 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
@@ -534,7 +534,7 @@ OPAC:
             - pref: BlockExpiredPatronOpacActions
               choices:
                 yes: "Block"
-                no: "Don't Block"
+                no: "Don't block"
             - expired patrons from opac actions such as placing a hold or renew, the setting for a patron category takes priority over this
 
     Privacy:
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt
index e8fe8bf8d9..3774c068e7 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt
@@ -272,7 +272,7 @@
               <div id="bad_data" class="dialog alert">ERROR: Internal error: incomplete hold request.</div>
             [% END %]
             [% IF ( expired_patron ) %]
-                <div id="expired_patron" class="dialog alert"><p><strong>Sorry</strong>, you cannot place holds because your library card has expired.</p><p>Please contact your librarian if you wish to renew your card</p></div>
+                <div id="expired_patron" class="dialog alert"><p><strong>Sorry</strong>, you cannot place holds because your library card has expired.</p><p>Please contact your librarian if you wish to renew your card.</p></div>
             [% END %]
           [% ELSE %]
             [% IF ( none_available ) %]
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt
index b966bc75a2..3bf227df48 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt
@@ -100,7 +100,7 @@ var MSG_CONFIRM_RESUME_HOLDS  = _("Are you sure you want to resume all suspended
 
         [% IF ( BORROWER_INF.warnexpired ) %]
         <div class="dialog alert" id="warnexpired">
-            <strong>Please note:</strong><span> You account has expired as of [% BORROWER_INF.warnexpired | $KohaDates %]. Please contact the library if you wish to renew your account.</span>
+            <strong>Please note: </strong><span>Your account has expired as of [% BORROWER_INF.warnexpired | $KohaDates %]. Please contact the library if you wish to renew your account.</span>
         </div>
         [% END %]