diff --git a/installer/data/mysql/atomicupdate/bug_14252-OpacLangSelectorMode_syspref.sql b/installer/data/mysql/atomicupdate/bug_14252-OpacLangSelectorMode_syspref.sql index db4d8ac2e9..cdafcd9e65 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 557a0f7319..84ba3631b2 100644 --- a/installer/data/mysql/sysprefs.sql +++ b/installer/data/mysql/sysprefs.sql @@ -269,7 +269,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 1b48977b9d..ad0f26fd90 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 95eae9d471..1ccd2be1f3 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 @@
-[% IF OpacLangSelectorMode == 'both' || OpacLangSelectorMode == 'foot' %] +[% IF OpacLangSelectorMode == 'both' || OpacLangSelectorMode == 'footer' %] [% IF ( opaclanguagesdisplay ) %] [% IF ( languages_loop && opaclanguagesdisplay ) %] [% UNLESS ( one_language_enabled ) %]