From: Magnus Enger Date: Wed, 10 Oct 2012 14:43:19 +0000 (+0200) Subject: Bug 2832 - Make alphabet localizable X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=aafcebef8fde3ef82d789dbac09e3eb9863a56bd;p=koha.git Bug 2832 - Make alphabet localizable Adds the "alphabet" syspref, which can hold a space separated list of charachters, which can be expanded into browse links when needed. To test: - Make sure to run updatedatabase - Check that the "alphabet" syspref was added under "I18N/L10N preferences" - Check that browse links are displayed Home › Patrons - Add some weird charachters like ÆØÅ to "alphabet" and check that the browse links are still displayed ok Signed-off-by: Mirko Tietgen Passed-QA-by: Jonathan Druart Signed-off-by: Jared Camins-Esakov --- diff --git a/installer/data/mysql/nb-NO/1-Obligatorisk/system_preferences.sql b/installer/data/mysql/nb-NO/1-Obligatorisk/system_preferences.sql index 0ab90c3e65..88d0b23059 100644 --- a/installer/data/mysql/nb-NO/1-Obligatorisk/system_preferences.sql +++ b/installer/data/mysql/nb-NO/1-Obligatorisk/system_preferences.sql @@ -25,5 +25,6 @@ UPDATE systempreferences SET value = 'nb-NO' WHERE variable = 'language'; UPDATE systempreferences SET value = 'nb-NO' WHERE variable = 'opaclanguages'; UPDATE systempreferences SET value = '

Velkommen til Koha...

' WHERE variable = 'OpacMainUserBlock'; UPDATE systempreferences SET value = '

Viktige lenker kan plasseres her

' WHERE variable = 'OpacNav'; +UPDATE systempreferences SET value = 'A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Æ Ø Å' WHERE variable = 'alphabet'; UPDATE systempreferences SET value = '
  • Andre bibliotek (WorldCat)
  • Andre databaser (Google Scholar)
  • Nettbutikker (Bookfinder.com)
    • ' WHERE variable = 'OPACSearchForTitleIn'; diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql index a4e410215f..44f9eb30dc 100644 --- a/installer/data/mysql/sysprefs.sql +++ b/installer/data/mysql/sysprefs.sql @@ -386,3 +386,4 @@ INSERT INTO systempreferences (variable,value,explanation,type) VALUES('OPACdidy INSERT INTO systempreferences (variable,value,explanation,type) VALUES('INTRAdidyoumean',NULL,'Did you mean? configuration for the Intranet. Do not change, as this is controlled by /cgi-bin/koha/admin/didyoumean.pl.','Free'); INSERT INTO systempreferences (variable, value, options, explanation, type) VALUES ('BlockReturnOfWithdrawnItems', '1', '0', 'If enabled, items that are marked as withdrawn cannot be returned.', 'YesNo'); INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('HoldsToPullStartDate','2','Set the default start date for the Holds to pull list to this many days ago',NULL,'Integer'); +INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('alphabet','A B C D E F G H I J K L M N O P Q R S T U V W X Y Z','Alphabet than can be expanded into browse links, e.g. on Home > Patrons',NULL,'free'); diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 7ab48eea70..7f05db0b4f 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -6012,6 +6012,7 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) { SetVersion ($DBversion); } + $DBversion = "3.09.00.062"; if (C4::Context->preference("Version") < TransformToNum($DBversion)) { $dbh->do("UPDATE systempreferences SET value=0 WHERE variable='NoZebra'"); @@ -6020,6 +6021,13 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) { SetVersion ($DBversion); } +$DBversion = "3.11.00.XXX"; +if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { + $dbh->do("INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('alphabet','A B C D E F G H I J K L M N O P Q R S T U V W X Y Z','Alphabet that can be expanded into browse links, e.g. on Home > Patrons',NULL,'free')"); + print "Upgrade to $DBversion done (Bug 2832 - Add alphabet syspref)\n"; + SetVersion($DBversion); +} + =head1 FUNCTIONS =head2 TableExists($table) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/i18n_l10n.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/i18n_l10n.pref index 02b8de6f88..cc6700b0d0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/i18n_l10n.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/i18n_l10n.pref @@ -31,3 +31,8 @@ I18N/L10N: - "Enable the following languages on the OPAC:" - pref: opaclanguages type: opac-languages + - + - "Use the alphabet" + - pref: alphabet + class: long + - for lists of browsable letters. This should be a space separated list of uppercase letters. diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt index 64e410ff9e..613ad36780 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt @@ -24,8 +24,8 @@
    Browse by last name: - [% FOREACH letter IN letters %] - [% letter.letter %] + [% FOREACH letter IN alphabet.split(' ') %] + [% letter %] [% END %]
    diff --git a/members/members-home.pl b/members/members-home.pl index 830800e0ab..61eb83a93f 100755 --- a/members/members-home.pl +++ b/members/members-home.pl @@ -80,7 +80,6 @@ $template->param( "AddPatronLists_".C4::Context->preference("AddPatronLists")=> "1", no_add => $no_add, ); -my @letters = map { {letter => $_} } ( 'A' .. 'Z'); -$template->param( letters => \@letters ); +$template->param( 'alphabet' => C4::Context->preference('alphabet') ); output_html_with_http_headers $query, $cookie, $template->output;