From 7be88483dc52a19d1749425d7020da4064c7d876 Mon Sep 17 00:00:00 2001
From: Indranil Das Gupta <indradg@gmail.com>
Date: Mon, 1 Jun 2015 19:22:29 +0530
Subject: [PATCH] (followup) addresses the QA Manager comments

Addresses Katrin's comments in comment# 56

http://bugs.koha-community.org/show_bug.cgi?id=14252
---
 .../mysql/atomicupdate/bug_14252-OpacLangSelectorMode_syspref.sql   | 2 +-
 installer/data/mysql/sysprefs.sql                                   | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref | 6 +++---
 koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc              | 2 +-
 koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc           | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/installer/data/mysql/atomicupdate/bug_14252-OpacLangSelectorMode_syspref.sql b/installer/data/mysql/atomicupdate/bug_14252-OpacLangSelectorMode_syspref.sql
index db4d8ac..cdafcd9 100644
--- a/installer/data/mysql/atomicupdate/bug_14252-OpacLangSelectorMode_syspref.sql
+++ b/installer/data/mysql/atomicupdate/bug_14252-OpacLangSelectorMode_syspref.sql
@@ -1,4 +1,4 @@
 --
 -- Adds OpacLangSelectorMode syspref for bug 14252
 --
-INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) VALUES ('OpacLangSelectorMode','foot','both|mast|foot','Select the location to display the language selector','Choice');
+INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) VALUES ('OpacLangSelectorMode','footer','top|both|footer','Select the location to display the language selector','Choice');
diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql
index 0300930..313f635 100644
--- a/installer/data/mysql/sysprefs.sql
+++ b/installer/data/mysql/sysprefs.sql
@@ -270,7 +270,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `
 ('OpacItemLocation','callnum','callnum|ccode|location','Show the shelving location of items in the opac','Choice'),
 ('OPACItemsResultsDisplay','0','','If OFF : show only the status of items in result list.If ON : show full location of items (branch+location+callnumber) as in staff interface','YesNo'),
 ('OpacKohaUrl','1',NULL,'Show \'Powered by Koha\' text on OPAC footer.',NULL),
-('OpacLangSelectorMode','foot','both|mast|foot','Select the location to display the language selector','Choice'),
+('OpacLangSelectorMode','both','top|both|footer','Select the location to display the language selector','Choice'),
 ('opaclanguages','en',NULL,'Set the default language in the OPAC.','Languages'),
 ('opaclanguagesdisplay','0','','If ON, enables display of Change Language feature on OPAC','YesNo'),
 ('opaclayoutstylesheet','opac.css','','Enter the name of the layout CSS stylesheet to use in the OPAC','free'),
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 f15a3e8..64c14ee 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
@@ -321,9 +321,9 @@ OPAC:
             - "Display language selector on "
             - pref: OpacLangSelectorMode
               choices:
-                  both: "both masthead and footer"
-                  mast: "only masthead"
-                  foot: "only footer"
+                  both: "both top and footer"
+                  top: "top"
+                  footer: "only footer"
     Features:
         -
             - pref: opacuserlogin
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
index 95eae9d..1ccd2be 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
@@ -72,7 +72,7 @@
                         <a id="user-menu-trigger" class="pull-right" href="#"><i class="icon-user"></i> <span class="caret"></span></a>
                         <div id="members">
                             <ul class="nav pull-right">
-                                [% IF OpacLangSelectorMode == 'both' || OpacLangSelectorMode == 'mast' %]
+                                [% IF OpacLangSelectorMode == 'both' || OpacLangSelectorMode == 'top' %]
                                     [% IF ( opaclanguagesdisplay ) %]
                                         [% IF ( languages_loop && opaclanguagesdisplay ) %]
                                             [% UNLESS ( one_language_enabled ) %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc
index ec06d94..238ef97 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc
@@ -30,7 +30,7 @@
     [% END # / OpacKohaUrl %]
 
 </div> <!-- / #wrap in masthead.inc -->
-[% IF OpacLangSelectorMode == 'both' || OpacLangSelectorMode == 'foot' %]
+[% IF OpacLangSelectorMode == 'both' || OpacLangSelectorMode == 'footer' %]
     [% IF ( opaclanguagesdisplay ) %]
         [% IF ( languages_loop && opaclanguagesdisplay ) %]
             [% UNLESS ( one_language_enabled ) %]
-- 
1.9.1