@@ -, +, @@ OPACLanguages --- C4/Installer.pm | 4 ++-- C4/Languages.pm | 4 ++-- ...91-replace_opaclanguages_with_OPAClanguages_syspref.perl | 13 +++++++++++++ .../1-Obligatoire/unimarc_standard_system_preferences.sql | 2 +- installer/data/mysql/localization/de-DE/custom.sql | 2 +- installer/data/mysql/localization/it-IT/custom.sql | 2 +- installer/data/mysql/localization/nb-NO/custom.sql | 2 +- installer/data/mysql/mandatory/sysprefs.sql | 2 +- .../system_preferences_full_optimal_for_install_only.sql | 2 +- .../system_preferences_optimal_values_insert_only.sql | 2 +- .../prog/en/modules/admin/preferences/i18n_l10n.pref | 2 +- misc/cronjobs/build_browser_and_cloud.pl | 2 +- t/db_dependent/Auth.t | 2 +- t/db_dependent/Koha/ItemTypes.t | 2 +- t/db_dependent/Search.t | 2 +- 15 files changed, 29 insertions(+), 16 deletions(-) create mode 100644 installer/data/mysql/atomicupdate/bug_27491-replace_opaclanguages_with_OPAClanguages_syspref.perl --- a/C4/Installer.pm +++ a/C4/Installer.pm @@ -474,7 +474,7 @@ sub set_version_syspref { $installer->set_languages_syspref(); -Add the installation language to 'language' and 'opaclanguages' system preferences +Add the installation language to 'language' and 'OPACLanguages' system preferences if different from 'en' =cut @@ -490,7 +490,7 @@ sub set_languages_syspref { my $pref = $self->{'dbh'}->prepare("UPDATE systempreferences SET value=? WHERE variable='language'"); $pref->execute("en,$language"); # opac - $pref = $self->{'dbh'}->prepare("UPDATE systempreferences SET value=? WHERE variable='opaclanguages'"); + $pref = $self->{'dbh'}->prepare("UPDATE systempreferences SET value=? WHERE variable='OPACLanguages'"); $pref->execute("en,$language"); C4::Context->clear_syspref_cache(); --- a/C4/Languages.pm +++ a/C4/Languages.pm @@ -116,7 +116,7 @@ sub getTranslatedLanguages { my @enabled_languages = ( $interface && $interface eq 'intranet' ) ? split ",", C4::Context->preference('language') - : split ",", C4::Context->preference('opaclanguages'); + : split ",", C4::Context->preference('OPACLanguages'); my $cache = Koha::Caches->get_instance; my $cache_key = "languages_${interface}_${theme}"; @@ -609,7 +609,7 @@ sub getlanguage { my $language; my $preference_to_check = - $interface eq 'intranet' ? 'language' : 'opaclanguages'; + $interface eq 'intranet' ? 'language' : 'OPACLanguages'; # Get the available/valid languages list my @languages; my $preference_value = C4::Context->preference($preference_to_check); --- a/installer/data/mysql/atomicupdate/bug_27491-replace_opaclanguages_with_OPAClanguages_syspref.perl +++ a/installer/data/mysql/atomicupdate/bug_27491-replace_opaclanguages_with_OPAClanguages_syspref.perl @@ -0,0 +1,13 @@ +$DBversion = 'XXX'; # will be replaced by the RM +if( CheckVersion( $DBversion ) ) { + # you can use $dbh here like: + $dbh->do(q{UPDATE systempreferences set variable="OPACLanguages" WHERE variable="opaclanguages"}); + + # or perform some test and warn + # if( !column_exists( 'biblio', 'biblionumber' ) ) { + # warn "There is something wrong"; + # } + + # Always end with this (adjust the bug info) + NewVersion( $DBversion, 27491, "Description"); +} --- a/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_system_preferences.sql +++ a/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_system_preferences.sql @@ -21,7 +21,7 @@ UPDATE systempreferences SET value = 'M|Mme|Mlle' WHERE variable = 'BorrowersTit UPDATE systempreferences SET value = '676a' WHERE variable = 'itemcallnumber'; UPDATE systempreferences SET value = 'fr-FR' WHERE variable = 'language'; UPDATE systempreferences SET value = 'Ma bibliothèque' WHERE variable = 'LibraryName'; -UPDATE systempreferences SET value = 'fr-FR' WHERE variable = 'opaclanguages'; +UPDATE systempreferences SET value = 'fr-FR' WHERE variable = 'OPACLanguages'; UPDATE systempreferences SET value = 1 WHERE variable = 'opaclanguagesdisplay'; UPDATE systempreferences SET value = 'Bienvenue dans Koha...\r\n
Velkommen til Koha...
Viktige lenker kan plasseres her
' WHERE variable = 'OpacNav'; UPDATE systempreferences SET value = 'Andre bibliotek (WorldCat)Andre databaser (Google Scholar)Nettbutikker (Bookfinder.com)' WHERE variable = 'OPACSearchForTitleIn'; --- a/installer/data/mysql/mandatory/sysprefs.sql +++ a/installer/data/mysql/mandatory/sysprefs.sql @@ -412,7 +412,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('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','both','top|both|footer','Select the location to display the language selector in OPAC','Choice'), -('opaclanguages','en',NULL,'Set the default language in the OPAC.','Languages'), +('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'), ('OPACLocalCoverImages','0','1','Display local cover images on OPAC search and details pages.','YesNo'), --- a/installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql +++ a/installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql @@ -25,7 +25,7 @@ UPDATE systempreferences SET value = '1' WHERE variable = 'ExtendedPatronAttribu UPDATE systempreferences SET value = '0.20' WHERE variable = 'gist'; UPDATE systempreferences SET value = '942hv' WHERE variable = 'itemcallnumber'; UPDATE systempreferences SET value = 'ru-RU,uk-UA,en,fr-FR,de-DE' WHERE variable = 'language'; -UPDATE systempreferences SET value = 'ru-RU,uk-UA,en,fr-FR,de-DE' WHERE variable = 'opaclanguages'; +UPDATE systempreferences SET value = 'ru-RU,uk-UA,en,fr-FR,de-DE' WHERE variable = 'OPACLanguages'; UPDATE systempreferences SET value = 'Добро пожаловать в АБИС Koha...\r\n