Bugzilla – Attachment 26735 Details for
Bug 12017
Move language description out of database
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 12017 - Move language description out of database
Bug-12017---Move-language-description-out-of-datab.patch (text/plain), 104.28 KB, created by
Bernardo Gonzalez Kriegel
on 2014-04-02 04:26:17 UTC
(
hide
)
Description:
Bug 12017 - Move language description out of database
Filename:
MIME Type:
Creator:
Bernardo Gonzalez Kriegel
Created:
2014-04-02 04:26:17 UTC
Size:
104.28 KB
patch
obsolete
>From e44ccdabfe9c45bb28eb2fa1aee78f0f1d7f937b Mon Sep 17 00:00:00 2001 >From: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> >Date: Tue, 1 Apr 2014 07:59:46 -0300 >Subject: [PATCH] Bug 12017 - Move language description out of database >MIME-Version: 1.0 >Content-Type: text/plain; charset=UTF-8 >Content-Transfer-Encoding: 8bit > >This patch moves language descriptions from database into template files, in part to ease the translation of some strings, but mostly to have one place to define languages. > >All languages/scripts/regions are defined at languages.inc template file, with native versión and translatable version. > >As a bonus, language descriptions are present at webinstaller stage. > >To test: >1) Do some fake translations, for example all langs >for l in $(cd misc/translator/po; ls *-pref.po | sed 's/-pref.po//'); do >mkdir koha-tmpl/intranet-tmpl/prog/$l; >mkdir koha-tmpl/opac-tmpl/bootstrap/$l; >mkdir koha-tmpl/opac-tmpl/prog/$l; >mkdir koha-tmpl/opac-tmpl/ccsr/$l; >done > >2) Go to Administration > System preferences > I18N/L10N >There are many missing descriptions > >3) Enable some random languages, some in groups (fr|en) on staff/opac. Enable OPAC changelanguage > >4) Reload page, look at the bottom for language changer. Also open a OPAC view, look for language changer. >Do NOT change languages > >5) Apply the patch > >6) Reload STAFF page, verify all descriptions in native language. > >7) CHANGE in Language changer (staff/opac). >Currently we show Lang+Code, and in lang groups Lang+Script+Region+Code >I think it's too long, I propose to show only Lang, and in groups Region+Code, all native. > >Change OPAC theme (prog|ccsr) and check again. On prog and ccsr the result is not pretty, but works > >8) Go to Administration > System preferences > Local use >Add a new local syspref, any Explanation|Variable|Value, type Languages, Save. >Check that all languages look good. Also Edit that syspref, on edition a list of languages must show in value box, check that they look good > >NOTE: There is a Bug in this kind of preference, selected languages are passed but ignored at save/load time. Only staff selected languages are shown. A problem for another report > >9) NEW - Installer languages. This patch enable view of languages on Web installer. >Edit your koha-conf.xml, change database name to a new name, create that database and grant access, reload staff page, log in, you will be redirected to step1 of installer, check names and codes for installed languages. >(revert to your old database before proceed) > >10) Advanced Search. On staff/opac{bootstrap/prog/ccsr}, go to advanced search, clic more options, go to limit by language, select one and press search, verify the search term "Search with limit(s): 'ln,rtrn:XXX'" with XXX the iso639-2 code of your selected lang > >NOTE: This is the ONLY place where translated language names are used!!! > >11) Translations. Update language files for one of the active languages, say de-DE >(cd misc/translator; perl translate update de-DE; >perl translate update de-DE; perl translate install de-DE) > >12) Change language to German (DE), go to advanced search 'Suche' (staff), clic 'mehr Optionen', look for 'Sprache' pulldown, verify some translations (ej. Greek -> Griechisch) [this translations are not present on opac] > >I think that all previous functionality is present. > > Lines starting >--- > C4/Languages.pm | 5 - > catalogue/search.pl | 5 - > .../prog/en/includes/doc-head-close.inc | 2 + > .../prog/en/includes/installer-doc-head-close.inc | 3 + > .../prog/en/includes/intranet-bottom.inc | 22 +-- > .../intranet-tmpl/prog/en/includes/languages.inc | 196 ++++++++++++++++++++ > .../prog/en/modules/admin/preferences.tt | 10 +- > .../prog/en/modules/admin/systempreferences.tt | 157 ++++++---------- > .../prog/en/modules/catalogue/advsearch.tt | 22 +-- > .../prog/en/modules/installer/step1.tt | 10 +- > .../bootstrap/en/includes/doc-head-close.inc | 2 + > .../opac-tmpl/bootstrap/en/includes/languages.inc | 196 ++++++++++++++++++++ > .../bootstrap/en/includes/opac-bottom.inc | 14 +- > .../bootstrap/en/modules/opac-advsearch.tt | 16 +- > .../opac-tmpl/ccsr/en/includes/doc-head-close.inc | 3 + > .../opac-tmpl/ccsr/en/includes/opac-bottom.inc | 31 +++- > .../opac-tmpl/prog/en/includes/doc-head-close.inc | 3 + > koha-tmpl/opac-tmpl/prog/en/includes/languages.inc | 196 ++++++++++++++++++++ > .../opac-tmpl/prog/en/includes/opac-bottom.inc | 14 +- > .../opac-tmpl/prog/en/modules/opac-advsearch.tt | 17 +- > opac/opac-search.pl | 4 - > 21 files changed, 742 insertions(+), 186 deletions(-) > create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/languages.inc > create mode 100644 koha-tmpl/opac-tmpl/bootstrap/en/includes/languages.inc > create mode 100644 koha-tmpl/opac-tmpl/prog/en/includes/languages.inc > >diff --git a/C4/Languages.pm b/C4/Languages.pm >index 2a74b92..df7efd8 100644 >--- a/C4/Languages.pm >+++ b/C4/Languages.pm >@@ -316,10 +316,6 @@ sub _build_languages_arrayref { > # group this language, key by langtag > $language_subtags_hashref->{'sublanguage_current'} = 1 if $translated_language eq $current_language; > $language_subtags_hashref->{'rfc4646_subtag'} = $translated_language; >- $language_subtags_hashref->{'native_description'} = language_get_description($language_subtags_hashref->{language},$language_subtags_hashref->{language},'language'); >- $language_subtags_hashref->{'script_description'} = language_get_description($language_subtags_hashref->{script},$language_subtags_hashref->{'language'},'script'); >- $language_subtags_hashref->{'region_description'} = language_get_description($language_subtags_hashref->{region},$language_subtags_hashref->{'language'},'region'); >- $language_subtags_hashref->{'variant_description'} = language_get_description($language_subtags_hashref->{variant},$language_subtags_hashref->{'language'},'variant'); > $track_language_groups->{$language_subtags_hashref->{'language'}}++; > push ( @{ $language_groups->{$language_subtags_hashref->{language}} }, $language_subtags_hashref ); > } >@@ -335,7 +331,6 @@ sub _build_languages_arrayref { > push @languages_loop, { > # this is only use if there is one > rfc4646_subtag => @$value[0]->{rfc4646_subtag}, >- native_description => language_get_description($key,$key,'language'), > language => $key, > sublanguages_loop => $value, > plural => $track_language_groups->{$key} >1 ? 1 : 0, >diff --git a/catalogue/search.pl b/catalogue/search.pl >index a391dfe..9138510 100755 >--- a/catalogue/search.pl >+++ b/catalogue/search.pl >@@ -144,7 +144,6 @@ use C4::Context; > use C4::Output; > use C4::Auth qw(:DEFAULT get_session); > use C4::Search; >-use C4::Languages qw(getAllLanguages); > use C4::Koha; > use C4::Members qw(GetMember); > use C4::VirtualShelves; >@@ -338,10 +337,6 @@ if ( $template_type eq 'advsearch' ) { > $template->param(uc(C4::Context->preference("marcflavour")) => 1, > search_boxes_loop => \@search_boxes_array); > >- # load the language limits (for search) >- my $languages_limit_loop = getAllLanguages($lang); >- $template->param(search_languages_loop => $languages_limit_loop,); >- > # Expanded search options in advanced search: > # use the global setting by default, but let the user override it > { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc >index 11f6f38..6bc6046 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc >@@ -20,6 +20,8 @@ > <link rel="stylesheet" type="text/css" href="[% themelang %]/css/login.css" /> > [% END %] > >+[% PROCESS 'languages.inc' %] >+ > <!-- koha core js --> > <script type="text/javascript" src="[% themelang %]/js/staff-global.js"></script> > [% INCLUDE 'validator-strings.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/installer-doc-head-close.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/installer-doc-head-close.inc >index 122a06c..e3749b5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/installer-doc-head-close.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/installer-doc-head-close.inc >@@ -68,5 +68,8 @@ td input { font-size: 1.5em; } > } > > </style> >+ >+[% PROCESS 'languages.inc' %] >+ > </head> > <body> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc >index ed1298c..f6d9ccb 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc >@@ -5,18 +5,18 @@ > <div id="changelanguage" class="navbar navbar-fixed-bottom"> > <div class="navbar-inner"> > <ul id="i18nMenu" class="nav"> >- [% FOREACH languages_loo IN languages_loop %] >+ [% FOREACH languages_loo IN languages_loop.sort('rfc4646_subtag') %] > > [% IF ( languages_loo.group_enabled ) %] > [% IF ( languages_loo.plural ) %] >- <li class="dropdown"><a class="dropdown-toggle dropup" data-toggle="dropdown" id="show[% languages_loo.rfc4646_subtag %]" href="#">[% languages_loo.native_description %] ([% languages_loo.rfc4646_subtag %]) <span class="caret"></span></a> >+ <li class="dropdown"><a class="dropdown-toggle dropup" data-toggle="dropdown" id="show[% languages_loo.rfc4646_subtag %]" href="#">[% PROCESS native_description subtag = languages_loo.rfc4646_subtag %]<span class="caret"></span></a> > <ul id="sub[% languages_loo.rfc4646_subtag %]" class="dropdown-menu"> >- [% FOREACH sublanguages_loo IN languages_loo.sublanguages_loop %] >+ [% FOREACH sublanguages_loo IN languages_loo.sublanguages_loop.sort('rfc4646_subtag') %] > [% IF ( sublanguages_loo.enabled ) %] > [% IF ( sublanguages_loo.sublanguage_current ) %] >- <li> <a href="#">[% sublanguages_loo.native_description %] [% sublanguages_loo.script_description %] [% sublanguages_loo.region_description %] [% sublanguages_loo.variant_description %] ([% sublanguages_loo.rfc4646_subtag %])</a></li> >+ <li> <a href="#">[% PROCESS region_description subtag = sublanguages_loo.rfc4646_subtag %] ([% sublanguages_loo.rfc4646_subtag %])</a></li> > [% ELSE %] >- <li><a href="/cgi-bin/koha/changelanguage.pl?language=[% sublanguages_loo.rfc4646_subtag %]"> [% sublanguages_loo.native_description %] [% sublanguages_loo.script_description %] [% sublanguages_loo.region_description %] [% sublanguages_loo.variant_description %] ([% sublanguages_loo.rfc4646_subtag %])</a></li> >+ <li><a href="/cgi-bin/koha/changelanguage.pl?language=[% sublanguages_loo.rfc4646_subtag %]"> [% PROCESS region_description subtag = sublanguages_loo.rfc4646_subtag %] ([% sublanguages_loo.rfc4646_subtag %])</a></li> > [% END %] > [% END %] > >@@ -27,19 +27,11 @@ > [% IF ( languages_loo.group_enabled ) %] > [% IF ( languages_loo.current ) %] > <li class="navbar-text"> >- [% IF ( languages_loo.native_description ) %] >- [% languages_loo.native_description %] >- [% ELSE %] >- [% languages_loo.rfc4646_subtag %] >- [% END %] >+ [% PROCESS native_description subtag = languages_loo.rfc4646_subtag %] > </li> > [% ELSE %] > <li><a href="/cgi-bin/koha/changelanguage.pl?language=[% languages_loo.rfc4646_subtag %]"> >- [% IF ( languages_loo.native_description ) %] >- [% languages_loo.native_description %] >- [% ELSE %] >- [% languages_loo.rfc4646_subtag %] >- [% END %] >+ [% PROCESS native_description subtag = languages_loo.rfc4646_subtag %] > </a></li> > [% END %] > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/languages.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/languages.inc >new file mode 100644 >index 0000000..fc3c287 >--- /dev/null >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/languages.inc >@@ -0,0 +1,196 @@ >+[%# "WARNING: This file must be replicated on 'include' dir" %] >+[%# "for each staff/opac theme" %] >+ >+[%- BLOCK split_subtag -%] >+[%- IF ( matches = subtag.match('^(\w+)$')) -%] >+ [%- SET lang = subtag -%] >+ [%- SET script = '' -%] >+ [%- IF ( lang == 'en' ) -%] >+ [%- SET region = 'US' -%] >+ [%- ELSE -%] >+ [%- SET region = '' -%] >+ [%- END -%] >+[%- ELSIF ( matches = subtag.match('^(\w+)-(\w+)$')) -%] >+ [%- SET lang = matches.0 -%] >+ [%- IF matches.1.length == 4 -%] >+ [%- SET script = matches.1 -%] >+ [%- SET region = '' -%] >+ [%- ELSE -%] >+ [%- SET script = '' -%] >+ [%- SET region = matches.1 -%] >+ [%- END -%] >+[%- ELSIF ( matches = subtag.match('^(\w+)-(\w+)-(\w+)$')) -%] >+ [%- SET lang = matches.0 -%] >+ [%- SET script = matches.1 -%] >+ [%- SET region = matches.2 -%] >+[%- END -%] >+[%- END -%] >+ >+[%- BLOCK native_description -%] >+[%- PROCESS split_subtag subtag = subtag -%] >+[%- PROCESS language_descriptions code = lang -%] >+[%- END -%] >+ >+[%- BLOCK script_description -%] >+[%- PROCESS split_subtag subtag = subtag -%] >+[%- PROCESS script_descriptions code = script -%] >+[%- END -%] >+ >+[%- BLOCK region_description -%] >+[%- PROCESS split_subtag subtag = subtag -%] >+[%- PROCESS region_descriptions code = region -%] >+[%- END -%] >+ >+[%# Update language_descriptions when modifying language_codes %] >+[%- BLOCK get_language_codes -%] >+[%- language_codes = ['am', 'ar', 'az', 'be', 'ben', 'bg', 'ca', 'cs', >+'da', 'de', 'el', 'en', 'es', 'eu', 'fa', 'fi', 'fo', 'fr', >+'gl', 'he', 'hi', 'hr', 'hu', 'hy', 'id', 'is', 'it', 'ja', >+'kn', 'ko', 'ku', 'lo', 'mi', 'mon', 'mr', 'ms', 'nb', 'ne', >+'nl', 'nn', 'pbr', 'pl', 'prs', 'pt', 'ro', 'ru', 'rw', 'sd', >+'sk', 'sl', 'sq', 'sr', 'sv', 'sw', 'ta', 'tet', 'th', 'tl', >+'tr', 'uk', 'ur', 'vi', 'zh'] -%] >+[%- END -%] >+ >+[%# Update language_codes when modifying language_descriptions %] >+[%# (i=1) for iso639-2 code, (t=1) fortname %] >+[%- BLOCK language_descriptions -%] >+[%- SWITCH code -%] >+ [%- CASE 'am' -%][%- IF (i) -%][%- 'amh' -%][%- ELSIF (t) -%]<span>Amharic</span>[%- ELSE -%][%- "á£ááá" -%][%- END -%] >+ [%- CASE 'ar' -%][%- IF (i) -%][%- 'ara' -%][%- ELSIF (t) -%]<span>Arabic</span>[%- ELSE -%][%- "ÙعربÙØ©" -%][%- END -%] >+ [%- CASE 'az' -%][%- IF (i) -%][%- 'aze' -%][%- ELSIF (t) -%]<span>Azerbaijani</span>[%- ELSE -%][%- "AzÉrbaycan dili" -%][%- END -%] >+ [%- CASE 'be' -%][%- IF (i) -%][%- 'bel' -%][%- ELSIF (t) -%]<span>Byelorussian</span>[%- ELSE -%][%- "ÐелаÑÑÑÐºÐ°Ñ Ð¼Ð¾Ð²Ð°" -%][%- END -%] >+ [%- CASE 'ben' -%][%- IF (i) -%][%- 'ben' -%][%- ELSIF (t) -%]<span>Bengali</span>[%- ELSE -%][%- "বাà¦à¦²à¦¾" -%][%- END -%] >+ [%- CASE 'bg' -%][%- IF (i) -%][%- 'bul' -%][%- ELSIF (t) -%]<span>Bulgarian</span>[%- ELSE -%][%- "ÐÑлгаÑÑки" -%][%- END -%] >+ [%- CASE 'ca' -%][%- IF (i) -%][%- 'cat' -%][%- ELSIF (t) -%]<span>Catalan</span>[%- ELSE -%][%- "Català " -%][%- END -%] >+ [%- CASE 'cs' -%][%- IF (i) -%][%- 'ces' -%][%- ELSIF (t) -%]<span>Czech</span>[%- ELSE -%][%- "CeÅ¡tina" -%][%- END -%] >+ [%- CASE 'da' -%][%- IF (i) -%][%- 'dan' -%][%- ELSIF (t) -%]<span>Danish</span>[%- ELSE -%][%- "Dansk" -%][%- END -%] >+ [%- CASE 'de' -%][%- IF (i) -%][%- 'ger' -%][%- ELSIF (t) -%]<span>German</span>[%- ELSE -%][%- "Deutsch" -%][%- END -%] >+ [%- CASE 'el' -%][%- IF (i) -%][%- 'gre' -%][%- ELSIF (t) -%]<span>Greek</span>[%- ELSE -%][%- "ελληνικά" -%][%- END -%] >+ [%- CASE 'en' -%][%- IF (i) -%][%- 'eng' -%][%- ELSIF (t) -%]<span>English</span>[%- ELSE -%][%- "English" -%][%- END -%] >+ [%- CASE 'es' -%][%- IF (i) -%][%- 'spa' -%][%- ELSIF (t) -%]<span>Spanish</span>[%- ELSE -%][%- "Español" -%][%- END -%] >+ [%- CASE 'eu' -%][%- IF (i) -%][%- 'baq' -%][%- ELSIF (t) -%]<span>Basque</span>[%- ELSE -%][%- "Euskara" -%][%- END -%] >+ [%- CASE 'fa' -%][%- IF (i) -%][%- 'per' -%][%- ELSIF (t) -%]<span>Persian</span>[%- ELSE -%][%- "ÙارسÙ" -%][%- END -%] >+ [%- CASE 'fi' -%][%- IF (i) -%][%- 'fin' -%][%- ELSIF (t) -%]<span>Finnish</span>[%- ELSE -%][%- "Suomi" -%][%- END -%] >+ [%- CASE 'fo' -%][%- IF (i) -%][%- 'fao' -%][%- ELSIF (t) -%]<span>Faroese</span>[%- ELSE -%][%- "Føroyskt" -%][%- END -%] >+ [%- CASE 'fr' -%][%- IF (i) -%][%- 'fre' -%][%- ELSIF (t) -%]<span>French</span>[%- ELSE -%][%- "Français" -%][%- END -%] >+ [%- CASE 'gl' -%][%- IF (i) -%][%- 'glg' -%][%- ELSIF (t) -%]<span>Galician</span>[%- ELSE -%][%- "Galego" -%][%- END -%] >+ [%- CASE 'he' -%][%- IF (i) -%][%- 'heb' -%][%- ELSIF (t) -%]<span>Hebrew</span>[%- ELSE -%][%- "×¢Ö´×ְרִ×ת" -%][%- END -%] >+ [%- CASE 'hi' -%][%- IF (i) -%][%- 'hin' -%][%- ELSIF (t) -%]<span>Hindi</span>[%- ELSE -%][%- "हिनà¥à¤¦à¥" -%][%- END -%] >+ [%- CASE 'hr' -%][%- IF (i) -%][%- 'hrv' -%][%- ELSIF (t) -%]<span>Croatian</span>[%- ELSE -%][%- "Hrvatski" -%][%- END -%] >+ [%- CASE 'hu' -%][%- IF (i) -%][%- 'hun' -%][%- ELSIF (t) -%]<span>Hungarian</span>[%- ELSE -%][%- "Magyar" -%][%- END -%] >+ [%- CASE 'hy' -%][%- IF (i) -%][%- 'arm' -%][%- ELSIF (t) -%]<span>Armenian</span>[%- ELSE -%][%- "ÕÕ¡ÕµÕ¥ÖÕ§Õ¶" -%][%- END -%] >+ [%- CASE 'id' -%][%- IF (i) -%][%- 'ind' -%][%- ELSIF (t) -%]<span>Indonesian</span>[%- ELSE -%][%- "Bahasa Indonesia" -%][%- END -%] >+ [%- CASE 'is' -%][%- IF (i) -%][%- 'ice' -%][%- ELSIF (t) -%]<span>Icelandic</span>[%- ELSE -%][%- "Ãslenska" -%][%- END -%] >+ [%- CASE 'it' -%][%- IF (i) -%][%- 'ita' -%][%- ELSIF (t) -%]<span>Italian</span>[%- ELSE -%][%- "Italiano" -%][%- END -%] >+ [%- CASE 'ja' -%][%- IF (i) -%][%- 'jpn' -%][%- ELSIF (t) -%]<span>Japanese</span>[%- ELSE -%][%- "æ¥æ¬èª" -%][%- END -%] >+ [%- CASE 'kn' -%][%- IF (i) -%][%- 'kan' -%][%- ELSIF (t) -%]<span>Kannada</span>[%- ELSE -%][%- "à²à²¨à³à²¨à²¡" -%][%- END -%] >+ [%- CASE 'ko' -%][%- IF (i) -%][%- 'kor' -%][%- ELSIF (t) -%]<span>Korean</span>[%- ELSE -%][%- "íêµì´" -%][%- END -%] >+ [%- CASE 'ku' -%][%- IF (i) -%][%- 'kur' -%][%- ELSIF (t) -%]<span>Kurdish</span>[%- ELSE -%][%- "Ú©ÙردÛ" -%][%- END -%] >+ [%- CASE 'lo' -%][%- IF (i) -%][%- 'lao' -%][%- ELSIF (t) -%]<span>Lao</span>[%- ELSE -%][%- "àºàº²àºªàº²àº¥àº²àº§" -%][%- END -%] >+ [%- CASE 'mi' -%][%- IF (i) -%][%- 'mao' -%][%- ELSIF (t) -%]<span>Maori</span>[%- ELSE -%][%- "Te Reo MÄori" -%][%- END -%] >+ [%- CASE 'mon' -%][%- IF (i) -%][%- 'mon' -%][%- ELSIF (t) -%]<span>Mongolian</span>[%- ELSE -%][%- "Mонгол" -%][%- END -%] >+ [%- CASE 'mr' -%][%- IF (i) -%][%- 'mar' -%][%- ELSIF (t) -%]<span>Marathi</span>[%- ELSE -%][%- "मराठà¥" -%][%- END -%] >+ [%- CASE 'ms' -%][%- IF (i) -%][%- 'may' -%][%- ELSIF (t) -%]<span>Malay</span>[%- ELSE -%][%- "Bahasa melayu" -%][%- END -%] >+ [%- CASE 'nb' -%][%- IF (i) -%][%- 'nob' -%][%- ELSIF (t) -%]<span>Norwegian bokmÃ¥l</span>[%- ELSE -%][%- "Norsk bokmÃ¥l" -%][%- END -%] >+ [%- CASE 'ne' -%][%- IF (i) -%][%- 'nep' -%][%- ELSIF (t) -%]<span>Nepali</span>[%- ELSE -%][%- "नà¥à¤ªà¤¾à¤²à¥" -%][%- END -%] >+ [%- CASE 'nl' -%][%- IF (i) -%][%- 'dut' -%][%- ELSIF (t) -%]<span>Dutch</span>[%- ELSE -%][%- "Nederlands" -%][%- END -%] >+ [%- CASE 'nn' -%][%- IF (i) -%][%- 'nno' -%][%- ELSIF (t) -%]<span>Norwegian nynorsk</span>[%- ELSE -%][%- "Norsk nynorsk" -%][%- END -%] >+ [%- CASE 'pbr' -%][%- IF (i) -%][%- 'pbr' -%][%- ELSIF (t) -%]<span>Pangwa</span>[%- ELSE -%][%- "Ekipangwa" -%][%- END -%] >+ [%- CASE 'pl' -%][%- IF (i) -%][%- 'pol' -%][%- ELSIF (t) -%]<span>Polish</span>[%- ELSE -%][%- "Polski" -%][%- END -%] >+ [%- CASE 'prs' -%][%- IF (i) -%][%- 'prs' -%][%- ELSIF (t) -%]<span>Dari</span>[%- ELSE -%][%- "درÙ" -%][%- END -%] >+ [%- CASE 'pt' -%][%- IF (i) -%][%- 'por' -%][%- ELSIF (t) -%]<span>Portuguese</span>[%- ELSE -%][%- "Português" -%][%- END -%] >+ [%- CASE 'ro' -%][%- IF (i) -%][%- 'rum' -%][%- ELSIF (t) -%]<span>Romanian</span>[%- ELSE -%][%- "Român" -%][%- END -%] >+ [%- CASE 'ru' -%][%- IF (i) -%][%- 'rus' -%][%- ELSIF (t) -%]<span>Russian</span>[%- ELSE -%][%- "Ð ÑÑÑкий ÑзÑк" -%][%- END -%] >+ [%- CASE 'rw' -%][%- IF (i) -%][%- 'kin' -%][%- ELSIF (t) -%]<span>Kinyarwanda</span>[%- ELSE -%][%- "Ikinyarwanda" -%][%- END -%] >+ [%- CASE 'sd' -%][%- IF (i) -%][%- 'snd' -%][%- ELSIF (t) -%]<span>Sindhi</span>[%- ELSE -%][%- "سÙÚÙ" -%][%- END -%] >+ [%- CASE 'sk' -%][%- IF (i) -%][%- 'slo' -%][%- ELSIF (t) -%]<span>Slovak</span>[%- ELSE -%][%- "SlovenÄina" -%][%- END -%] >+ [%- CASE 'sl' -%][%- IF (i) -%][%- 'slv' -%][%- ELSIF (t) -%]<span>Slovenian</span>[%- ELSE -%][%- "SlovenÅ¡Äina" -%][%- END -%] >+ [%- CASE 'sq' -%][%- IF (i) -%][%- 'alb' -%][%- ELSIF (t) -%]<span>Albanian</span>[%- ELSE -%][%- "Shqip" -%][%- END -%] >+ [%- CASE 'sr' -%][%- IF (i) -%][%- 'srp' -%][%- ELSIF (t) -%]<span>Serbian</span>[%- ELSE -%][%- "CÑпÑки" -%][%- END -%] >+ [%- CASE 'sv' -%][%- IF (i) -%][%- 'swe' -%][%- ELSIF (t) -%]<span>Swedish</span>[%- ELSE -%][%- "Svenska" -%][%- END -%] >+ [%- CASE 'sw' -%][%- IF (i) -%][%- 'swa' -%][%- ELSIF (t) -%]<span>Swahili</span>[%- ELSE -%][%- "Kiswahili" -%][%- END -%] >+ [%- CASE 'ta' -%][%- IF (i) -%][%- 'tam' -%][%- ELSIF (t) -%]<span>Tamil</span>[%- ELSE -%][%- "தமிழà¯" -%][%- END -%] >+ [%- CASE 'tet' -%][%- IF (i) -%][%- 'tet' -%][%- ELSIF (t) -%]<span>Tetum</span>[%- ELSE -%][%- "Tetun" -%][%- END -%] >+ [%- CASE 'th' -%][%- IF (i) -%][%- 'tha' -%][%- ELSIF (t) -%]<span>Thai</span>[%- ELSE -%][%- "ภาษาà¹à¸à¸¢" -%][%- END -%] >+ [%- CASE 'tl' -%][%- IF (i) -%][%- 'tgl' -%][%- ELSIF (t) -%]<span>Tagalog</span>[%- ELSE -%][%- "Tagalog" -%][%- END -%] >+ [%- CASE 'tr' -%][%- IF (i) -%][%- 'tur' -%][%- ELSIF (t) -%]<span>Turkish</span>[%- ELSE -%][%- "Türkçe" -%][%- END -%] >+ [%- CASE 'uk' -%][%- IF (i) -%][%- 'ukr' -%][%- ELSIF (t) -%]<span>Ukranian</span>[%- ELSE -%][%- "УкÑаÑнÑÑка" -%][%- END -%] >+ [%- CASE 'ur' -%][%- IF (i) -%][%- 'urd' -%][%- ELSIF (t) -%]<span>Urdu</span>[%- ELSE -%][%- "اردÙ" -%][%- END -%] >+ [%- CASE 'vi' -%][%- IF (i) -%][%- 'vie' -%][%- ELSIF (t) -%]<span>Vietnamese</span>[%- ELSE -%][%- "ãè¶" -%][%- END -%] >+ [%- CASE 'zh' -%][%- IF (i) -%][%- 'chi' -%][%- ELSIF (t) -%]<span>Chinese</span>[%- ELSE -%][%- "ä¸æ" -%][%- END -%] >+ [%- CASE -%][%- lang -%] >+[%- END -%] >+[%- END -%] >+ >+[%- BLOCK script_descriptions -%] >+[%- SWITCH code -%] >+ [%- CASE 'Arab' -%][%- IF (t) %]<span>Arabic</span>[%- ELSE -%][%- "اÙعربÙØ©" -%][%- END -%] >+ [%- CASE 'Armn' -%][%- IF (t) %]<span>Armenian</span>[%- ELSE -%][%- "ÕÕ¡ÕµÕ¸Ö Õ¡ÕµÕ¢Õ¸ÖÕ¢Õ¥Õ¶" -%][%- END -%] >+ [%- CASE 'Cyrl' -%][%- IF (t) %]<span>Cyrillic</span>[%- ELSE -%][%- "ÐиÑилиÑа" -%][%- END -%] >+ [%- CASE 'Ethi' -%][%- IF (t) %]<span>Ethiopic</span>[%- ELSE -%][%- "ááá" -%][%- END -%] >+ [%- CASE 'Grek' -%][%- IF (t) %]<span>Greek</span>[%- ELSE -%][%- "ÎÎ»Î»Î·Î½Î¹ÎºÏ Î±Î»ÏάβηÏο" -%][%- END -%] >+ [%- CASE 'Hans' -%][%- IF (t) %]<span>Han (Simplified)</span>[%- ELSE -%][%- "ç®ä½å" -%][%- END -%] >+ [%- CASE 'Hant' -%][%- IF (t) %]<span>Han (Traditional)</span>[%- ELSE -%][%- "ç¹é«å" -%][%- END -%] >+ [%- CASE 'Hebr' -%][%- IF (t) %]<span>Hebrew</span>[%- ELSE -%][%- "×Ö¸×ֶף־×ÖµÖ¼×ת ×¢Ö´×ְרִ×" -%][%- END -%] >+ [%- CASE 'Jpan' -%][%- IF (t) %]<span>Japanese</span>[%- ELSE -%][%- "æ¼¢å/ã²ãããª/ã«ã¿ã«ã" -%][%- END -%] >+ [%- CASE 'Knda' -%][%- IF (t) %]<span>Kannada</span>[%- ELSE -%][%- "à²à²¨à³à²¨à²¡ ಲಿಪಿ" -%][%- END -%] >+ [%- CASE 'Kore' -%][%- IF (t) %]<span>Korean</span>[%- ELSE -%][%- "íê¸" -%][%- END -%] >+ [%- CASE 'Laoo' -%][%- IF (t) %]<span>Lao</span>[%- ELSE -%][%- "àºàº±àºàºªàºàºàº¥àº²àº§" -%][%- END -%] >+ [%- CASE -%][%- script -%] >+[%- END -%] >+[%- END -%] >+ >+[%- BLOCK region_descriptions -%] >+[%- SWITCH code -%] >+ [%- CASE 'AL' -%][%- IF (t) -%]<span>Albania</span>[%- ELSE -%][%- 'Shqipërisë' -%][%- END -%] >+ [%- CASE 'AZ' -%][%- IF (t) -%]<span>Azerbaijan</span>[%- ELSE -%][%- 'AzÉrbaycan' -%][%- END -%] >+ [%- CASE 'BE' -%][%- IF (t) -%]<span>Belgium</span>[%- ELSE -%][%- 'België' -%][%- END -%] >+ [%- CASE 'BR' -%][%- IF (t) -%]<span>Brazil</span>[%- ELSE -%][%- 'Brasil' -%][%- END -%] >+ [%- CASE 'BY' -%][%- IF (t) -%]<span>Belarus</span>[%- ELSE -%][%- 'ÐелаÑÑÑÑ' -%][%- END -%] >+ [%- CASE 'CA' -%][%- IF (t) -%]<span>Canada</span>[%- ELSE -%][%- 'Canada' -%][%- END -%] >+ [%- CASE 'CH' -%][%- IF (t) -%]<span>Switzerland</span>[%- ELSE -%][%- 'Schweiz' -%][%- END -%] >+ [%- CASE 'CN' -%][%- IF (t) -%]<span>China</span>[%- ELSE -%][%- 'ä¸å½' -%][%- END -%] >+ [%- CASE 'CZ' -%][%- IF (t) -%]<span>Czech Republic</span>[%- ELSE -%][%- 'Äeská republika' -%][%- END -%] >+ [%- CASE 'DE' -%][%- IF (t) -%]<span>Germany</span>[%- ELSE -%][%- 'Deutschland' -%][%- END -%] >+ [%- CASE 'DK' -%][%- IF (t) -%]<span>Denmark</span>[%- ELSE -%][%- 'Danmark' -%][%- END -%] >+ [%- CASE 'ES' -%][%- IF (t) -%]<span>Spain</span>[%- ELSE -%][%- 'España' -%][%- END -%] >+ [%- CASE 'FI' -%][%- IF (t) -%]<span>Finland</span>[%- ELSE -%][%- 'Suomi' -%][%- END -%] >+ [%- CASE 'FO' -%][%- IF (t) -%]<span>Faroe Islands</span>[%- ELSE -%][%- 'Føroyar' -%][%- END -%] >+ [%- CASE 'FR' -%][%- IF (t) -%]<span>France</span>[%- ELSE -%][%- 'France' -%][%- END -%] >+ [%- CASE 'GB' -%][%- IF (t) -%]<span>United Kingdom</span>[%- ELSE -%][%- 'United Kingdom' -%][%- END -%] >+ [%- CASE 'GR' -%][%- IF (t) -%]<span>Greece</span>[%- ELSE -%][%- 'Îλλάδα' -%][%- END -%] >+ [%- CASE 'HR' -%][%- IF (t) -%]<span>Croatia</span>[%- ELSE -%][%- 'Hrvatska' -%][%- END -%] >+ [%- CASE 'HU' -%][%- IF (t) -%]<span>Hungary</span>[%- ELSE -%][%- 'Magyarország' -%][%- END -%] >+ [%- CASE 'ID' -%][%- IF (t) -%]<span>Indonesia</span>[%- ELSE -%][%- 'Indonesia' -%][%- END -%] >+ [%- CASE 'IS' -%][%- IF (t) -%]<span>Iceland</span>[%- ELSE -%][%- 'Ãsland' -%][%- END -%] >+ [%- CASE 'IT' -%][%- IF (t) -%]<span>Italy</span>[%- ELSE -%][%- 'Italia' -%][%- END -%] >+ [%- CASE 'JP' -%][%- IF (t) -%]<span>Japan</span>[%- ELSE -%][%- 'æ¥æ¬' -%][%- END -%] >+ [%- CASE 'KE' -%][%- IF (t) -%]<span>Kenya</span>[%- ELSE -%][%- 'Kenya' -%][%- END -%] >+ [%- CASE 'KP' -%][%- IF (t) -%]<span>North Korea</span>[%- ELSE -%][%- 'ì¡°ì 민주주ìì¸ë¯¼ê³µíêµ' -%][%- END -%] >+ [%- CASE 'LK' -%][%- IF (t) -%]<span>Sri Lanka</span>[%- ELSE -%][%- 'à®à®²à®à¯à®à¯' -%][%- END -%] >+ [%- CASE 'MY' -%][%- IF (t) -%]<span>Malaysia</span>[%- ELSE -%][%- 'Malaysia' -%][%- END -%] >+ [%- CASE 'NE' -%][%- IF (t) -%]<span>Niger</span>[%- ELSE -%][%- 'Niger' -%][%- END -%] >+ [%- CASE 'NL' -%][%- IF (t) -%]<span>Netherlands</span>[%- ELSE -%][%- 'Nederland' -%][%- END -%] >+ [%- CASE 'NO' -%][%- IF (t) -%]<span>Norway</span>[%- ELSE -%][%- 'Noreg' -%][%- END -%] >+ [%- CASE 'NZ' -%][%- IF (t) -%]<span>New Zealand</span>[%- ELSE -%][%- 'New Zealand' -%][%- END -%] >+ [%- CASE 'PH' -%][%- IF (t) -%]<span>Philippines</span>[%- ELSE -%][%- 'Pilipinas' -%][%- END -%] >+ [%- CASE 'PK' -%][%- IF (t) -%]<span>Pakistan</span>[%- ELSE -%][%- 'پاÙستاÙ' -%][%- END -%] >+ [%- CASE 'PL' -%][%- IF (t) -%]<span>Poland</span>[%- ELSE -%][%- 'Polska' -%][%- END -%] >+ [%- CASE 'PT' -%][%- IF (t) -%]<span>Portugal</span>[%- ELSE -%][%- 'Portugal' -%][%- END -%] >+ [%- CASE 'RO' -%][%- IF (t) -%]<span>Romania</span>[%- ELSE -%][%- 'România' -%][%- END -%] >+ [%- CASE 'RU' -%][%- IF (t) -%]<span>Russia</span>[%- ELSE -%][%- 'РоÑÑиÑ' -%][%- END -%] >+ [%- CASE 'RW' -%][%- IF (t) -%]<span>Rwanda</span>[%- ELSE -%][%- 'Rwanda' -%][%- END -%] >+ [%- CASE 'SE' -%][%- IF (t) -%]<span>Sweden</span>[%- ELSE -%][%- 'Sverige' -%][%- END -%] >+ [%- CASE 'SI' -%][%- IF (t) -%]<span>Slovenia</span>[%- ELSE -%][%- 'Slovenija' -%][%- END -%] >+ [%- CASE 'SK' -%][%- IF (t) -%]<span>Slovakia</span>[%- ELSE -%][%- 'Slovensko' -%][%- END -%] >+ [%- CASE 'TH' -%][%- IF (t) -%]<span>Thailand</span>[%- ELSE -%][%- 'à¸à¸£à¸°à¹à¸à¸¨à¹à¸à¸¢' -%][%- END -%] >+ [%- CASE 'TR' -%][%- IF (t) -%]<span>Turkey</span>[%- ELSE -%][%- 'Türkiye' -%][%- END -%] >+ [%- CASE 'TW' -%][%- IF (t) -%]<span>Taiwan</span>[%- ELSE -%][%- 'å°ç£' -%][%- END -%] >+ [%- CASE 'UA' -%][%- IF (t) -%]<span>Ukraine</span>[%- ELSE -%][%- 'УкÑаÑна' -%][%- END -%] >+ [%- CASE 'US' -%][%- IF (t) -%]<span>United States</span>[%- ELSE -%][%- 'United States' -%][%- END -%] >+ [%- CASE 'VN' -%][%- IF (t) -%]<span>Vietnam</span>[%- ELSE -%][%- 'Viá»t Nam' -%][%- END -%] >+ [%- CASE -%][%- region -%] >+[%- END -%] >+[%- END -%] >+ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt >index fc58dbe..0637f00 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt >@@ -121,29 +121,29 @@ > <textarea name="pref_[% CHUNK.name %]" id="pref_[% CHUNK.name %]" class="preference preference-[% CHUNK.class or "short" %]" rows="10" cols="40">[% CHUNK.value %]</textarea> > [% ELSIF ( CHUNK.type_languages ) %] > <dl> >- [% FOREACH language IN CHUNK.languages %] >+ [% FOREACH language IN CHUNK.languages.sort('rfc4646_subtag') %] > [% IF ( language.plural ) %] > <dt> >- [% IF ( language.native_description ) %][% language.native_description %][% ELSE %][% language.rfc4646_subtag %][% END %] >+ [%- PROCESS native_description subtag = language.rfc4646_subtag -%] > </dt> >- [% FOREACH sublanguages_loo IN language.sublanguages_loop %] >+ [% FOREACH sublanguages_loo IN language.sublanguages_loop.sort('rfc4646_subtag') %] > <dd> >- <label for="[% sublanguages_loo.rfc4646_subtag %]">[% sublanguages_loo.native_description %] [% sublanguages_loo.script_description %] [% sublanguages_loo.region_description %] [% sublanguages_loo.variant_description %]([% sublanguages_loo.rfc4646_subtag %])</label> > [% IF ( sublanguages_loo.enabled ) %] > <input value="[% sublanguages_loo.rfc4646_subtag %]" name="pref_[% CHUNK.name %]" id="[% sublanguages_loo.rfc4646_subtag %]" type="checkbox" checked="checked" class="preference preference-checkbox"/> > [% ELSE %] > <input value="[% sublanguages_loo.rfc4646_subtag %]" name="pref_[% CHUNK.name %]" id="[% sublanguages_loo.rfc4646_subtag %]" type="checkbox" class="preference preference-checkbox"/> > [% END %] >+ <label for="[% sublanguages_loo.rfc4646_subtag %]">[% PROCESS native_description subtag = sublanguages_loo.rfc4646_subtag %] [% PROCESS script_description subtag = sublanguages_loo.rfc4646_subtag %] [% PROCESS region_description subtag = sublanguages_loo.rfc4646_subtag %] ([% sublanguages_loo.rfc4646_subtag %])</label> > </dd> > [% END %] > [% ELSE %] > <dt> >- <label for="[% language.rfc4646_subtag %]">[% language.native_description %]([% language.rfc4646_subtag %])</label> > [% IF ( language.group_enabled ) %] > <input value="[% language.rfc4646_subtag %]" name="pref_[% CHUNK.name %]" id="[% language.rfc4646_subtag %]" type="checkbox" checked="checked" class="preference preference-checkbox"/> > [% ELSE %] > <input value="[% language.rfc4646_subtag %]" name="pref_[% CHUNK.name %]" id="[% language.rfc4646_subtag %]" type="checkbox" class="preference preference-checkbox"/> > [% END %] >+ <label for="[% language.rfc4646_subtag %]">[% PROCESS native_description subtag = language.rfc4646_subtag %] ([% language.rfc4646_subtag %])</label> > </dt> > [% END %] > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt >index 6ca3274..6b1dd4a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt >@@ -122,57 +122,38 @@ > </select> > [% END %] > [% IF ( type_langselector ) %] >- [% IF ( languages_loop ) %] >- <table> >- [% FOREACH languages_loo IN languages_loop %] >- <tr><td> >- [% IF ( languages_loo.plural ) %] >- [% IF ( languages_loo.native_description ) %][% languages_loo.native_description %][% ELSE %][% languages_loo.rfc4646_subtag %][% END %] >- [% FOREACH sublanguages_loo IN languages_loo.sublanguages_loop %]<table><tr><td> >- [% IF ( sublanguages_loo.sublanguage_current ) %] >- <label for="[% sublanguages_loo.rfc4646_subtag %]">[% sublanguages_loo.native_description %] [% sublanguages_loo.script_description %] [% sublanguages_loo.region_description %] [% sublanguages_loo.variant_description %]([% sublanguages_loo.rfc4646_subtag %]) >- [% IF ( sublanguages_loo.enabled ) %] >- <input value="[% sublanguages_loo.rfc4646_subtag %]" name="value" id="[% sublanguages_loo.rfc4646_subtag %]" type="checkbox" checked="checked" /> >- [% ELSE %] >- <input value="[% sublanguages_loo.rfc4646_subtag %]" name="value" id="[% sublanguages_loo.rfc4646_subtag %]" type="checkbox" /> >- [% END %] >- </label> >- >- [% ELSE %] >- <label for="[% sublanguages_loo.rfc4646_subtag %]">[% sublanguages_loo.native_description %] [% sublanguages_loo.script_description %] [% sublanguages_loo.region_description %] [% sublanguages_loo.variant_description %]([% sublanguages_loo.rfc4646_subtag %]) >- [% IF ( sublanguages_loo.enabled ) %] >- <input value="[% sublanguages_loo.rfc4646_subtag %]" name="value" id="[% sublanguages_loo.rfc4646_subtag %]" type="checkbox" checked="checked" /> >- [% ELSE %] >- <input value="[% sublanguages_loo.rfc4646_subtag %]" name="value" id="[% sublanguages_loo.rfc4646_subtag %]" type="checkbox" /> >- [% END %] >- </label> >- [% END %]</td></tr></table> >- [% END %] >- >- [% ELSE %] >- [% IF ( languages_loo.current ) %] >- <label for="[% languages_loo.rfc4646_subtag %]">[% languages_loo.native_description %]([% languages_loo.rfc4646_subtag %]) >- [% IF ( languages_loo.group_enabled ) %] >- <input value="[% languages_loo.rfc4646_subtag %]" name="value" id="[% languages_loo.rfc4646_subtag %]" type="checkbox" checked="checked" /> >- [% ELSE %] >- <input value="[% languages_loo.rfc4646_subtag %]" name="value" id="[% languages_loo.rfc4646_subtag %]" type="checkbox" /> >- [% END %] >- </label> >- [% ELSE %] >- <label for="[% languages_loo.rfc4646_subtag %]">[% languages_loo.native_description %]([% languages_loo.rfc4646_subtag %]) >- [% IF ( languages_loo.group_enabled ) %] >- <input value="[% languages_loo.rfc4646_subtag %]" name="value" id="[% languages_loo.rfc4646_subtag %]" type="checkbox" checked="checked" /> >- [% ELSE %] >- <input value="[% languages_loo.rfc4646_subtag %]" name="value" id="[% languages_loo.rfc4646_subtag %]" type="checkbox" /> >- [% END %] >- </label> >- [% END %] >+ [% IF ( languages_loop ) %] >+ <table><tr><td><dl> >+ [% FOREACH languages_loo IN languages_loop.sort('rfc4646_subtag') %] >+ [% IF ( languages_loo.plural ) %] >+ <dt>[%- INCLUDE native_description subtag = languages_loo.rfc4646_subtag -%]</dt> >+ [% FOREACH sublanguages_loo IN languages_loo.sublanguages_loop.sort('rfc4646_subtag') %] >+ <dd> >+ [% IF ( sublanguages_loo.enabled ) %] >+ <input value="[% sublanguages_loo.rfc4646_subtag %]" name="value" id="[% sublanguages_loo.rfc4646_subtag %]" type="checkbox" checked="checked" /> >+ [% ELSE %] >+ <input value="[% sublanguages_loo.rfc4646_subtag %]" name="value" id="[% sublanguages_loo.rfc4646_subtag %]" type="checkbox" /> >+ [% END %] >+ <label for="[% sublanguages_loo.rfc4646_subtag %]"> >+ [% INCLUDE native_description subtag = sublanguages_loo.rfc4646_subtag %] >+ [% INCLUDE script_description subtag = sublanguages_loo.rfc4646_subtag %] >+ [% INCLUDE region_description subtag = sublanguages_loo.rfc4646_subtag %] ([% sublanguages_loo.rfc4646_subtag %]) >+ </label> >+ </dd> >+ [% END %] >+ [% ELSE %] >+ <dt> >+ [% IF ( languages_loo.enabled ) %] >+ <input value="[% sublanguages_loo.rfc4646_subtag %]" name="value" id="[% sublanguages_loo.rfc4646_subtag %]" type="checkbox" checked="checked" /> >+ [% ELSE %] >+ <input value="[% sublanguages_loo.rfc4646_subtag %]" name="value" id="[% sublanguages_loo.rfc4646_subtag %]" type="checkbox" /> >+ [% END %] >+ <label for="[% languages_loo.rfc4646_subtag %]">[% INCLUDE native_description subtag = languages_loo.rfc4646_subtag %] ([% languages_loo.rfc4646_subtag %])</label> >+ </dt> >+ [% END %] >+ [% END %] >+ </dl></td></tr></table> > [% END %] >- </td></tr> >- [% END %] >- </table> >- [% END %] >- > [% END %] > > [% IF ( type_yesno ) %] >@@ -298,58 +279,40 @@ > [% END %] > </select> > [% END %] >- [% IF ( loo.type_langselector ) %] >- [% IF ( loo.languages_loop ) %] >- <table> >- [% FOREACH languages_loo IN loo.languages_loop %] >- <tr><td> >- [% IF ( languages_loo.plural ) %] >- [% IF ( languages_loo.native_description ) %][% languages_loo.native_description %][% ELSE %][% languages_loo.rfc4646_subtag %][% END %] >- [% FOREACH sublanguages_loo IN languages_loo.sublanguages_loop %]<table><tr><td> >- [% IF ( sublanguages_loo.sublanguage_current ) %] >- <label for="[% sublanguages_loo.rfc4646_subtag %]">[% sublanguages_loo.native_description %] [% sublanguages_loo.script_description %] [% sublanguages_loo.region_description %] [% sublanguages_loo.variant_description %]([% sublanguages_loo.rfc4646_subtag %]) >- [% IF ( sublanguages_loo.enabled ) %] >- <input value="[% sublanguages_loo.rfc4646_subtag %]" name="value" id="[% sublanguages_loo.rfc4646_subtag %]" type="checkbox" checked="checked" /> >- [% ELSE %] >- <input value="[% sublanguages_loo.rfc4646_subtag %]" name="value" id="[% sublanguages_loo.rfc4646_subtag %]" type="checkbox" /> >- [% END %] >- </label> > >- [% ELSE %] >- <label for="[% sublanguages_loo.rfc4646_subtag %]">[% sublanguages_loo.native_description %] [% sublanguages_loo.script_description %] [% sublanguages_loo.region_description %] [% sublanguages_loo.variant_description %]([% sublanguages_loo.rfc4646_subtag %]) >- [% IF ( sublanguages_loo.enabled ) %] >- <input value="[% sublanguages_loo.rfc4646_subtag %]" name="value" id="[% sublanguages_loo.rfc4646_subtag %]" type="checkbox" checked="checked" /> >+ [% IF ( loo.type_langselector ) %] >+ [% IF ( loo.languages_loop ) %] >+ <table><tr><td><dl> >+ [% FOREACH languages_loo IN loo.languages_loop.sort('rfc4646_subtag') %] >+ [% IF ( languages_loo.plural ) %] >+ <dt>[%- INCLUDE native_description subtag = languages_loo.rfc4646_subtag -%]</dt> >+ [% FOREACH sublanguages_loo IN languages_loo.sublanguages_loop.sort('rfc4646_subtag') %] >+ <dd> >+ [% IF ( sublanguages_loo.enabled ) %] >+ <input value="[% sublanguages_loo.rfc4646_subtag %]" name="value" id="[% sublanguages_loo.rfc4646_subtag %]" type="checkbox" checked="checked" /> >+ [% ELSE %] >+ <input value="[% sublanguages_loo.rfc4646_subtag %]" name="value" id="[% sublanguages_loo.rfc4646_subtag %]" type="checkbox" /> >+ [% END %] >+ <label for="[% sublanguages_loo.rfc4646_subtag %]"> >+ [% INCLUDE native_description subtag = sublanguages_loo.rfc4646_subtag %] >+ [% INCLUDE script_description subtag = sublanguages_loo.rfc4646_subtag %] >+ [% INCLUDE region_description subtag = sublanguages_loo.rfc4646_subtag %] ([% sublanguages_loo.rfc4646_subtag %]) >+ </label> >+ </dd> >+ [% END %] > [% ELSE %] >- <input value="[% sublanguages_loo.rfc4646_subtag %]" name="value" id="[% sublanguages_loo.rfc4646_subtag %]" type="checkbox" /> >+ <dt> >+ [% IF ( languages_loo.enabled ) %] >+ <input value="[% sublanguages_loo.rfc4646_subtag %]" name="value" id="[% sublanguages_loo.rfc4646_subtag %]" type="checkbox" checked="checked" /> >+ [% ELSE %] >+ <input value="[% sublanguages_loo.rfc4646_subtag %]" name="value" id="[% sublanguages_loo.rfc4646_subtag %]" type="checkbox" /> >+ [% END %] >+ <label for="[% languages_loo.rfc4646_subtag %]">[% INCLUDE native_description subtag = languages_loo.rfc4646_subtag %] ([% languages_loo.rfc4646_subtag %])</label> >+ </dt> > [% END %] >- </label> >- [% END %]</td></tr></table> >- [% END %] >- >- [% ELSE %] >- [% IF ( languages_loo.current ) %] >- <label for="[% languages_loo.rfc4646_subtag %]">[% languages_loo.native_description %]([% languages_loo.rfc4646_subtag %]) >- [% IF ( languages_loo.group_enabled ) %] >- <input value="[% languages_loo.rfc4646_subtag %]" name="value" id="opac[% languages_loo.rfc4646_subtag %]" type="checkbox" checked="checked" /> >- [% ELSE %] >- <input value="[% languages_loo.rfc4646_subtag %]" name="value" id="opac[% languages_loo.rfc4646_subtag %]" type="checkbox" /> >- [% END %] >- </label> >- [% ELSE %] >- <label for="[% languages_loo.rfc4646_subtag %]">[% languages_loo.native_description %]([% languages_loo.rfc4646_subtag %]) >- [% IF ( languages_loo.group_enabled ) %] >- <input value="[% languages_loo.rfc4646_subtag %]" name="value" id="opac[% languages_loo.rfc4646_subtag %]" type="checkbox" checked="checked" /> >- [% ELSE %] >- <input value="[% languages_loo.rfc4646_subtag %]" name="value" id="opac[% languages_loo.rfc4646_subtag %]" type="checkbox" /> >- [% END %] >- </label> > [% END %] >+ </dl></td></tr></table> > [% END %] >- </td></tr> >- [% END %] >- </table> >- [% END %] >- > [% END %] > > [% IF ( loo.type_yesno ) %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt >index c982eb4..26be41a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt >@@ -137,17 +137,17 @@ > <fieldset id="language"> > <!-- LANGUAGE LIMIT --> > <p><label for="language-limit">Language: </label> >- <select name="limit" id="language-limit"> >- <option value="">No limit</option> >- [% FOREACH search_languages_loo IN search_languages_loop %] >- [% IF ( search_languages_loo.selected ) %] >- <option value="ln,rtrn:[% search_languages_loo.iso639_2_code %]" selected="selected">[% search_languages_loo.language_description %]</option> >- [% ELSE %] >- <option value="ln,rtrn:[% search_languages_loo.iso639_2_code %]">[% search_languages_loo.language_description %]</option> >- [% END %] >- >- [% END %] >- </select></p><!-- <a href="">Show all languages</a>--> >+ <select id="language-limit" name="limit"> >+ <option value="">No limit</option> >+ [% PROCESS get_language_codes %] >+ [% FOREACH language_code IN language_codes %] >+ <option value="ln,rtrn:[%- INCLUDE language_descriptions code = language_code i = 1 -%]"> >+ [%- INCLUDE language_descriptions code = language_code -%] >+ ([%- INCLUDE language_descriptions code = language_code t = 1 -%]) >+ </option> >+ [% END %] >+ </select> >+ </p><!-- <a href="">Show all languages</a>--> > <!-- /LANGUAGE LIMIT --> > </fieldset> > </fieldset> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tt >index 038c9dc..9ce6cb3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tt >@@ -11,15 +11,15 @@ listed, please inform your systems administrator.</p> > <form name="language" method="post"> > <select name="language"> > [% IF ( installer_languages_loop ) %] >- [% FOREACH installer_languages_loo IN installer_languages_loop %] >+ [% FOREACH installer_languages_loo IN installer_languages_loop.sort('rfc4646_subtag') %] > [% IF ( installer_languages_loo.plural ) %] >- <optgroup label="[% installer_languages_loo.language %]"> >- [% FOREACH sublanguages_loo IN installer_languages_loo.sublanguages_loop %] >- <option value="[% sublanguages_loo.rfc4646_subtag %]">[% IF ( sublanguages_loo.native_description ) %][% sublanguages_loo.native_description %][% ELSE %][% sublanguages_loo.rfc4646_subtag %][% END %]</option> >+ <optgroup label="[% PROCESS native_description subtag = installer_languages_loo.language %]"> >+ [% FOREACH sublanguages_loo IN installer_languages_loo.sublanguages_loop.sort('rfc4646_subtag') %] >+ <option value="[% sublanguages_loo.rfc4646_subtag %]">[% PROCESS region_description subtag = sublanguages_loo.rfc4646_subtag %] ([% sublanguages_loo.rfc4646_subtag %])</option> > [% END %] > </optgroup> > [% ELSE %] >- <option value="[% installer_languages_loo.rfc4646_subtag %]">[% IF ( installer_languages_loo.native_description ) %][% installer_languages_loo.native_description %][% ELSE %][% installer_languages_loo.rfc4646_subtag %][% END %]</option> >+ <option value="[% installer_languages_loo.rfc4646_subtag %]">[% PROCESS native_description subtag = installer_languages_loo.rfc4646_subtag %] ([% installer_languages_loo.rfc4646_subtag %])</option> > [% END %] > [% END %] > [% END %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc >index ab7b4bb..b3b830c 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc >@@ -15,6 +15,8 @@ > <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/lib/jquery/jquery-ui.css" /> > [% END %] > >+[% PROCESS 'languages.inc' %] >+ > [% SET opaclayoutstylesheet='opac.css' UNLESS opaclayoutstylesheet %] > [% IF (opaclayoutstylesheet.match('^https?:|^\/')) %] > <link rel="stylesheet" type="text/css" href="[% opaclayoutstylesheet %]" /> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/languages.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/languages.inc >new file mode 100644 >index 0000000..fc3c287 >--- /dev/null >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/languages.inc >@@ -0,0 +1,196 @@ >+[%# "WARNING: This file must be replicated on 'include' dir" %] >+[%# "for each staff/opac theme" %] >+ >+[%- BLOCK split_subtag -%] >+[%- IF ( matches = subtag.match('^(\w+)$')) -%] >+ [%- SET lang = subtag -%] >+ [%- SET script = '' -%] >+ [%- IF ( lang == 'en' ) -%] >+ [%- SET region = 'US' -%] >+ [%- ELSE -%] >+ [%- SET region = '' -%] >+ [%- END -%] >+[%- ELSIF ( matches = subtag.match('^(\w+)-(\w+)$')) -%] >+ [%- SET lang = matches.0 -%] >+ [%- IF matches.1.length == 4 -%] >+ [%- SET script = matches.1 -%] >+ [%- SET region = '' -%] >+ [%- ELSE -%] >+ [%- SET script = '' -%] >+ [%- SET region = matches.1 -%] >+ [%- END -%] >+[%- ELSIF ( matches = subtag.match('^(\w+)-(\w+)-(\w+)$')) -%] >+ [%- SET lang = matches.0 -%] >+ [%- SET script = matches.1 -%] >+ [%- SET region = matches.2 -%] >+[%- END -%] >+[%- END -%] >+ >+[%- BLOCK native_description -%] >+[%- PROCESS split_subtag subtag = subtag -%] >+[%- PROCESS language_descriptions code = lang -%] >+[%- END -%] >+ >+[%- BLOCK script_description -%] >+[%- PROCESS split_subtag subtag = subtag -%] >+[%- PROCESS script_descriptions code = script -%] >+[%- END -%] >+ >+[%- BLOCK region_description -%] >+[%- PROCESS split_subtag subtag = subtag -%] >+[%- PROCESS region_descriptions code = region -%] >+[%- END -%] >+ >+[%# Update language_descriptions when modifying language_codes %] >+[%- BLOCK get_language_codes -%] >+[%- language_codes = ['am', 'ar', 'az', 'be', 'ben', 'bg', 'ca', 'cs', >+'da', 'de', 'el', 'en', 'es', 'eu', 'fa', 'fi', 'fo', 'fr', >+'gl', 'he', 'hi', 'hr', 'hu', 'hy', 'id', 'is', 'it', 'ja', >+'kn', 'ko', 'ku', 'lo', 'mi', 'mon', 'mr', 'ms', 'nb', 'ne', >+'nl', 'nn', 'pbr', 'pl', 'prs', 'pt', 'ro', 'ru', 'rw', 'sd', >+'sk', 'sl', 'sq', 'sr', 'sv', 'sw', 'ta', 'tet', 'th', 'tl', >+'tr', 'uk', 'ur', 'vi', 'zh'] -%] >+[%- END -%] >+ >+[%# Update language_codes when modifying language_descriptions %] >+[%# (i=1) for iso639-2 code, (t=1) fortname %] >+[%- BLOCK language_descriptions -%] >+[%- SWITCH code -%] >+ [%- CASE 'am' -%][%- IF (i) -%][%- 'amh' -%][%- ELSIF (t) -%]<span>Amharic</span>[%- ELSE -%][%- "á£ááá" -%][%- END -%] >+ [%- CASE 'ar' -%][%- IF (i) -%][%- 'ara' -%][%- ELSIF (t) -%]<span>Arabic</span>[%- ELSE -%][%- "ÙعربÙØ©" -%][%- END -%] >+ [%- CASE 'az' -%][%- IF (i) -%][%- 'aze' -%][%- ELSIF (t) -%]<span>Azerbaijani</span>[%- ELSE -%][%- "AzÉrbaycan dili" -%][%- END -%] >+ [%- CASE 'be' -%][%- IF (i) -%][%- 'bel' -%][%- ELSIF (t) -%]<span>Byelorussian</span>[%- ELSE -%][%- "ÐелаÑÑÑÐºÐ°Ñ Ð¼Ð¾Ð²Ð°" -%][%- END -%] >+ [%- CASE 'ben' -%][%- IF (i) -%][%- 'ben' -%][%- ELSIF (t) -%]<span>Bengali</span>[%- ELSE -%][%- "বাà¦à¦²à¦¾" -%][%- END -%] >+ [%- CASE 'bg' -%][%- IF (i) -%][%- 'bul' -%][%- ELSIF (t) -%]<span>Bulgarian</span>[%- ELSE -%][%- "ÐÑлгаÑÑки" -%][%- END -%] >+ [%- CASE 'ca' -%][%- IF (i) -%][%- 'cat' -%][%- ELSIF (t) -%]<span>Catalan</span>[%- ELSE -%][%- "Català " -%][%- END -%] >+ [%- CASE 'cs' -%][%- IF (i) -%][%- 'ces' -%][%- ELSIF (t) -%]<span>Czech</span>[%- ELSE -%][%- "CeÅ¡tina" -%][%- END -%] >+ [%- CASE 'da' -%][%- IF (i) -%][%- 'dan' -%][%- ELSIF (t) -%]<span>Danish</span>[%- ELSE -%][%- "Dansk" -%][%- END -%] >+ [%- CASE 'de' -%][%- IF (i) -%][%- 'ger' -%][%- ELSIF (t) -%]<span>German</span>[%- ELSE -%][%- "Deutsch" -%][%- END -%] >+ [%- CASE 'el' -%][%- IF (i) -%][%- 'gre' -%][%- ELSIF (t) -%]<span>Greek</span>[%- ELSE -%][%- "ελληνικά" -%][%- END -%] >+ [%- CASE 'en' -%][%- IF (i) -%][%- 'eng' -%][%- ELSIF (t) -%]<span>English</span>[%- ELSE -%][%- "English" -%][%- END -%] >+ [%- CASE 'es' -%][%- IF (i) -%][%- 'spa' -%][%- ELSIF (t) -%]<span>Spanish</span>[%- ELSE -%][%- "Español" -%][%- END -%] >+ [%- CASE 'eu' -%][%- IF (i) -%][%- 'baq' -%][%- ELSIF (t) -%]<span>Basque</span>[%- ELSE -%][%- "Euskara" -%][%- END -%] >+ [%- CASE 'fa' -%][%- IF (i) -%][%- 'per' -%][%- ELSIF (t) -%]<span>Persian</span>[%- ELSE -%][%- "ÙارسÙ" -%][%- END -%] >+ [%- CASE 'fi' -%][%- IF (i) -%][%- 'fin' -%][%- ELSIF (t) -%]<span>Finnish</span>[%- ELSE -%][%- "Suomi" -%][%- END -%] >+ [%- CASE 'fo' -%][%- IF (i) -%][%- 'fao' -%][%- ELSIF (t) -%]<span>Faroese</span>[%- ELSE -%][%- "Føroyskt" -%][%- END -%] >+ [%- CASE 'fr' -%][%- IF (i) -%][%- 'fre' -%][%- ELSIF (t) -%]<span>French</span>[%- ELSE -%][%- "Français" -%][%- END -%] >+ [%- CASE 'gl' -%][%- IF (i) -%][%- 'glg' -%][%- ELSIF (t) -%]<span>Galician</span>[%- ELSE -%][%- "Galego" -%][%- END -%] >+ [%- CASE 'he' -%][%- IF (i) -%][%- 'heb' -%][%- ELSIF (t) -%]<span>Hebrew</span>[%- ELSE -%][%- "×¢Ö´×ְרִ×ת" -%][%- END -%] >+ [%- CASE 'hi' -%][%- IF (i) -%][%- 'hin' -%][%- ELSIF (t) -%]<span>Hindi</span>[%- ELSE -%][%- "हिनà¥à¤¦à¥" -%][%- END -%] >+ [%- CASE 'hr' -%][%- IF (i) -%][%- 'hrv' -%][%- ELSIF (t) -%]<span>Croatian</span>[%- ELSE -%][%- "Hrvatski" -%][%- END -%] >+ [%- CASE 'hu' -%][%- IF (i) -%][%- 'hun' -%][%- ELSIF (t) -%]<span>Hungarian</span>[%- ELSE -%][%- "Magyar" -%][%- END -%] >+ [%- CASE 'hy' -%][%- IF (i) -%][%- 'arm' -%][%- ELSIF (t) -%]<span>Armenian</span>[%- ELSE -%][%- "ÕÕ¡ÕµÕ¥ÖÕ§Õ¶" -%][%- END -%] >+ [%- CASE 'id' -%][%- IF (i) -%][%- 'ind' -%][%- ELSIF (t) -%]<span>Indonesian</span>[%- ELSE -%][%- "Bahasa Indonesia" -%][%- END -%] >+ [%- CASE 'is' -%][%- IF (i) -%][%- 'ice' -%][%- ELSIF (t) -%]<span>Icelandic</span>[%- ELSE -%][%- "Ãslenska" -%][%- END -%] >+ [%- CASE 'it' -%][%- IF (i) -%][%- 'ita' -%][%- ELSIF (t) -%]<span>Italian</span>[%- ELSE -%][%- "Italiano" -%][%- END -%] >+ [%- CASE 'ja' -%][%- IF (i) -%][%- 'jpn' -%][%- ELSIF (t) -%]<span>Japanese</span>[%- ELSE -%][%- "æ¥æ¬èª" -%][%- END -%] >+ [%- CASE 'kn' -%][%- IF (i) -%][%- 'kan' -%][%- ELSIF (t) -%]<span>Kannada</span>[%- ELSE -%][%- "à²à²¨à³à²¨à²¡" -%][%- END -%] >+ [%- CASE 'ko' -%][%- IF (i) -%][%- 'kor' -%][%- ELSIF (t) -%]<span>Korean</span>[%- ELSE -%][%- "íêµì´" -%][%- END -%] >+ [%- CASE 'ku' -%][%- IF (i) -%][%- 'kur' -%][%- ELSIF (t) -%]<span>Kurdish</span>[%- ELSE -%][%- "Ú©ÙردÛ" -%][%- END -%] >+ [%- CASE 'lo' -%][%- IF (i) -%][%- 'lao' -%][%- ELSIF (t) -%]<span>Lao</span>[%- ELSE -%][%- "àºàº²àºªàº²àº¥àº²àº§" -%][%- END -%] >+ [%- CASE 'mi' -%][%- IF (i) -%][%- 'mao' -%][%- ELSIF (t) -%]<span>Maori</span>[%- ELSE -%][%- "Te Reo MÄori" -%][%- END -%] >+ [%- CASE 'mon' -%][%- IF (i) -%][%- 'mon' -%][%- ELSIF (t) -%]<span>Mongolian</span>[%- ELSE -%][%- "Mонгол" -%][%- END -%] >+ [%- CASE 'mr' -%][%- IF (i) -%][%- 'mar' -%][%- ELSIF (t) -%]<span>Marathi</span>[%- ELSE -%][%- "मराठà¥" -%][%- END -%] >+ [%- CASE 'ms' -%][%- IF (i) -%][%- 'may' -%][%- ELSIF (t) -%]<span>Malay</span>[%- ELSE -%][%- "Bahasa melayu" -%][%- END -%] >+ [%- CASE 'nb' -%][%- IF (i) -%][%- 'nob' -%][%- ELSIF (t) -%]<span>Norwegian bokmÃ¥l</span>[%- ELSE -%][%- "Norsk bokmÃ¥l" -%][%- END -%] >+ [%- CASE 'ne' -%][%- IF (i) -%][%- 'nep' -%][%- ELSIF (t) -%]<span>Nepali</span>[%- ELSE -%][%- "नà¥à¤ªà¤¾à¤²à¥" -%][%- END -%] >+ [%- CASE 'nl' -%][%- IF (i) -%][%- 'dut' -%][%- ELSIF (t) -%]<span>Dutch</span>[%- ELSE -%][%- "Nederlands" -%][%- END -%] >+ [%- CASE 'nn' -%][%- IF (i) -%][%- 'nno' -%][%- ELSIF (t) -%]<span>Norwegian nynorsk</span>[%- ELSE -%][%- "Norsk nynorsk" -%][%- END -%] >+ [%- CASE 'pbr' -%][%- IF (i) -%][%- 'pbr' -%][%- ELSIF (t) -%]<span>Pangwa</span>[%- ELSE -%][%- "Ekipangwa" -%][%- END -%] >+ [%- CASE 'pl' -%][%- IF (i) -%][%- 'pol' -%][%- ELSIF (t) -%]<span>Polish</span>[%- ELSE -%][%- "Polski" -%][%- END -%] >+ [%- CASE 'prs' -%][%- IF (i) -%][%- 'prs' -%][%- ELSIF (t) -%]<span>Dari</span>[%- ELSE -%][%- "درÙ" -%][%- END -%] >+ [%- CASE 'pt' -%][%- IF (i) -%][%- 'por' -%][%- ELSIF (t) -%]<span>Portuguese</span>[%- ELSE -%][%- "Português" -%][%- END -%] >+ [%- CASE 'ro' -%][%- IF (i) -%][%- 'rum' -%][%- ELSIF (t) -%]<span>Romanian</span>[%- ELSE -%][%- "Român" -%][%- END -%] >+ [%- CASE 'ru' -%][%- IF (i) -%][%- 'rus' -%][%- ELSIF (t) -%]<span>Russian</span>[%- ELSE -%][%- "Ð ÑÑÑкий ÑзÑк" -%][%- END -%] >+ [%- CASE 'rw' -%][%- IF (i) -%][%- 'kin' -%][%- ELSIF (t) -%]<span>Kinyarwanda</span>[%- ELSE -%][%- "Ikinyarwanda" -%][%- END -%] >+ [%- CASE 'sd' -%][%- IF (i) -%][%- 'snd' -%][%- ELSIF (t) -%]<span>Sindhi</span>[%- ELSE -%][%- "سÙÚÙ" -%][%- END -%] >+ [%- CASE 'sk' -%][%- IF (i) -%][%- 'slo' -%][%- ELSIF (t) -%]<span>Slovak</span>[%- ELSE -%][%- "SlovenÄina" -%][%- END -%] >+ [%- CASE 'sl' -%][%- IF (i) -%][%- 'slv' -%][%- ELSIF (t) -%]<span>Slovenian</span>[%- ELSE -%][%- "SlovenÅ¡Äina" -%][%- END -%] >+ [%- CASE 'sq' -%][%- IF (i) -%][%- 'alb' -%][%- ELSIF (t) -%]<span>Albanian</span>[%- ELSE -%][%- "Shqip" -%][%- END -%] >+ [%- CASE 'sr' -%][%- IF (i) -%][%- 'srp' -%][%- ELSIF (t) -%]<span>Serbian</span>[%- ELSE -%][%- "CÑпÑки" -%][%- END -%] >+ [%- CASE 'sv' -%][%- IF (i) -%][%- 'swe' -%][%- ELSIF (t) -%]<span>Swedish</span>[%- ELSE -%][%- "Svenska" -%][%- END -%] >+ [%- CASE 'sw' -%][%- IF (i) -%][%- 'swa' -%][%- ELSIF (t) -%]<span>Swahili</span>[%- ELSE -%][%- "Kiswahili" -%][%- END -%] >+ [%- CASE 'ta' -%][%- IF (i) -%][%- 'tam' -%][%- ELSIF (t) -%]<span>Tamil</span>[%- ELSE -%][%- "தமிழà¯" -%][%- END -%] >+ [%- CASE 'tet' -%][%- IF (i) -%][%- 'tet' -%][%- ELSIF (t) -%]<span>Tetum</span>[%- ELSE -%][%- "Tetun" -%][%- END -%] >+ [%- CASE 'th' -%][%- IF (i) -%][%- 'tha' -%][%- ELSIF (t) -%]<span>Thai</span>[%- ELSE -%][%- "ภาษาà¹à¸à¸¢" -%][%- END -%] >+ [%- CASE 'tl' -%][%- IF (i) -%][%- 'tgl' -%][%- ELSIF (t) -%]<span>Tagalog</span>[%- ELSE -%][%- "Tagalog" -%][%- END -%] >+ [%- CASE 'tr' -%][%- IF (i) -%][%- 'tur' -%][%- ELSIF (t) -%]<span>Turkish</span>[%- ELSE -%][%- "Türkçe" -%][%- END -%] >+ [%- CASE 'uk' -%][%- IF (i) -%][%- 'ukr' -%][%- ELSIF (t) -%]<span>Ukranian</span>[%- ELSE -%][%- "УкÑаÑнÑÑка" -%][%- END -%] >+ [%- CASE 'ur' -%][%- IF (i) -%][%- 'urd' -%][%- ELSIF (t) -%]<span>Urdu</span>[%- ELSE -%][%- "اردÙ" -%][%- END -%] >+ [%- CASE 'vi' -%][%- IF (i) -%][%- 'vie' -%][%- ELSIF (t) -%]<span>Vietnamese</span>[%- ELSE -%][%- "ãè¶" -%][%- END -%] >+ [%- CASE 'zh' -%][%- IF (i) -%][%- 'chi' -%][%- ELSIF (t) -%]<span>Chinese</span>[%- ELSE -%][%- "ä¸æ" -%][%- END -%] >+ [%- CASE -%][%- lang -%] >+[%- END -%] >+[%- END -%] >+ >+[%- BLOCK script_descriptions -%] >+[%- SWITCH code -%] >+ [%- CASE 'Arab' -%][%- IF (t) %]<span>Arabic</span>[%- ELSE -%][%- "اÙعربÙØ©" -%][%- END -%] >+ [%- CASE 'Armn' -%][%- IF (t) %]<span>Armenian</span>[%- ELSE -%][%- "ÕÕ¡ÕµÕ¸Ö Õ¡ÕµÕ¢Õ¸ÖÕ¢Õ¥Õ¶" -%][%- END -%] >+ [%- CASE 'Cyrl' -%][%- IF (t) %]<span>Cyrillic</span>[%- ELSE -%][%- "ÐиÑилиÑа" -%][%- END -%] >+ [%- CASE 'Ethi' -%][%- IF (t) %]<span>Ethiopic</span>[%- ELSE -%][%- "ááá" -%][%- END -%] >+ [%- CASE 'Grek' -%][%- IF (t) %]<span>Greek</span>[%- ELSE -%][%- "ÎÎ»Î»Î·Î½Î¹ÎºÏ Î±Î»ÏάβηÏο" -%][%- END -%] >+ [%- CASE 'Hans' -%][%- IF (t) %]<span>Han (Simplified)</span>[%- ELSE -%][%- "ç®ä½å" -%][%- END -%] >+ [%- CASE 'Hant' -%][%- IF (t) %]<span>Han (Traditional)</span>[%- ELSE -%][%- "ç¹é«å" -%][%- END -%] >+ [%- CASE 'Hebr' -%][%- IF (t) %]<span>Hebrew</span>[%- ELSE -%][%- "×Ö¸×ֶף־×ÖµÖ¼×ת ×¢Ö´×ְרִ×" -%][%- END -%] >+ [%- CASE 'Jpan' -%][%- IF (t) %]<span>Japanese</span>[%- ELSE -%][%- "æ¼¢å/ã²ãããª/ã«ã¿ã«ã" -%][%- END -%] >+ [%- CASE 'Knda' -%][%- IF (t) %]<span>Kannada</span>[%- ELSE -%][%- "à²à²¨à³à²¨à²¡ ಲಿಪಿ" -%][%- END -%] >+ [%- CASE 'Kore' -%][%- IF (t) %]<span>Korean</span>[%- ELSE -%][%- "íê¸" -%][%- END -%] >+ [%- CASE 'Laoo' -%][%- IF (t) %]<span>Lao</span>[%- ELSE -%][%- "àºàº±àºàºªàºàºàº¥àº²àº§" -%][%- END -%] >+ [%- CASE -%][%- script -%] >+[%- END -%] >+[%- END -%] >+ >+[%- BLOCK region_descriptions -%] >+[%- SWITCH code -%] >+ [%- CASE 'AL' -%][%- IF (t) -%]<span>Albania</span>[%- ELSE -%][%- 'Shqipërisë' -%][%- END -%] >+ [%- CASE 'AZ' -%][%- IF (t) -%]<span>Azerbaijan</span>[%- ELSE -%][%- 'AzÉrbaycan' -%][%- END -%] >+ [%- CASE 'BE' -%][%- IF (t) -%]<span>Belgium</span>[%- ELSE -%][%- 'België' -%][%- END -%] >+ [%- CASE 'BR' -%][%- IF (t) -%]<span>Brazil</span>[%- ELSE -%][%- 'Brasil' -%][%- END -%] >+ [%- CASE 'BY' -%][%- IF (t) -%]<span>Belarus</span>[%- ELSE -%][%- 'ÐелаÑÑÑÑ' -%][%- END -%] >+ [%- CASE 'CA' -%][%- IF (t) -%]<span>Canada</span>[%- ELSE -%][%- 'Canada' -%][%- END -%] >+ [%- CASE 'CH' -%][%- IF (t) -%]<span>Switzerland</span>[%- ELSE -%][%- 'Schweiz' -%][%- END -%] >+ [%- CASE 'CN' -%][%- IF (t) -%]<span>China</span>[%- ELSE -%][%- 'ä¸å½' -%][%- END -%] >+ [%- CASE 'CZ' -%][%- IF (t) -%]<span>Czech Republic</span>[%- ELSE -%][%- 'Äeská republika' -%][%- END -%] >+ [%- CASE 'DE' -%][%- IF (t) -%]<span>Germany</span>[%- ELSE -%][%- 'Deutschland' -%][%- END -%] >+ [%- CASE 'DK' -%][%- IF (t) -%]<span>Denmark</span>[%- ELSE -%][%- 'Danmark' -%][%- END -%] >+ [%- CASE 'ES' -%][%- IF (t) -%]<span>Spain</span>[%- ELSE -%][%- 'España' -%][%- END -%] >+ [%- CASE 'FI' -%][%- IF (t) -%]<span>Finland</span>[%- ELSE -%][%- 'Suomi' -%][%- END -%] >+ [%- CASE 'FO' -%][%- IF (t) -%]<span>Faroe Islands</span>[%- ELSE -%][%- 'Føroyar' -%][%- END -%] >+ [%- CASE 'FR' -%][%- IF (t) -%]<span>France</span>[%- ELSE -%][%- 'France' -%][%- END -%] >+ [%- CASE 'GB' -%][%- IF (t) -%]<span>United Kingdom</span>[%- ELSE -%][%- 'United Kingdom' -%][%- END -%] >+ [%- CASE 'GR' -%][%- IF (t) -%]<span>Greece</span>[%- ELSE -%][%- 'Îλλάδα' -%][%- END -%] >+ [%- CASE 'HR' -%][%- IF (t) -%]<span>Croatia</span>[%- ELSE -%][%- 'Hrvatska' -%][%- END -%] >+ [%- CASE 'HU' -%][%- IF (t) -%]<span>Hungary</span>[%- ELSE -%][%- 'Magyarország' -%][%- END -%] >+ [%- CASE 'ID' -%][%- IF (t) -%]<span>Indonesia</span>[%- ELSE -%][%- 'Indonesia' -%][%- END -%] >+ [%- CASE 'IS' -%][%- IF (t) -%]<span>Iceland</span>[%- ELSE -%][%- 'Ãsland' -%][%- END -%] >+ [%- CASE 'IT' -%][%- IF (t) -%]<span>Italy</span>[%- ELSE -%][%- 'Italia' -%][%- END -%] >+ [%- CASE 'JP' -%][%- IF (t) -%]<span>Japan</span>[%- ELSE -%][%- 'æ¥æ¬' -%][%- END -%] >+ [%- CASE 'KE' -%][%- IF (t) -%]<span>Kenya</span>[%- ELSE -%][%- 'Kenya' -%][%- END -%] >+ [%- CASE 'KP' -%][%- IF (t) -%]<span>North Korea</span>[%- ELSE -%][%- 'ì¡°ì 민주주ìì¸ë¯¼ê³µíêµ' -%][%- END -%] >+ [%- CASE 'LK' -%][%- IF (t) -%]<span>Sri Lanka</span>[%- ELSE -%][%- 'à®à®²à®à¯à®à¯' -%][%- END -%] >+ [%- CASE 'MY' -%][%- IF (t) -%]<span>Malaysia</span>[%- ELSE -%][%- 'Malaysia' -%][%- END -%] >+ [%- CASE 'NE' -%][%- IF (t) -%]<span>Niger</span>[%- ELSE -%][%- 'Niger' -%][%- END -%] >+ [%- CASE 'NL' -%][%- IF (t) -%]<span>Netherlands</span>[%- ELSE -%][%- 'Nederland' -%][%- END -%] >+ [%- CASE 'NO' -%][%- IF (t) -%]<span>Norway</span>[%- ELSE -%][%- 'Noreg' -%][%- END -%] >+ [%- CASE 'NZ' -%][%- IF (t) -%]<span>New Zealand</span>[%- ELSE -%][%- 'New Zealand' -%][%- END -%] >+ [%- CASE 'PH' -%][%- IF (t) -%]<span>Philippines</span>[%- ELSE -%][%- 'Pilipinas' -%][%- END -%] >+ [%- CASE 'PK' -%][%- IF (t) -%]<span>Pakistan</span>[%- ELSE -%][%- 'پاÙستاÙ' -%][%- END -%] >+ [%- CASE 'PL' -%][%- IF (t) -%]<span>Poland</span>[%- ELSE -%][%- 'Polska' -%][%- END -%] >+ [%- CASE 'PT' -%][%- IF (t) -%]<span>Portugal</span>[%- ELSE -%][%- 'Portugal' -%][%- END -%] >+ [%- CASE 'RO' -%][%- IF (t) -%]<span>Romania</span>[%- ELSE -%][%- 'România' -%][%- END -%] >+ [%- CASE 'RU' -%][%- IF (t) -%]<span>Russia</span>[%- ELSE -%][%- 'РоÑÑиÑ' -%][%- END -%] >+ [%- CASE 'RW' -%][%- IF (t) -%]<span>Rwanda</span>[%- ELSE -%][%- 'Rwanda' -%][%- END -%] >+ [%- CASE 'SE' -%][%- IF (t) -%]<span>Sweden</span>[%- ELSE -%][%- 'Sverige' -%][%- END -%] >+ [%- CASE 'SI' -%][%- IF (t) -%]<span>Slovenia</span>[%- ELSE -%][%- 'Slovenija' -%][%- END -%] >+ [%- CASE 'SK' -%][%- IF (t) -%]<span>Slovakia</span>[%- ELSE -%][%- 'Slovensko' -%][%- END -%] >+ [%- CASE 'TH' -%][%- IF (t) -%]<span>Thailand</span>[%- ELSE -%][%- 'à¸à¸£à¸°à¹à¸à¸¨à¹à¸à¸¢' -%][%- END -%] >+ [%- CASE 'TR' -%][%- IF (t) -%]<span>Turkey</span>[%- ELSE -%][%- 'Türkiye' -%][%- END -%] >+ [%- CASE 'TW' -%][%- IF (t) -%]<span>Taiwan</span>[%- ELSE -%][%- 'å°ç£' -%][%- END -%] >+ [%- CASE 'UA' -%][%- IF (t) -%]<span>Ukraine</span>[%- ELSE -%][%- 'УкÑаÑна' -%][%- END -%] >+ [%- CASE 'US' -%][%- IF (t) -%]<span>United States</span>[%- ELSE -%][%- 'United States' -%][%- END -%] >+ [%- CASE 'VN' -%][%- IF (t) -%]<span>Vietnam</span>[%- ELSE -%][%- 'Viá»t Nam' -%][%- END -%] >+ [%- CASE -%][%- region -%] >+[%- END -%] >+[%- END -%] >+ >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 7e55007..0dbcbb4 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc >@@ -37,18 +37,18 @@ > <div class="navbar-inner"> > <ul id="i18nMenu" class="nav"> > <li><p class="lang navbar-text"><strong>Languages: </strong></p></li> >- [% FOREACH languages_loo IN languages_loop %] >+ [% FOREACH languages_loo IN languages_loop.sort('rfc4646_subtag') %] > [% IF ( languages_loo.group_enabled ) %] > [% IF ( languages_loo.plural ) %] > <li class="dropdown"> >- <a data-toggle="dropdown" class="dropdown-toggle sublangs" id="show[% languages_loo.rfc4646_subtag %]" href="#">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description %][% ELSE %][% languages_loo.rfc4646_subtag %][% END %] <b class="caret"></b></a> >+ <a data-toggle="dropdown" class="dropdown-toggle sublangs" id="show[% languages_loo.rfc4646_subtag %]" href="#">[% INCLUDE native_description subtag = languages_loo.rfc4646_subtag %]<b class="caret"></b></a> > <ul id="sub[% languages_loo.rfc4646_subtag %]" class="dropdown-menu"> >- [% FOREACH sublanguages_loo IN languages_loo.sublanguages_loop %] >+ [% FOREACH sublanguages_loo IN languages_loo.sublanguages_loop.sort('rfc4646_subtag') %] > [% IF ( sublanguages_loo.enabled ) %] > [% IF ( sublanguages_loo.sublanguage_current ) %] >- <li> <p>[% sublanguages_loo.native_description %] [% sublanguages_loo.script_description %] [% sublanguages_loo.region_description %] [% sublanguages_loo.variant_description %] ([% sublanguages_loo.rfc4646_subtag %])</p></li> >+ <li> <p>[% INCLUDE region_description subtag = sublanguages_loo.rfc4646_subtag %] ([% sublanguages_loo.rfc4646_subtag %])</p></li> > [% ELSE %] >- <li><a href="/cgi-bin/koha/opac-changelanguage.pl?language=[% sublanguages_loo.rfc4646_subtag %]"> [% sublanguages_loo.native_description %] [% sublanguages_loo.script_description %] [% sublanguages_loo.region_description %] [% sublanguages_loo.variant_description %] ([% sublanguages_loo.rfc4646_subtag %])</a></li> >+ <li><a href="/cgi-bin/koha/opac-changelanguage.pl?language=[% sublanguages_loo.rfc4646_subtag %]"> [% INCLUDE region_description subtag = sublanguages_loo.rfc4646_subtag %] ([% sublanguages_loo.rfc4646_subtag %])</a></li> > [% END %] > [% END # / IF sublanguages_loo.enabled %] > [% END # / FOREACH sublanguages_loo %] >@@ -57,9 +57,9 @@ > [% ELSE %] > [% IF ( languages_loo.group_enabled ) %] > [% IF ( languages_loo.current ) %] >- <li class="active"><p class="navbar-text">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description %][% ELSE %][% languages_loo.rfc4646_subtag %][% END %]</p></li> >+ <li class="active"><p class="navbar-text">[% INCLUDE native_description subtag = languages_loo.rfc4646_subtag %]</p></li> > [% ELSE %] >- <li><a href="/cgi-bin/koha/opac-changelanguage.pl?language=[% languages_loo.rfc4646_subtag %]">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description %][% ELSE %][% languages_loo.rfc4646_subtag %][% END %]</a></li> >+ <li><a href="/cgi-bin/koha/opac-changelanguage.pl?language=[% languages_loo.rfc4646_subtag %]">[% INCLUDE native_description subtag = languages_loo.rfc4646_subtag %]</a></li> > [% END %] > [% END # / IF languages_loo.current %] > [% END # / IF ( languages_loo.plural ) %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt >index c55eccc..00985b6 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt >@@ -175,13 +175,13 @@ > <label for="language-limit">Language: </label> > <select id="language-limit" name="limit"> > <option value="">No limit</option> >- [% FOREACH search_languages_loo IN search_languages_loop %] >- [% IF ( search_languages_loo.selected ) %] >- <option value="ln,rtrn:[% search_languages_loo.iso639_2_code %]" selected="selected">[% search_languages_loo.language_description %]</option> >- [% ELSE %] >- <option value="ln,rtrn:[% search_languages_loo.iso639_2_code %]">[% search_languages_loo.language_description %]</option> >- [% END %] >- [% END %] >+ [% PROCESS get_language_codes %] >+ [% FOREACH language_code IN language_codes %] >+ <option value="ln,rtrn:[%- INCLUDE language_descriptions code = language_code i = 1 -%]"> >+ [%- INCLUDE language_descriptions code = language_code -%] >+ ([%- INCLUDE language_descriptions code = language_code t = 1 -%]) >+ </option> >+ [% END %] > </select> > </p> > <!-- /LANGUAGE LIMIT --> >@@ -392,4 +392,4 @@ > }); > //]]> > </script> >-[% END %] >\ No newline at end of file >+[% END %] >diff --git a/koha-tmpl/opac-tmpl/ccsr/en/includes/doc-head-close.inc b/koha-tmpl/opac-tmpl/ccsr/en/includes/doc-head-close.inc >index af6e886..647c266 100644 >--- a/koha-tmpl/opac-tmpl/ccsr/en/includes/doc-head-close.inc >+++ b/koha-tmpl/opac-tmpl/ccsr/en/includes/doc-head-close.inc >@@ -5,6 +5,9 @@ > <link rel="stylesheet" type="text/css" href="[% themelang %]/lib/jquery/jquery-ui.css" /> > <link rel="stylesheet" type="text/css" href="/opac-tmpl/lib/yui/reset-fonts-grids.css" /> > <link rel="stylesheet" type="text/css" href="/opac-tmpl/lib/yui/skin.css" /> >+ >+[% PROCESS 'languages.inc' %] >+ > [% SET opaclayoutstylesheet='opac.css' UNLESS opaclayoutstylesheet %] > [% IF (opaclayoutstylesheet.match('^https?:|^\/')) %] > <link rel="stylesheet" type="text/css" href="[% opaclayoutstylesheet %]" /> >diff --git a/koha-tmpl/opac-tmpl/ccsr/en/includes/opac-bottom.inc b/koha-tmpl/opac-tmpl/ccsr/en/includes/opac-bottom.inc >index 3f8bf66..7b56e18 100644 >--- a/koha-tmpl/opac-tmpl/ccsr/en/includes/opac-bottom.inc >+++ b/koha-tmpl/opac-tmpl/ccsr/en/includes/opac-bottom.inc >@@ -41,20 +41,27 @@ > <div id="changelanguage" class="ft"> > <div class="lang" style="float:left;padding: 0.1em 0;"><strong>Languages: </strong></div> > <ul id="i18nMenu" class="footermenu"> >- [% FOREACH languages_loo IN languages_loop %] >+ [% FOREACH languages_loo IN languages_loop.sort('rfc4646_subtag') %] > > [% IF ( languages_loo.group_enabled ) %] > [% IF ( languages_loo.plural ) %] >- <li class="more" style="float:left;"><a class="sublangs" id="show[% languages_loo.rfc4646_subtag %]" href="#">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description %][% ELSE %][% languages_loo.rfc4646_subtag %][% END %]</a><div id="sub[% languages_loo.rfc4646_subtag %]"> >+ <li class="more" style="float:left;"><a class="sublangs" id="show[% languages_loo.rfc4646_subtag %]" href="#">[% PROCESS native_description subtag = languages_loo.rfc4646_subtag %]</a><div id="sub[% languages_loo.rfc4646_subtag %]"> > <div class="bd"><ul> >- [% FOREACH sublanguages_loo IN languages_loo.sublanguages_loop %] >- [% IF ( sublanguages_loo.enabled ) %] >+ [% FOREACH sublanguages_loo IN languages_loo.sublanguages_loop.sort('rfc4646_subtag') %] >+ [% IF ( sublanguages_loo.enabled ) %] > [% IF ( sublanguages_loo.sublanguage_current ) %] >- <li> [% sublanguages_loo.native_description %] [% sublanguages_loo.script_description %] [% sublanguages_loo.region_description %] [% sublanguages_loo.variant_description %] ([% sublanguages_loo.rfc4646_subtag %])</li> >+ <li> >+ [% PROCESS region_description subtag = sublanguages_loo.rfc4646_subtag %] >+ ([% sublanguages_loo.rfc4646_subtag %]) >+ </li> > [% ELSE %] >- <li><a href="/cgi-bin/koha/opac-changelanguage.pl?language=[% sublanguages_loo.rfc4646_subtag %]"> [% sublanguages_loo.native_description %] [% sublanguages_loo.script_description %] [% sublanguages_loo.region_description %] [% sublanguages_loo.variant_description %] ([% sublanguages_loo.rfc4646_subtag %])</a></li> >- [% END %] >+ <li> >+ <a href="/cgi-bin/koha/opac-changelanguage.pl?language=[% sublanguages_loo.rfc4646_subtag %]"> >+ [% PROCESS region_description subtag = sublanguages_loo.rfc4646_subtag %] >+ ([% sublanguages_loo.rfc4646_subtag %])</a> >+ </li> > [% END %] >+ [% END %] > > [% END %] > </ul></div></div></li> >@@ -62,9 +69,15 @@ > [% ELSE %] > [% IF ( languages_loo.group_enabled ) %] > [% IF ( languages_loo.current ) %] >- <li style="float:left;">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description %][% ELSE %][% languages_loo.rfc4646_subtag %][% END %]</li> >+ <li style="float:left;"> >+ [% PROCESS native_description subtag = languages_loo.rfc4646_subtag %] >+ </li> > [% ELSE %] >- <li style="float:left;"><a href="/cgi-bin/koha/opac-changelanguage.pl?language=[% languages_loo.rfc4646_subtag %]">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description %][% ELSE %][% languages_loo.rfc4646_subtag %][% END %]</a></li> >+ <li style="float:left;"> >+ <a href="/cgi-bin/koha/opac-changelanguage.pl?language=[% languages_loo.rfc4646_subtag %]"> >+ [% PROCESS native_description subtag = languages_loo.rfc4646_subtag %] >+ </a> >+ </li> > [% END %] > [% END %] > [% END %] >diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc >index 66666f4..3b9d77d 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc >+++ b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc >@@ -9,6 +9,9 @@ > [% ELSE %] > <link rel="stylesheet" type="text/css" href="[% themelang %]/css/[% opaclayoutstylesheet %]" /> > [% END %] >+ >+[% PROCESS 'languages.inc' %] >+ > [% IF ( opaccolorstylesheet ) %] > [% IF (opaccolorstylesheet.match('^https?:|^\/')) %] > <link rel="stylesheet" type="text/css" href="[% opaccolorstylesheet %]" /> >diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/languages.inc b/koha-tmpl/opac-tmpl/prog/en/includes/languages.inc >new file mode 100644 >index 0000000..fc3c287 >--- /dev/null >+++ b/koha-tmpl/opac-tmpl/prog/en/includes/languages.inc >@@ -0,0 +1,196 @@ >+[%# "WARNING: This file must be replicated on 'include' dir" %] >+[%# "for each staff/opac theme" %] >+ >+[%- BLOCK split_subtag -%] >+[%- IF ( matches = subtag.match('^(\w+)$')) -%] >+ [%- SET lang = subtag -%] >+ [%- SET script = '' -%] >+ [%- IF ( lang == 'en' ) -%] >+ [%- SET region = 'US' -%] >+ [%- ELSE -%] >+ [%- SET region = '' -%] >+ [%- END -%] >+[%- ELSIF ( matches = subtag.match('^(\w+)-(\w+)$')) -%] >+ [%- SET lang = matches.0 -%] >+ [%- IF matches.1.length == 4 -%] >+ [%- SET script = matches.1 -%] >+ [%- SET region = '' -%] >+ [%- ELSE -%] >+ [%- SET script = '' -%] >+ [%- SET region = matches.1 -%] >+ [%- END -%] >+[%- ELSIF ( matches = subtag.match('^(\w+)-(\w+)-(\w+)$')) -%] >+ [%- SET lang = matches.0 -%] >+ [%- SET script = matches.1 -%] >+ [%- SET region = matches.2 -%] >+[%- END -%] >+[%- END -%] >+ >+[%- BLOCK native_description -%] >+[%- PROCESS split_subtag subtag = subtag -%] >+[%- PROCESS language_descriptions code = lang -%] >+[%- END -%] >+ >+[%- BLOCK script_description -%] >+[%- PROCESS split_subtag subtag = subtag -%] >+[%- PROCESS script_descriptions code = script -%] >+[%- END -%] >+ >+[%- BLOCK region_description -%] >+[%- PROCESS split_subtag subtag = subtag -%] >+[%- PROCESS region_descriptions code = region -%] >+[%- END -%] >+ >+[%# Update language_descriptions when modifying language_codes %] >+[%- BLOCK get_language_codes -%] >+[%- language_codes = ['am', 'ar', 'az', 'be', 'ben', 'bg', 'ca', 'cs', >+'da', 'de', 'el', 'en', 'es', 'eu', 'fa', 'fi', 'fo', 'fr', >+'gl', 'he', 'hi', 'hr', 'hu', 'hy', 'id', 'is', 'it', 'ja', >+'kn', 'ko', 'ku', 'lo', 'mi', 'mon', 'mr', 'ms', 'nb', 'ne', >+'nl', 'nn', 'pbr', 'pl', 'prs', 'pt', 'ro', 'ru', 'rw', 'sd', >+'sk', 'sl', 'sq', 'sr', 'sv', 'sw', 'ta', 'tet', 'th', 'tl', >+'tr', 'uk', 'ur', 'vi', 'zh'] -%] >+[%- END -%] >+ >+[%# Update language_codes when modifying language_descriptions %] >+[%# (i=1) for iso639-2 code, (t=1) fortname %] >+[%- BLOCK language_descriptions -%] >+[%- SWITCH code -%] >+ [%- CASE 'am' -%][%- IF (i) -%][%- 'amh' -%][%- ELSIF (t) -%]<span>Amharic</span>[%- ELSE -%][%- "á£ááá" -%][%- END -%] >+ [%- CASE 'ar' -%][%- IF (i) -%][%- 'ara' -%][%- ELSIF (t) -%]<span>Arabic</span>[%- ELSE -%][%- "ÙعربÙØ©" -%][%- END -%] >+ [%- CASE 'az' -%][%- IF (i) -%][%- 'aze' -%][%- ELSIF (t) -%]<span>Azerbaijani</span>[%- ELSE -%][%- "AzÉrbaycan dili" -%][%- END -%] >+ [%- CASE 'be' -%][%- IF (i) -%][%- 'bel' -%][%- ELSIF (t) -%]<span>Byelorussian</span>[%- ELSE -%][%- "ÐелаÑÑÑÐºÐ°Ñ Ð¼Ð¾Ð²Ð°" -%][%- END -%] >+ [%- CASE 'ben' -%][%- IF (i) -%][%- 'ben' -%][%- ELSIF (t) -%]<span>Bengali</span>[%- ELSE -%][%- "বাà¦à¦²à¦¾" -%][%- END -%] >+ [%- CASE 'bg' -%][%- IF (i) -%][%- 'bul' -%][%- ELSIF (t) -%]<span>Bulgarian</span>[%- ELSE -%][%- "ÐÑлгаÑÑки" -%][%- END -%] >+ [%- CASE 'ca' -%][%- IF (i) -%][%- 'cat' -%][%- ELSIF (t) -%]<span>Catalan</span>[%- ELSE -%][%- "Català " -%][%- END -%] >+ [%- CASE 'cs' -%][%- IF (i) -%][%- 'ces' -%][%- ELSIF (t) -%]<span>Czech</span>[%- ELSE -%][%- "CeÅ¡tina" -%][%- END -%] >+ [%- CASE 'da' -%][%- IF (i) -%][%- 'dan' -%][%- ELSIF (t) -%]<span>Danish</span>[%- ELSE -%][%- "Dansk" -%][%- END -%] >+ [%- CASE 'de' -%][%- IF (i) -%][%- 'ger' -%][%- ELSIF (t) -%]<span>German</span>[%- ELSE -%][%- "Deutsch" -%][%- END -%] >+ [%- CASE 'el' -%][%- IF (i) -%][%- 'gre' -%][%- ELSIF (t) -%]<span>Greek</span>[%- ELSE -%][%- "ελληνικά" -%][%- END -%] >+ [%- CASE 'en' -%][%- IF (i) -%][%- 'eng' -%][%- ELSIF (t) -%]<span>English</span>[%- ELSE -%][%- "English" -%][%- END -%] >+ [%- CASE 'es' -%][%- IF (i) -%][%- 'spa' -%][%- ELSIF (t) -%]<span>Spanish</span>[%- ELSE -%][%- "Español" -%][%- END -%] >+ [%- CASE 'eu' -%][%- IF (i) -%][%- 'baq' -%][%- ELSIF (t) -%]<span>Basque</span>[%- ELSE -%][%- "Euskara" -%][%- END -%] >+ [%- CASE 'fa' -%][%- IF (i) -%][%- 'per' -%][%- ELSIF (t) -%]<span>Persian</span>[%- ELSE -%][%- "ÙارسÙ" -%][%- END -%] >+ [%- CASE 'fi' -%][%- IF (i) -%][%- 'fin' -%][%- ELSIF (t) -%]<span>Finnish</span>[%- ELSE -%][%- "Suomi" -%][%- END -%] >+ [%- CASE 'fo' -%][%- IF (i) -%][%- 'fao' -%][%- ELSIF (t) -%]<span>Faroese</span>[%- ELSE -%][%- "Føroyskt" -%][%- END -%] >+ [%- CASE 'fr' -%][%- IF (i) -%][%- 'fre' -%][%- ELSIF (t) -%]<span>French</span>[%- ELSE -%][%- "Français" -%][%- END -%] >+ [%- CASE 'gl' -%][%- IF (i) -%][%- 'glg' -%][%- ELSIF (t) -%]<span>Galician</span>[%- ELSE -%][%- "Galego" -%][%- END -%] >+ [%- CASE 'he' -%][%- IF (i) -%][%- 'heb' -%][%- ELSIF (t) -%]<span>Hebrew</span>[%- ELSE -%][%- "×¢Ö´×ְרִ×ת" -%][%- END -%] >+ [%- CASE 'hi' -%][%- IF (i) -%][%- 'hin' -%][%- ELSIF (t) -%]<span>Hindi</span>[%- ELSE -%][%- "हिनà¥à¤¦à¥" -%][%- END -%] >+ [%- CASE 'hr' -%][%- IF (i) -%][%- 'hrv' -%][%- ELSIF (t) -%]<span>Croatian</span>[%- ELSE -%][%- "Hrvatski" -%][%- END -%] >+ [%- CASE 'hu' -%][%- IF (i) -%][%- 'hun' -%][%- ELSIF (t) -%]<span>Hungarian</span>[%- ELSE -%][%- "Magyar" -%][%- END -%] >+ [%- CASE 'hy' -%][%- IF (i) -%][%- 'arm' -%][%- ELSIF (t) -%]<span>Armenian</span>[%- ELSE -%][%- "ÕÕ¡ÕµÕ¥ÖÕ§Õ¶" -%][%- END -%] >+ [%- CASE 'id' -%][%- IF (i) -%][%- 'ind' -%][%- ELSIF (t) -%]<span>Indonesian</span>[%- ELSE -%][%- "Bahasa Indonesia" -%][%- END -%] >+ [%- CASE 'is' -%][%- IF (i) -%][%- 'ice' -%][%- ELSIF (t) -%]<span>Icelandic</span>[%- ELSE -%][%- "Ãslenska" -%][%- END -%] >+ [%- CASE 'it' -%][%- IF (i) -%][%- 'ita' -%][%- ELSIF (t) -%]<span>Italian</span>[%- ELSE -%][%- "Italiano" -%][%- END -%] >+ [%- CASE 'ja' -%][%- IF (i) -%][%- 'jpn' -%][%- ELSIF (t) -%]<span>Japanese</span>[%- ELSE -%][%- "æ¥æ¬èª" -%][%- END -%] >+ [%- CASE 'kn' -%][%- IF (i) -%][%- 'kan' -%][%- ELSIF (t) -%]<span>Kannada</span>[%- ELSE -%][%- "à²à²¨à³à²¨à²¡" -%][%- END -%] >+ [%- CASE 'ko' -%][%- IF (i) -%][%- 'kor' -%][%- ELSIF (t) -%]<span>Korean</span>[%- ELSE -%][%- "íêµì´" -%][%- END -%] >+ [%- CASE 'ku' -%][%- IF (i) -%][%- 'kur' -%][%- ELSIF (t) -%]<span>Kurdish</span>[%- ELSE -%][%- "Ú©ÙردÛ" -%][%- END -%] >+ [%- CASE 'lo' -%][%- IF (i) -%][%- 'lao' -%][%- ELSIF (t) -%]<span>Lao</span>[%- ELSE -%][%- "àºàº²àºªàº²àº¥àº²àº§" -%][%- END -%] >+ [%- CASE 'mi' -%][%- IF (i) -%][%- 'mao' -%][%- ELSIF (t) -%]<span>Maori</span>[%- ELSE -%][%- "Te Reo MÄori" -%][%- END -%] >+ [%- CASE 'mon' -%][%- IF (i) -%][%- 'mon' -%][%- ELSIF (t) -%]<span>Mongolian</span>[%- ELSE -%][%- "Mонгол" -%][%- END -%] >+ [%- CASE 'mr' -%][%- IF (i) -%][%- 'mar' -%][%- ELSIF (t) -%]<span>Marathi</span>[%- ELSE -%][%- "मराठà¥" -%][%- END -%] >+ [%- CASE 'ms' -%][%- IF (i) -%][%- 'may' -%][%- ELSIF (t) -%]<span>Malay</span>[%- ELSE -%][%- "Bahasa melayu" -%][%- END -%] >+ [%- CASE 'nb' -%][%- IF (i) -%][%- 'nob' -%][%- ELSIF (t) -%]<span>Norwegian bokmÃ¥l</span>[%- ELSE -%][%- "Norsk bokmÃ¥l" -%][%- END -%] >+ [%- CASE 'ne' -%][%- IF (i) -%][%- 'nep' -%][%- ELSIF (t) -%]<span>Nepali</span>[%- ELSE -%][%- "नà¥à¤ªà¤¾à¤²à¥" -%][%- END -%] >+ [%- CASE 'nl' -%][%- IF (i) -%][%- 'dut' -%][%- ELSIF (t) -%]<span>Dutch</span>[%- ELSE -%][%- "Nederlands" -%][%- END -%] >+ [%- CASE 'nn' -%][%- IF (i) -%][%- 'nno' -%][%- ELSIF (t) -%]<span>Norwegian nynorsk</span>[%- ELSE -%][%- "Norsk nynorsk" -%][%- END -%] >+ [%- CASE 'pbr' -%][%- IF (i) -%][%- 'pbr' -%][%- ELSIF (t) -%]<span>Pangwa</span>[%- ELSE -%][%- "Ekipangwa" -%][%- END -%] >+ [%- CASE 'pl' -%][%- IF (i) -%][%- 'pol' -%][%- ELSIF (t) -%]<span>Polish</span>[%- ELSE -%][%- "Polski" -%][%- END -%] >+ [%- CASE 'prs' -%][%- IF (i) -%][%- 'prs' -%][%- ELSIF (t) -%]<span>Dari</span>[%- ELSE -%][%- "درÙ" -%][%- END -%] >+ [%- CASE 'pt' -%][%- IF (i) -%][%- 'por' -%][%- ELSIF (t) -%]<span>Portuguese</span>[%- ELSE -%][%- "Português" -%][%- END -%] >+ [%- CASE 'ro' -%][%- IF (i) -%][%- 'rum' -%][%- ELSIF (t) -%]<span>Romanian</span>[%- ELSE -%][%- "Român" -%][%- END -%] >+ [%- CASE 'ru' -%][%- IF (i) -%][%- 'rus' -%][%- ELSIF (t) -%]<span>Russian</span>[%- ELSE -%][%- "Ð ÑÑÑкий ÑзÑк" -%][%- END -%] >+ [%- CASE 'rw' -%][%- IF (i) -%][%- 'kin' -%][%- ELSIF (t) -%]<span>Kinyarwanda</span>[%- ELSE -%][%- "Ikinyarwanda" -%][%- END -%] >+ [%- CASE 'sd' -%][%- IF (i) -%][%- 'snd' -%][%- ELSIF (t) -%]<span>Sindhi</span>[%- ELSE -%][%- "سÙÚÙ" -%][%- END -%] >+ [%- CASE 'sk' -%][%- IF (i) -%][%- 'slo' -%][%- ELSIF (t) -%]<span>Slovak</span>[%- ELSE -%][%- "SlovenÄina" -%][%- END -%] >+ [%- CASE 'sl' -%][%- IF (i) -%][%- 'slv' -%][%- ELSIF (t) -%]<span>Slovenian</span>[%- ELSE -%][%- "SlovenÅ¡Äina" -%][%- END -%] >+ [%- CASE 'sq' -%][%- IF (i) -%][%- 'alb' -%][%- ELSIF (t) -%]<span>Albanian</span>[%- ELSE -%][%- "Shqip" -%][%- END -%] >+ [%- CASE 'sr' -%][%- IF (i) -%][%- 'srp' -%][%- ELSIF (t) -%]<span>Serbian</span>[%- ELSE -%][%- "CÑпÑки" -%][%- END -%] >+ [%- CASE 'sv' -%][%- IF (i) -%][%- 'swe' -%][%- ELSIF (t) -%]<span>Swedish</span>[%- ELSE -%][%- "Svenska" -%][%- END -%] >+ [%- CASE 'sw' -%][%- IF (i) -%][%- 'swa' -%][%- ELSIF (t) -%]<span>Swahili</span>[%- ELSE -%][%- "Kiswahili" -%][%- END -%] >+ [%- CASE 'ta' -%][%- IF (i) -%][%- 'tam' -%][%- ELSIF (t) -%]<span>Tamil</span>[%- ELSE -%][%- "தமிழà¯" -%][%- END -%] >+ [%- CASE 'tet' -%][%- IF (i) -%][%- 'tet' -%][%- ELSIF (t) -%]<span>Tetum</span>[%- ELSE -%][%- "Tetun" -%][%- END -%] >+ [%- CASE 'th' -%][%- IF (i) -%][%- 'tha' -%][%- ELSIF (t) -%]<span>Thai</span>[%- ELSE -%][%- "ภาษาà¹à¸à¸¢" -%][%- END -%] >+ [%- CASE 'tl' -%][%- IF (i) -%][%- 'tgl' -%][%- ELSIF (t) -%]<span>Tagalog</span>[%- ELSE -%][%- "Tagalog" -%][%- END -%] >+ [%- CASE 'tr' -%][%- IF (i) -%][%- 'tur' -%][%- ELSIF (t) -%]<span>Turkish</span>[%- ELSE -%][%- "Türkçe" -%][%- END -%] >+ [%- CASE 'uk' -%][%- IF (i) -%][%- 'ukr' -%][%- ELSIF (t) -%]<span>Ukranian</span>[%- ELSE -%][%- "УкÑаÑнÑÑка" -%][%- END -%] >+ [%- CASE 'ur' -%][%- IF (i) -%][%- 'urd' -%][%- ELSIF (t) -%]<span>Urdu</span>[%- ELSE -%][%- "اردÙ" -%][%- END -%] >+ [%- CASE 'vi' -%][%- IF (i) -%][%- 'vie' -%][%- ELSIF (t) -%]<span>Vietnamese</span>[%- ELSE -%][%- "ãè¶" -%][%- END -%] >+ [%- CASE 'zh' -%][%- IF (i) -%][%- 'chi' -%][%- ELSIF (t) -%]<span>Chinese</span>[%- ELSE -%][%- "ä¸æ" -%][%- END -%] >+ [%- CASE -%][%- lang -%] >+[%- END -%] >+[%- END -%] >+ >+[%- BLOCK script_descriptions -%] >+[%- SWITCH code -%] >+ [%- CASE 'Arab' -%][%- IF (t) %]<span>Arabic</span>[%- ELSE -%][%- "اÙعربÙØ©" -%][%- END -%] >+ [%- CASE 'Armn' -%][%- IF (t) %]<span>Armenian</span>[%- ELSE -%][%- "ÕÕ¡ÕµÕ¸Ö Õ¡ÕµÕ¢Õ¸ÖÕ¢Õ¥Õ¶" -%][%- END -%] >+ [%- CASE 'Cyrl' -%][%- IF (t) %]<span>Cyrillic</span>[%- ELSE -%][%- "ÐиÑилиÑа" -%][%- END -%] >+ [%- CASE 'Ethi' -%][%- IF (t) %]<span>Ethiopic</span>[%- ELSE -%][%- "ááá" -%][%- END -%] >+ [%- CASE 'Grek' -%][%- IF (t) %]<span>Greek</span>[%- ELSE -%][%- "ÎÎ»Î»Î·Î½Î¹ÎºÏ Î±Î»ÏάβηÏο" -%][%- END -%] >+ [%- CASE 'Hans' -%][%- IF (t) %]<span>Han (Simplified)</span>[%- ELSE -%][%- "ç®ä½å" -%][%- END -%] >+ [%- CASE 'Hant' -%][%- IF (t) %]<span>Han (Traditional)</span>[%- ELSE -%][%- "ç¹é«å" -%][%- END -%] >+ [%- CASE 'Hebr' -%][%- IF (t) %]<span>Hebrew</span>[%- ELSE -%][%- "×Ö¸×ֶף־×ÖµÖ¼×ת ×¢Ö´×ְרִ×" -%][%- END -%] >+ [%- CASE 'Jpan' -%][%- IF (t) %]<span>Japanese</span>[%- ELSE -%][%- "æ¼¢å/ã²ãããª/ã«ã¿ã«ã" -%][%- END -%] >+ [%- CASE 'Knda' -%][%- IF (t) %]<span>Kannada</span>[%- ELSE -%][%- "à²à²¨à³à²¨à²¡ ಲಿಪಿ" -%][%- END -%] >+ [%- CASE 'Kore' -%][%- IF (t) %]<span>Korean</span>[%- ELSE -%][%- "íê¸" -%][%- END -%] >+ [%- CASE 'Laoo' -%][%- IF (t) %]<span>Lao</span>[%- ELSE -%][%- "àºàº±àºàºªàºàºàº¥àº²àº§" -%][%- END -%] >+ [%- CASE -%][%- script -%] >+[%- END -%] >+[%- END -%] >+ >+[%- BLOCK region_descriptions -%] >+[%- SWITCH code -%] >+ [%- CASE 'AL' -%][%- IF (t) -%]<span>Albania</span>[%- ELSE -%][%- 'Shqipërisë' -%][%- END -%] >+ [%- CASE 'AZ' -%][%- IF (t) -%]<span>Azerbaijan</span>[%- ELSE -%][%- 'AzÉrbaycan' -%][%- END -%] >+ [%- CASE 'BE' -%][%- IF (t) -%]<span>Belgium</span>[%- ELSE -%][%- 'België' -%][%- END -%] >+ [%- CASE 'BR' -%][%- IF (t) -%]<span>Brazil</span>[%- ELSE -%][%- 'Brasil' -%][%- END -%] >+ [%- CASE 'BY' -%][%- IF (t) -%]<span>Belarus</span>[%- ELSE -%][%- 'ÐелаÑÑÑÑ' -%][%- END -%] >+ [%- CASE 'CA' -%][%- IF (t) -%]<span>Canada</span>[%- ELSE -%][%- 'Canada' -%][%- END -%] >+ [%- CASE 'CH' -%][%- IF (t) -%]<span>Switzerland</span>[%- ELSE -%][%- 'Schweiz' -%][%- END -%] >+ [%- CASE 'CN' -%][%- IF (t) -%]<span>China</span>[%- ELSE -%][%- 'ä¸å½' -%][%- END -%] >+ [%- CASE 'CZ' -%][%- IF (t) -%]<span>Czech Republic</span>[%- ELSE -%][%- 'Äeská republika' -%][%- END -%] >+ [%- CASE 'DE' -%][%- IF (t) -%]<span>Germany</span>[%- ELSE -%][%- 'Deutschland' -%][%- END -%] >+ [%- CASE 'DK' -%][%- IF (t) -%]<span>Denmark</span>[%- ELSE -%][%- 'Danmark' -%][%- END -%] >+ [%- CASE 'ES' -%][%- IF (t) -%]<span>Spain</span>[%- ELSE -%][%- 'España' -%][%- END -%] >+ [%- CASE 'FI' -%][%- IF (t) -%]<span>Finland</span>[%- ELSE -%][%- 'Suomi' -%][%- END -%] >+ [%- CASE 'FO' -%][%- IF (t) -%]<span>Faroe Islands</span>[%- ELSE -%][%- 'Føroyar' -%][%- END -%] >+ [%- CASE 'FR' -%][%- IF (t) -%]<span>France</span>[%- ELSE -%][%- 'France' -%][%- END -%] >+ [%- CASE 'GB' -%][%- IF (t) -%]<span>United Kingdom</span>[%- ELSE -%][%- 'United Kingdom' -%][%- END -%] >+ [%- CASE 'GR' -%][%- IF (t) -%]<span>Greece</span>[%- ELSE -%][%- 'Îλλάδα' -%][%- END -%] >+ [%- CASE 'HR' -%][%- IF (t) -%]<span>Croatia</span>[%- ELSE -%][%- 'Hrvatska' -%][%- END -%] >+ [%- CASE 'HU' -%][%- IF (t) -%]<span>Hungary</span>[%- ELSE -%][%- 'Magyarország' -%][%- END -%] >+ [%- CASE 'ID' -%][%- IF (t) -%]<span>Indonesia</span>[%- ELSE -%][%- 'Indonesia' -%][%- END -%] >+ [%- CASE 'IS' -%][%- IF (t) -%]<span>Iceland</span>[%- ELSE -%][%- 'Ãsland' -%][%- END -%] >+ [%- CASE 'IT' -%][%- IF (t) -%]<span>Italy</span>[%- ELSE -%][%- 'Italia' -%][%- END -%] >+ [%- CASE 'JP' -%][%- IF (t) -%]<span>Japan</span>[%- ELSE -%][%- 'æ¥æ¬' -%][%- END -%] >+ [%- CASE 'KE' -%][%- IF (t) -%]<span>Kenya</span>[%- ELSE -%][%- 'Kenya' -%][%- END -%] >+ [%- CASE 'KP' -%][%- IF (t) -%]<span>North Korea</span>[%- ELSE -%][%- 'ì¡°ì 민주주ìì¸ë¯¼ê³µíêµ' -%][%- END -%] >+ [%- CASE 'LK' -%][%- IF (t) -%]<span>Sri Lanka</span>[%- ELSE -%][%- 'à®à®²à®à¯à®à¯' -%][%- END -%] >+ [%- CASE 'MY' -%][%- IF (t) -%]<span>Malaysia</span>[%- ELSE -%][%- 'Malaysia' -%][%- END -%] >+ [%- CASE 'NE' -%][%- IF (t) -%]<span>Niger</span>[%- ELSE -%][%- 'Niger' -%][%- END -%] >+ [%- CASE 'NL' -%][%- IF (t) -%]<span>Netherlands</span>[%- ELSE -%][%- 'Nederland' -%][%- END -%] >+ [%- CASE 'NO' -%][%- IF (t) -%]<span>Norway</span>[%- ELSE -%][%- 'Noreg' -%][%- END -%] >+ [%- CASE 'NZ' -%][%- IF (t) -%]<span>New Zealand</span>[%- ELSE -%][%- 'New Zealand' -%][%- END -%] >+ [%- CASE 'PH' -%][%- IF (t) -%]<span>Philippines</span>[%- ELSE -%][%- 'Pilipinas' -%][%- END -%] >+ [%- CASE 'PK' -%][%- IF (t) -%]<span>Pakistan</span>[%- ELSE -%][%- 'پاÙستاÙ' -%][%- END -%] >+ [%- CASE 'PL' -%][%- IF (t) -%]<span>Poland</span>[%- ELSE -%][%- 'Polska' -%][%- END -%] >+ [%- CASE 'PT' -%][%- IF (t) -%]<span>Portugal</span>[%- ELSE -%][%- 'Portugal' -%][%- END -%] >+ [%- CASE 'RO' -%][%- IF (t) -%]<span>Romania</span>[%- ELSE -%][%- 'România' -%][%- END -%] >+ [%- CASE 'RU' -%][%- IF (t) -%]<span>Russia</span>[%- ELSE -%][%- 'РоÑÑиÑ' -%][%- END -%] >+ [%- CASE 'RW' -%][%- IF (t) -%]<span>Rwanda</span>[%- ELSE -%][%- 'Rwanda' -%][%- END -%] >+ [%- CASE 'SE' -%][%- IF (t) -%]<span>Sweden</span>[%- ELSE -%][%- 'Sverige' -%][%- END -%] >+ [%- CASE 'SI' -%][%- IF (t) -%]<span>Slovenia</span>[%- ELSE -%][%- 'Slovenija' -%][%- END -%] >+ [%- CASE 'SK' -%][%- IF (t) -%]<span>Slovakia</span>[%- ELSE -%][%- 'Slovensko' -%][%- END -%] >+ [%- CASE 'TH' -%][%- IF (t) -%]<span>Thailand</span>[%- ELSE -%][%- 'à¸à¸£à¸°à¹à¸à¸¨à¹à¸à¸¢' -%][%- END -%] >+ [%- CASE 'TR' -%][%- IF (t) -%]<span>Turkey</span>[%- ELSE -%][%- 'Türkiye' -%][%- END -%] >+ [%- CASE 'TW' -%][%- IF (t) -%]<span>Taiwan</span>[%- ELSE -%][%- 'å°ç£' -%][%- END -%] >+ [%- CASE 'UA' -%][%- IF (t) -%]<span>Ukraine</span>[%- ELSE -%][%- 'УкÑаÑна' -%][%- END -%] >+ [%- CASE 'US' -%][%- IF (t) -%]<span>United States</span>[%- ELSE -%][%- 'United States' -%][%- END -%] >+ [%- CASE 'VN' -%][%- IF (t) -%]<span>Vietnam</span>[%- ELSE -%][%- 'Viá»t Nam' -%][%- END -%] >+ [%- CASE -%][%- region -%] >+[%- END -%] >+[%- END -%] >+ >diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/opac-bottom.inc b/koha-tmpl/opac-tmpl/prog/en/includes/opac-bottom.inc >index ec17f80..bce7392 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/includes/opac-bottom.inc >+++ b/koha-tmpl/opac-tmpl/prog/en/includes/opac-bottom.inc >@@ -9,18 +9,18 @@ > <div id="changelanguage" class="ft"> > <div class="lang"><strong>Languages: </strong></div> > <ul id="i18nMenu" class="footermenu"> >- [% FOREACH languages_loo IN languages_loop %] >+ [% FOREACH languages_loo IN languages_loop.sort('rfc4646_subtag') %] > > [% IF ( languages_loo.group_enabled ) %] > [% IF ( languages_loo.plural ) %] >- <li class="more"><a class="sublangs" id="show[% languages_loo.rfc4646_subtag %]" href="#">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description %][% ELSE %][% languages_loo.rfc4646_subtag %][% END %]</a><div id="sub[% languages_loo.rfc4646_subtag %]"> >+ <li class="more"><a class="sublangs" id="show[% languages_loo.rfc4646_subtag %]" href="#">[% PROCESS native_description subtag = languages_loo.rfc4646_subtag %]</a><div id="sub[% languages_loo.rfc4646_subtag %]"> > <div class="bd"><ul> >- [% FOREACH sublanguages_loo IN languages_loo.sublanguages_loop %] >+ [% FOREACH sublanguages_loo IN languages_loo.sublanguages_loop.sort('rfc4646_subtag') %] > [% IF ( sublanguages_loo.enabled ) %] > [% IF ( sublanguages_loo.sublanguage_current ) %] >- <li> [% sublanguages_loo.native_description %] [% sublanguages_loo.script_description %] [% sublanguages_loo.region_description %] [% sublanguages_loo.variant_description %] ([% sublanguages_loo.rfc4646_subtag %])</li> >+ <li> [% PROCESS native_description subtag = sublanguages_loo.rfc4646_subtag %] ([% sublanguages_loo.rfc4646_subtag %])</li> > [% ELSE %] >- <li><a href="/cgi-bin/koha/opac-changelanguage.pl?language=[% sublanguages_loo.rfc4646_subtag %]"> [% sublanguages_loo.native_description %] [% sublanguages_loo.script_description %] [% sublanguages_loo.region_description %] [% sublanguages_loo.variant_description %] ([% sublanguages_loo.rfc4646_subtag %])</a></li> >+ <li><a href="/cgi-bin/koha/opac-changelanguage.pl?language=[% sublanguages_loo.rfc4646_subtag %]"> [% PROCESS native_description subtag = sublanguages_loo.rfc4646_subtag %] ([% sublanguages_loo.rfc4646_subtag %])</a></li> > [% END %] > [% END %] > >@@ -30,9 +30,9 @@ > [% ELSE %] > [% IF ( languages_loo.group_enabled ) %] > [% IF ( languages_loo.current ) %] >- <li class="morelang">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description %][% ELSE %][% languages_loo.rfc4646_subtag %][% END %]</li> >+ <li class="morelang">[% PROCESS native_description subtag = languages_loo.rfc4646_subtag %]</li> > [% ELSE %] >- <li class="morelang"><a href="/cgi-bin/koha/opac-changelanguage.pl?language=[% languages_loo.rfc4646_subtag %]">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description %][% ELSE %][% languages_loo.rfc4646_subtag %][% END %]</a></li> >+ <li class="morelang"><a href="/cgi-bin/koha/opac-changelanguage.pl?language=[% languages_loo.rfc4646_subtag %]">[% PROCESS native_description subtag = languages_loo.rfc4646_subtag %]</a></li> > [% END %] > [% END %] > [% END %] >diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tt >index 4c1c552..ab0c8a3 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tt >+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tt >@@ -202,15 +202,16 @@ > <!-- LANGUAGE LIMIT --> > <p><label for="language-limit">Language: </label> > <select id="language-limit" name="limit"> >- <option value="">No limit</option> >- [% FOREACH search_languages_loo IN search_languages_loop %] >- [% IF ( search_languages_loo.selected ) %] >- <option value="ln,rtrn:[% search_languages_loo.iso639_2_code %]" selected="selected">[% search_languages_loo.language_description %]</option> >- [% ELSE %] >- <option value="ln,rtrn:[% search_languages_loo.iso639_2_code %]">[% search_languages_loo.language_description %]</option> >- [% END %] >+ <option value="">No limit</option> >+ [% PROCESS get_language_codes %] >+ [% FOREACH language_code IN language_codes %] >+ <option value="ln,rtrn:[%- INCLUDE language_descriptions code = language_code i = 1 -%]"> >+ [%- INCLUDE language_descriptions code = language_code -%] >+ ([%- INCLUDE language_descriptions code = language_code t = 1 -%]) >+ </option> > [% END %] >- </select></p><!-- <a href="">Show all languages</a>--> >+ </select> >+ </p><!-- <a href="">Show all languages</a>--> > <!-- /LANGUAGE LIMIT --> > </fieldset> > </div> >diff --git a/opac/opac-search.pl b/opac/opac-search.pl >index 617d67e..e647e28 100755 >--- a/opac/opac-search.pl >+++ b/opac/opac-search.pl >@@ -43,7 +43,6 @@ for ( $searchengine ) { > > use C4::Output; > use C4::Auth qw(:DEFAULT get_session ParseSearchHistorySession SetSearchHistorySession); >-use C4::Languages qw(getAllLanguages); > use C4::Search; > use C4::Biblio; # GetBiblioData > use C4::Koha; >@@ -197,9 +196,6 @@ $template->param( > searchdomainloop => GetBranchCategories('searchdomain'), > ); > >-# load the language limits (for search) >-my $languages_limit_loop = getAllLanguages($lang); >-$template->param(search_languages_loop => $languages_limit_loop,); > > # load the Type stuff > my $itemtypes = GetItemTypes; >-- >1.7.9.5
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 12017
:
26691
|
26694
|
26735
|
26736
|
26770
|
27687
|
27688
|
27689
|
27690
|
27691
|
27692
|
27693
|
27694
|
27695
|
27696
|
29898
|
29899
|
29900
|
29901
|
29902
|
29903
|
29904
|
29905
|
29906
|
29907
|
33337
|
33338
|
33339
|
33340
|
33341
|
33342
|
33343
|
33344
|
33345
|
33346
|
39304
|
39305
|
39306
|
39307
|
39308
|
39309
|
39310
|
39311
|
39312
|
39313
|
39644
|
39655
|
39656
|
39657
|
39658
|
39659
|
39660
|
39661
|
39662
|
39663
|
39664
|
39665
|
40285
|
40286
|
40287
|
40288
|
40289
|
40290
|
40291
|
40292
|
40293
|
40294
|
40295