@@ -, +, @@ --------- 1) Back up your DB 2) Ensure you have multiple languages, including some that have sub-languages (e.g. de-DE, de-CH) -- cd misc/translator -- perl translate install {language code} 3) Ensure that you have all the languages enabled -- Staff client -> Home -> Global system preferences --> I18N/L10N Check all the languages in opaclanguages. Ensure that opaclanguagesdisplay is 'Allow' 4) Open OPAC -- should only have languages in footer. Annoyingly below the fold. 5) Drop your koha database, and create a blank one. 6) Apply all patches 7) Reinstall all the known languages, so the templates are appropriately updated. 8) Go to staff client and do an install of koha, with all the dummy data. 9) Ensure you have all the languages enabled (see (3)) -- language selector position should be in both the footer and at the top as expected. -- this confirms the sysprefs.sql change. -- should still only have languages in the footer. -- this confirms that upgrade won't change anything. -- this confirms the atomic update. -- the opac-bottom.inc difference should only have changes around a SET, IF, and END. This confirms the noprint was fixed. OpacLangSelectorMode, to all three values. For each value, refresh the OPAC page, and confirm the position of the language selector. -- should work as expected. --- .../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(-) --- a/installer/data/mysql/atomicupdate/bug_14252-OpacLangSelectorMode_syspref.sql +++ a/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'); --- a/installer/data/mysql/sysprefs.sql +++ a/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'), --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref +++ a/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 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc +++ a/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 ) %] --