Bugzilla – Attachment 29901 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 - 4 - Change language changers
Bug-12017---4---Change-language-changers.patch (text/plain), 17.77 KB, created by
Bernardo Gonzalez Kriegel
on 2014-07-21 00:03:38 UTC
(
hide
)
Description:
Bug 12017 - 4 - Change language changers
Filename:
MIME Type:
Creator:
Bernardo Gonzalez Kriegel
Created:
2014-07-21 00:03:38 UTC
Size:
17.77 KB
patch
obsolete
>From fdafd2cbdbc4d41076f5952a53921e6593b5b35d Mon Sep 17 00:00:00 2001 >From: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> >Date: Fri, 25 Apr 2014 21:38:21 -0300 >Subject: [PATCH] Bug 12017 - 4 - Change language changers > >This patch modifies language changers on staff/opac >Only parameter used is rfc4646 > >To test: >1. Apply the patch >2. Reload staff and opac (prog/ccsr/bootstrap) >3. Check display of language changers >4. Do a real translation and check language change works > >Do not change language unless you did a real translation > >Only change in display is showing only regions for sublanguages. >--- > .../prog/en/includes/intranet-bottom.inc | 22 ++++------- > .../bootstrap/en/includes/opac-bottom.inc | 14 +++---- > .../opac-tmpl/ccsr/en/includes/opac-bottom.inc | 46 ++++++++++------------ > .../opac-tmpl/prog/en/includes/opac-bottom.inc | 14 +++---- > 4 files changed, 42 insertions(+), 54 deletions(-) > >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 442a7bb..4fd0110 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="#">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description %][% ELSE %][% languages_loo.rfc4646_subtag %][% END %] <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/opac-tmpl/bootstrap/en/includes/opac-bottom.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc >index 4128061..3b7694e 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/ccsr/en/includes/opac-bottom.inc b/koha-tmpl/opac-tmpl/ccsr/en/includes/opac-bottom.inc >index 3f8bf66..e10c653 100644 >--- a/koha-tmpl/opac-tmpl/ccsr/en/includes/opac-bottom.inc >+++ b/koha-tmpl/opac-tmpl/ccsr/en/includes/opac-bottom.inc >@@ -41,35 +41,31 @@ > <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 %]"> >- <div class="bd"><ul> >- [% FOREACH sublanguages_loo IN languages_loo.sublanguages_loop %] >- [% 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> >+ [% IF ( languages_loo.plural ) %] >+ <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.sort('rfc4646_subtag') %] >+ [% IF ( sublanguages_loo.enabled ) %] >+ [% IF ( sublanguages_loo.sublanguage_current ) %] >+ <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 %]">[% PROCESS region_description subtag = sublanguages_loo.rfc4646_subtag %] ([% sublanguages_loo.rfc4646_subtag %])</a></li> >+ [% END %] >+ [% END %] >+ [% END %] >+ </ul></div></div></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 %] >+ [% IF ( languages_loo.group_enabled ) %] >+ [% IF ( languages_loo.current ) %] >+ <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 %]">[% PROCESS native_description subtag = languages_loo.rfc4646_subtag %]</a></li> >+ [% END %] >+ [% END %] > [% END %] >- > [% END %] >- </ul></div></div></li> >- >- [% 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> >- [% 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> >- [% END %] >- [% END %] >- [% END %] >- [% END %] >- > [% END %] > </ul> > </div> >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..3f86505 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 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> >+ <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 %] > >@@ -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 %] >-- >1.9.1
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