From acdc3d7dbe9b548d79756cc2cc3556f14f3e7432 Mon Sep 17 00:00:00 2001 From: Bernardo Gonzalez Kriegel Date: Thu, 18 Jun 2015 09:55:05 -0300 Subject: [PATCH] Bug 12017: 11 - Change masthead language switcher On top of Bug 14252 This patch adapt to new style masthead language switcher To test: 1) Apply the patch 2) Install and enable on opac some languages and sublanguages e.g. es-ES de-DE de-CH en-NZ 3) Check that masthead language switcher shows language description and region description for sublanguages --- .../opac-tmpl/bootstrap/en/includes/masthead.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc index 1ccd2be..46c62b6 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc @@ -82,21 +82,21 @@ [% FOREACH languages_loo IN languages_loop.sort('rfc4646_subtag') %] [% IF ( languages_loo.group_enabled ) %] [% IF ( languages_loo.plural ) %] - [% 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 ) %] -
  • [% sublanguages_loo.native_description %] [% sublanguages_loo.script_description %] [% sublanguages_loo.region_description %] [% sublanguages_loo.variant_description %] 
  • +
  • [% INCLUDE native_description subtag = sublanguages_loo.rfc4646_subtag %] [% INCLUDE region_description subtag = sublanguages_loo.rfc4646_subtag %] 
  • [% ELSE %] -
  • [% sublanguages_loo.native_description %] [% sublanguages_loo.script_description %] [% sublanguages_loo.region_description %] [% sublanguages_loo.variant_description %]
  • +
  • [% INCLUDE native_description subtag = sublanguages_loo.rfc4646_subtag %] [% INCLUDE region_description subtag = sublanguages_loo.rfc4646_subtag %]
  • [% END %] [% END # / IF sublanguages_loo.enabled %] [% END # / FOREACH sublanguages_loo %] [% ELSE %] [% IF ( languages_loo.group_enabled ) %] [% IF ( languages_loo.current ) %] -
  • [% IF ( languages_loo.native_description ) %][% languages_loo.native_description %][% ELSE %][% languages_loo.rfc4646_subtag %][% END %] 
  • +
  • [% INCLUDE native_description subtag = languages_loo.rfc4646_subtag %] 
  • [% ELSE %] -
  • [% IF ( languages_loo.native_description ) %][% languages_loo.native_description %][% ELSE %][% languages_loo.rfc4646_subtag %][% END %]
  • +
  • [% INCLUDE native_description subtag = languages_loo.rfc4646_subtag %]
  • [% END %] [% END # / IF languages_loo.current %] [% END # / IF ( languages_loo.plural ) %] -- 1.7.9.5