View | Details | Raw Unified | Return to bug 12017
Collapse All | Expand All

(-)a/C4/Languages.pm (-5 lines)
Lines 316-325 sub _build_languages_arrayref { Link Here
316
            # group this language, key by langtag
316
            # group this language, key by langtag
317
            $language_subtags_hashref->{'sublanguage_current'} = 1 if $translated_language eq $current_language;
317
            $language_subtags_hashref->{'sublanguage_current'} = 1 if $translated_language eq $current_language;
318
            $language_subtags_hashref->{'rfc4646_subtag'} = $translated_language;
318
            $language_subtags_hashref->{'rfc4646_subtag'} = $translated_language;
319
            $language_subtags_hashref->{'native_description'} = language_get_description($language_subtags_hashref->{language},$language_subtags_hashref->{language},'language');
320
            $language_subtags_hashref->{'script_description'} = language_get_description($language_subtags_hashref->{script},$language_subtags_hashref->{'language'},'script');
321
            $language_subtags_hashref->{'region_description'} = language_get_description($language_subtags_hashref->{region},$language_subtags_hashref->{'language'},'region');
322
            $language_subtags_hashref->{'variant_description'} = language_get_description($language_subtags_hashref->{variant},$language_subtags_hashref->{'language'},'variant');
323
            $track_language_groups->{$language_subtags_hashref->{'language'}}++;
319
            $track_language_groups->{$language_subtags_hashref->{'language'}}++;
324
            push ( @{ $language_groups->{$language_subtags_hashref->{language}} }, $language_subtags_hashref );
320
            push ( @{ $language_groups->{$language_subtags_hashref->{language}} }, $language_subtags_hashref );
325
        }
321
        }
Lines 335-341 sub _build_languages_arrayref { Link Here
335
            push @languages_loop,  {
331
            push @languages_loop,  {
336
                            # this is only use if there is one
332
                            # this is only use if there is one
337
                            rfc4646_subtag => @$value[0]->{rfc4646_subtag},
333
                            rfc4646_subtag => @$value[0]->{rfc4646_subtag},
338
                            native_description => language_get_description($key,$key,'language'),
339
                            language => $key,
334
                            language => $key,
340
                            sublanguages_loop => $value,
335
                            sublanguages_loop => $value,
341
                            plural => $track_language_groups->{$key} >1 ? 1 : 0,
336
                            plural => $track_language_groups->{$key} >1 ? 1 : 0,
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc (+2 lines)
Lines 20-25 Link Here
20
    <link rel="stylesheet" type="text/css" href="[% themelang %]/css/login.css" />
20
    <link rel="stylesheet" type="text/css" href="[% themelang %]/css/login.css" />
21
[% END %]
21
[% END %]
22
22
23
[% PROCESS 'language.inc' %]
24
23
<!-- koha core js -->
25
<!-- koha core js -->
24
<script type="text/javascript" src="[% themelang %]/js/staff-global.js"></script>
26
<script type="text/javascript" src="[% themelang %]/js/staff-global.js"></script>
25
[% INCLUDE 'validator-strings.inc' %]
27
[% INCLUDE 'validator-strings.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc (-15 / +9 lines)
Lines 5-22 Link Here
5
        <div id="changelanguage" class="navbar navbar-fixed-bottom">
5
        <div id="changelanguage" class="navbar navbar-fixed-bottom">
6
            <div class="navbar-inner">
6
            <div class="navbar-inner">
7
        <ul id="i18nMenu" class="nav">
7
        <ul id="i18nMenu" class="nav">
8
        [% FOREACH languages_loo IN languages_loop %]
8
        [% FOREACH languages_loo IN languages_loop.sort('rfc4646_subtag') %]
9
9
10
            [% IF ( languages_loo.group_enabled ) %]
10
            [% IF ( languages_loo.group_enabled ) %]
11
            [% IF ( languages_loo.plural ) %]
11
            [% IF ( languages_loo.plural ) %]
12
            <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>
12
            <li class="dropdown">
13
            <a class="dropdown-toggle dropup" data-toggle="dropdown" id="show[% languages_loo.rfc4646_subtag %]" href="#">
14
            [% PROCESS lang_getname subtag = languages_loo.rfc4646_subtag %]<span class="caret"></span></a>
13
            <ul id="sub[% languages_loo.rfc4646_subtag %]" class="dropdown-menu">
15
            <ul id="sub[% languages_loo.rfc4646_subtag %]" class="dropdown-menu">
14
            [% FOREACH sublanguages_loo IN languages_loo.sublanguages_loop %]
16
            [% FOREACH sublanguages_loo IN languages_loo.sublanguages_loop.sort('rfc4646_subtag') %]
15
		[% IF ( sublanguages_loo.enabled ) %]
17
		[% IF ( sublanguages_loo.enabled ) %]
16
                [% IF ( sublanguages_loo.sublanguage_current ) %]
18
                [% IF ( sublanguages_loo.sublanguage_current ) %]
17
                    <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>
19
                    <li> <a href="#">[% PROCESS lang_getregion subtag = sublanguages_loo.rfc4646_subtag %] ([% sublanguages_loo.rfc4646_subtag %])</a></li>
18
                [% ELSE %]
20
                [% ELSE %]
19
                <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>
21
                <li><a href="/cgi-bin/koha/changelanguage.pl?language=[% sublanguages_loo.rfc4646_subtag %]">[% PROCESS lang_getregion subtag = sublanguages_loo.rfc4646_subtag %] ([% sublanguages_loo.rfc4646_subtag %])</a></li>
20
		[% END %]
22
		[% END %]
21
                [% END %]
23
                [% END %]
22
24
Lines 27-45 Link Here
27
	    	[% IF ( languages_loo.group_enabled ) %]
29
	    	[% IF ( languages_loo.group_enabled ) %]
28
                [% IF ( languages_loo.current ) %]
30
                [% IF ( languages_loo.current ) %]
29
                    <li class="navbar-text">
31
                    <li class="navbar-text">
30
                        [% IF ( languages_loo.native_description ) %]
32
                    [% PROCESS lang_getname subtag = languages_loo.rfc4646_subtag %]
31
                            [% languages_loo.native_description %]
32
                [% ELSE %]
33
                            [% languages_loo.rfc4646_subtag %]
34
                        [% END %]
35
                    </li>
33
                    </li>
36
                [% ELSE %]
34
                [% ELSE %]
37
                    <li><a href="/cgi-bin/koha/changelanguage.pl?language=[% languages_loo.rfc4646_subtag %]">
35
                    <li><a href="/cgi-bin/koha/changelanguage.pl?language=[% languages_loo.rfc4646_subtag %]">
38
                        [% IF ( languages_loo.native_description ) %]
36
                        [% PROCESS lang_getname subtag = languages_loo.rfc4646_subtag %]
39
                            [% languages_loo.native_description %]
40
                        [% ELSE %]
41
                            [% languages_loo.rfc4646_subtag %]
42
                        [% END %]
43
                    </a></li>
37
                    </a></li>
44
                [% END %]
38
                [% END %]
45
		[% END %]
39
		[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/language.inc (+114 lines)
Line 0 Link Here
1
[%- BLOCK decompose_subtag -%]
2
[%- IF ( matches = subtag.match('^(\w+)$')) -%]
3
        [%- SET lang   = subtag    -%]
4
        [%- SET script = ''        -%]
5
        [%- IF ( lang == 'en' )    -%]
6
        [%- SET region = 'US'      -%]
7
        [%- ELSE                   -%]
8
        [%- SET region = ''        -%]
9
        [%- END                    -%]
10
[%- ELSIF ( matches = subtag.match('^(\w+)-(\w+)$')) -%]
11
        [%- SET lang   = matches.0 -%]
12
    [%- IF matches.1.length == 2   -%]
13
        [%- SET script = ''        -%]
14
        [%- SET region = matches.1 -%]
15
    [%- ELSE                       -%]
16
        [%- SET script = matches.1 -%]
17
        [%- SET region = ''        -%]
18
    [%- END                        -%]
19
[%- ELSIF ( matches = subtag.match('^(\w+)-(\w+)-(\w+)$')) -%]
20
        [%- SET lang   = matches.0 -%]
21
        [%- SET script = matches.1 -%]
22
        [%- SET region = matches.2 -%]
23
[%- END -%]
24
[%- END -%]
25
26
[%- BLOCK lang_description -%]
27
[%- PROCESS decompose_subtag subtag = subtag -%]
28
[%- PROCESS lang_name lang = lang %] [% PROCESS lang_script script = script %] [% PROCESS lang_region region = region -%]
29
[%- END -%]
30
31
[%- BLOCK lang_getregion -%]
32
[%- PROCESS decompose_subtag subtag = subtag -%]
33
[%- PROCESS lang_region region = region -%]
34
[%- END -%]
35
36
[%- BLOCK lang_getname -%]
37
[%- PROCESS decompose_subtag subtag = subtag -%]
38
[%- PROCESS lang_name lang = lang %]
39
[%- END -%]
40
41
[%- BLOCK lang_name -%]
42
[%- SWITCH lang -%]
43
  [%- CASE 'ar' -%]<span>Arabic</span>
44
  [%- CASE 'hy' -%]<span>Armenian</span>
45
  [%- CASE 'bg' -%]<span>Bulgarian</span>
46
  [%- CASE 'ca' -%]<span>Catalan</span>
47
  [%- CASE 'zh' -%]<span>Chinese</span>
48
  [%- CASE 'cs' -%]<span>Czech</span>
49
  [%- CASE 'da' -%]<span>Danish</span>
50
  [%- CASE 'nl' -%]<span>Dutch</span>
51
  [%- CASE 'en' -%]<span>English</span>
52
  [%- CASE 'fi' -%]<span>Finnish</span>
53
  [%- CASE 'fr' -%]<span>French</span>
54
  [%- CASE 'gl' -%]<span>Galician</span>
55
  [%- CASE 'de' -%]<span>German</span>
56
  [%- CASE 'el' -%]<span>Greek</span>
57
  [%- CASE 'he' -%]<span>Hebrew</span>
58
  [%- CASE 'hi' -%]<span>Hindi</span>
59
  [%- CASE 'hu' -%]<span>Hungarian</span>
60
  [%- CASE 'id' -%]<span>Indonesian</span>
61
  [%- CASE 'it' -%]<span>Italian</span>
62
  [%- CASE 'ja' -%]<span>Japanese</span>
63
  [%- CASE 'ko' -%]<span>Korean</span>
64
  [%- CASE 'lo' -%]<span>Lao</span>
65
  [%- CASE 'la' -%]<span>Latin</span>
66
  [%- CASE 'nb' -%]<span>Norwegian bokmål</span>
67
  [%- CASE 'nn' -%]<span>Norwegian nynorsk</span>
68
  [%- CASE 'fa' -%]<span>Persian</span>
69
  [%- CASE 'pl' -%]<span>Polish</span>
70
  [%- CASE 'pt' -%]<span>Portuguese</span>
71
  [%- CASE 'ro' -%]<span>Romanian</span>
72
  [%- CASE 'ru' -%]<span>Russian</span>
73
  [%- CASE 'sr' -%]<span>Serbian</span>
74
  [%- CASE 'es' -%]<span>Spanish</span>
75
  [%- CASE 'sv' -%]<span>Swedish</span>
76
  [%- CASE 'tet' -%]<span>Tetum</span>
77
  [%- CASE 'th' -%]<span>Thai</span>
78
  [%- CASE 'tr' -%]<span>Turkish</span>
79
  [%- CASE 'uk' -%]<span>Ukranian</span>
80
  [%- CASE 'ur' -%]<span>Urdu</span>
81
  [%- CASE -%][%- lang -%]
82
[%- END -%]
83
[%- END -%]
84
85
[%- BLOCK lang_script -%]
86
[%- SWITCH script -%]
87
  [%- CASE 'Arab' -%]<span>Arabic</span>
88
  [%- CASE 'Cyrl' -%]<span>Cyrillic</span>
89
  [%- CASE 'Grek' -%]<span>Greek</span>
90
  [%- CASE 'Hans' -%]<span>Han (Simplified variant)</span>
91
  [%- CASE 'Hant' -%]<span>Han (Traditional variant)</span>
92
  [%- CASE 'Hebr' -%]<span>Hebrew</span>
93
  [%- CASE 'Laoo' -%]<span>Lao</span>
94
  [%- CASE -%][% script %]
95
[%- END -%]
96
[%- END -%]
97
98
[%- BLOCK lang_region -%]
99
[%- SWITCH region -%]
100
  [%- CASE 'CA' -%]<span>Canada</span>
101
  [%- CASE 'DK' -%]<span>Denmark</span>
102
  [%- CASE 'ES' -%]<span>Spain</span>
103
  [%- CASE 'FR' -%]<span>France</span>
104
  [%- CASE 'GR' -%]<span>Greece</span>
105
  [%- CASE 'NZ' -%]<span>New Zealand</span>
106
  [%- CASE 'GB' -%]<span>United Kingdom</span>
107
  [%- CASE 'US' -%]<span>United States</span>
108
  [%- CASE 'TW' -%]<span>Taiwan</span>
109
  [%- CASE 'CN' -%]<span>China</span>
110
  [%- CASE -%][% region %]
111
[%- END -%]
112
[%- END -%]
113
114
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt (-5 / +5 lines)
Lines 121-149 Link Here
121
					<textarea name="pref_[% CHUNK.name %]" id="pref_[% CHUNK.name %]" class="preference preference-[% CHUNK.class or "short" %]" rows="10" cols="40">[% CHUNK.value %]</textarea>
121
					<textarea name="pref_[% CHUNK.name %]" id="pref_[% CHUNK.name %]" class="preference preference-[% CHUNK.class or "short" %]" rows="10" cols="40">[% CHUNK.value %]</textarea>
122
                    [% ELSIF ( CHUNK.type_languages ) %]
122
                    [% ELSIF ( CHUNK.type_languages ) %]
123
                    <dl>
123
                    <dl>
124
                    [% FOREACH language IN CHUNK.languages %]
124
                    [% FOREACH language IN CHUNK.languages.sort('rfc4646_subtag') %]
125
                        [% IF ( language.plural ) %]
125
                        [% IF ( language.plural ) %]
126
                        <dt>
126
                        <dt>
127
                            [% IF ( language.native_description ) %][% language.native_description %][% ELSE %][% language.rfc4646_subtag %][% END %]
127
                            [% PROCESS lang_getname subtag = language.rfc4646_subtag %]
128
                        </dt>
128
                        </dt>
129
                        [% FOREACH sublanguages_loo IN language.sublanguages_loop %]
129
                        [% FOREACH sublanguages_loo IN language.sublanguages_loop.sort('rfc4646_subtag') %]
130
                        <dd>
130
                        <dd>
131
                            <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>
132
                            [% IF ( sublanguages_loo.enabled ) %]
131
                            [% IF ( sublanguages_loo.enabled ) %]
133
                            <input value="[% sublanguages_loo.rfc4646_subtag %]" name="pref_[% CHUNK.name %]" id="[% sublanguages_loo.rfc4646_subtag %]" type="checkbox" checked="checked" class="preference preference-checkbox"/>
132
                            <input value="[% sublanguages_loo.rfc4646_subtag %]" name="pref_[% CHUNK.name %]" id="[% sublanguages_loo.rfc4646_subtag %]" type="checkbox" checked="checked" class="preference preference-checkbox"/>
134
                            [% ELSE %]
133
                            [% ELSE %]
135
                            <input value="[% sublanguages_loo.rfc4646_subtag %]" name="pref_[% CHUNK.name %]" id="[% sublanguages_loo.rfc4646_subtag %]" type="checkbox" class="preference preference-checkbox"/>
134
                            <input value="[% sublanguages_loo.rfc4646_subtag %]" name="pref_[% CHUNK.name %]" id="[% sublanguages_loo.rfc4646_subtag %]" type="checkbox" class="preference preference-checkbox"/>
136
                            [% END %]
135
                            [% END %]
136
                            <label for="[% sublanguages_loo.rfc4646_subtag %]">[% PROCESS lang_description subtag = sublanguages_loo.rfc4646_subtag %] ([% sublanguages_loo.rfc4646_subtag %])</label>
137
                        </dd>
137
                        </dd>
138
                        [% END %]
138
                        [% END %]
139
                        [% ELSE %]
139
                        [% ELSE %]
140
                        <dt>
140
                        <dt>
141
                            <label for="[% language.rfc4646_subtag %]">[% language.native_description %]([% language.rfc4646_subtag %])</label>
142
                            [% IF ( language.group_enabled ) %]
141
                            [% IF ( language.group_enabled ) %]
143
                            <input value="[% language.rfc4646_subtag %]" name="pref_[% CHUNK.name %]" id="[% language.rfc4646_subtag %]" type="checkbox" checked="checked" class="preference preference-checkbox"/>
142
                            <input value="[% language.rfc4646_subtag %]" name="pref_[% CHUNK.name %]" id="[% language.rfc4646_subtag %]" type="checkbox" checked="checked" class="preference preference-checkbox"/>
144
                            [% ELSE %]
143
                            [% ELSE %]
145
                            <input value="[% language.rfc4646_subtag %]" name="pref_[% CHUNK.name %]" id="[% language.rfc4646_subtag %]" type="checkbox" class="preference preference-checkbox"/>
144
                            <input value="[% language.rfc4646_subtag %]" name="pref_[% CHUNK.name %]" id="[% language.rfc4646_subtag %]" type="checkbox" class="preference preference-checkbox"/>
146
                            [% END %]
145
                            [% END %]
146
                            <label for="[% language.rfc4646_subtag %]">[% PROCESS lang_description subtag = language.rfc4646_subtag %] ([% language.rfc4646_subtag %])</label>
147
                        </dt>
147
                        </dt>
148
                        [% END %]
148
                        [% END %]
149
                    [% END %]
149
                    [% END %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc (+2 lines)
Lines 15-20 Link Here
15
    <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/lib/jquery/jquery-ui.css" />
15
    <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/lib/jquery/jquery-ui.css" />
16
[% END %]
16
[% END %]
17
17
18
[% PROCESS 'language.inc' %]
19
18
[% SET opaclayoutstylesheet='opac.css' UNLESS opaclayoutstylesheet %]
20
[% SET opaclayoutstylesheet='opac.css' UNLESS opaclayoutstylesheet %]
19
[% IF (opaclayoutstylesheet.match('^https?:|^\/')) %]
21
[% IF (opaclayoutstylesheet.match('^https?:|^\/')) %]
20
    <link rel="stylesheet" type="text/css" href="[% opaclayoutstylesheet %]" />
22
    <link rel="stylesheet" type="text/css" href="[% opaclayoutstylesheet %]" />
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/language.inc (+114 lines)
Line 0 Link Here
1
[%- BLOCK decompose_subtag -%]
2
[%- IF ( matches = subtag.match('^(\w+)$')) -%]
3
        [%- SET lang   = subtag    -%]
4
        [%- SET script = ''        -%]
5
        [%- IF ( lang == 'en' )    -%]
6
        [%- SET region = 'US'      -%]
7
        [%- ELSE                   -%]
8
        [%- SET region = ''        -%]
9
        [%- END                    -%]
10
[%- ELSIF ( matches = subtag.match('^(\w+)-(\w+)$')) -%]
11
        [%- SET lang   = matches.0 -%]
12
    [%- IF matches.1.length == 2   -%]
13
        [%- SET script = ''        -%]
14
        [%- SET region = matches.1 -%]
15
    [%- ELSE                       -%]
16
        [%- SET script = matches.1 -%]
17
        [%- SET region = ''        -%]
18
    [%- END                        -%]
19
[%- ELSIF ( matches = subtag.match('^(\w+)-(\w+)-(\w+)$')) -%]
20
        [%- SET lang   = matches.0 -%]
21
        [%- SET script = matches.1 -%]
22
        [%- SET region = matches.2 -%]
23
[%- END -%]
24
[%- END -%]
25
26
[%- BLOCK lang_description -%]
27
[%- PROCESS decompose_subtag subtag = subtag -%]
28
[%- PROCESS lang_name lang = lang %] [% PROCESS lang_script script = script %] [% PROCESS lang_region region = region -%]
29
[%- END -%]
30
31
[%- BLOCK lang_getregion -%]
32
[%- PROCESS decompose_subtag subtag = subtag -%]
33
[%- PROCESS lang_region region = region -%]
34
[%- END -%]
35
36
[%- BLOCK lang_getname -%]
37
[%- PROCESS decompose_subtag subtag = subtag -%]
38
[%- PROCESS lang_name lang = lang %]
39
[%- END -%]
40
41
[%- BLOCK lang_name -%]
42
[%- SWITCH lang -%]
43
  [%- CASE 'ar' -%]<span>Arabic</span>
44
  [%- CASE 'hy' -%]<span>Armenian</span>
45
  [%- CASE 'bg' -%]<span>Bulgarian</span>
46
  [%- CASE 'ca' -%]<span>Catalan</span>
47
  [%- CASE 'zh' -%]<span>Chinese</span>
48
  [%- CASE 'cs' -%]<span>Czech</span>
49
  [%- CASE 'da' -%]<span>Danish</span>
50
  [%- CASE 'nl' -%]<span>Dutch</span>
51
  [%- CASE 'en' -%]<span>English</span>
52
  [%- CASE 'fi' -%]<span>Finnish</span>
53
  [%- CASE 'fr' -%]<span>French</span>
54
  [%- CASE 'gl' -%]<span>Galician</span>
55
  [%- CASE 'de' -%]<span>German</span>
56
  [%- CASE 'el' -%]<span>Greek</span>
57
  [%- CASE 'he' -%]<span>Hebrew</span>
58
  [%- CASE 'hi' -%]<span>Hindi</span>
59
  [%- CASE 'hu' -%]<span>Hungarian</span>
60
  [%- CASE 'id' -%]<span>Indonesian</span>
61
  [%- CASE 'it' -%]<span>Italian</span>
62
  [%- CASE 'ja' -%]<span>Japanese</span>
63
  [%- CASE 'ko' -%]<span>Korean</span>
64
  [%- CASE 'lo' -%]<span>Lao</span>
65
  [%- CASE 'la' -%]<span>Latin</span>
66
  [%- CASE 'nb' -%]<span>Norwegian bokmål</span>
67
  [%- CASE 'nn' -%]<span>Norwegian nynorsk</span>
68
  [%- CASE 'fa' -%]<span>Persian</span>
69
  [%- CASE 'pl' -%]<span>Polish</span>
70
  [%- CASE 'pt' -%]<span>Portuguese</span>
71
  [%- CASE 'ro' -%]<span>Romanian</span>
72
  [%- CASE 'ru' -%]<span>Russian</span>
73
  [%- CASE 'sr' -%]<span>Serbian</span>
74
  [%- CASE 'es' -%]<span>Spanish</span>
75
  [%- CASE 'sv' -%]<span>Swedish</span>
76
  [%- CASE 'tet' -%]<span>Tetum</span>
77
  [%- CASE 'th' -%]<span>Thai</span>
78
  [%- CASE 'tr' -%]<span>Turkish</span>
79
  [%- CASE 'uk' -%]<span>Ukranian</span>
80
  [%- CASE 'ur' -%]<span>Urdu</span>
81
  [%- CASE -%][%- lang -%]
82
[%- END -%]
83
[%- END -%]
84
85
[%- BLOCK lang_script -%]
86
[%- SWITCH script -%]
87
  [%- CASE 'Arab' -%]<span>Arabic</span>
88
  [%- CASE 'Cyrl' -%]<span>Cyrillic</span>
89
  [%- CASE 'Grek' -%]<span>Greek</span>
90
  [%- CASE 'Hans' -%]<span>Han (Simplified variant)</span>
91
  [%- CASE 'Hant' -%]<span>Han (Traditional variant)</span>
92
  [%- CASE 'Hebr' -%]<span>Hebrew</span>
93
  [%- CASE 'Laoo' -%]<span>Lao</span>
94
  [%- CASE -%][% script %]
95
[%- END -%]
96
[%- END -%]
97
98
[%- BLOCK lang_region -%]
99
[%- SWITCH region -%]
100
  [%- CASE 'CA' -%]<span>Canada</span>
101
  [%- CASE 'DK' -%]<span>Denmark</span>
102
  [%- CASE 'ES' -%]<span>Spain</span>
103
  [%- CASE 'FR' -%]<span>France</span>
104
  [%- CASE 'GR' -%]<span>Greece</span>
105
  [%- CASE 'NZ' -%]<span>New Zealand</span>
106
  [%- CASE 'GB' -%]<span>United Kingdom</span>
107
  [%- CASE 'US' -%]<span>United States</span>
108
  [%- CASE 'TW' -%]<span>Taiwan</span>
109
  [%- CASE 'CN' -%]<span>China</span>
110
  [%- CASE -%][% region %]
111
[%- END -%]
112
[%- END -%]
113
114
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc (-7 / +11 lines)
Lines 37-54 Link Here
37
                    <div class="navbar-inner">
37
                    <div class="navbar-inner">
38
                        <ul id="i18nMenu" class="nav">
38
                        <ul id="i18nMenu" class="nav">
39
                            <li><p class="lang navbar-text"><strong>Languages:&nbsp;</strong></p></li>
39
                            <li><p class="lang navbar-text"><strong>Languages:&nbsp;</strong></p></li>
40
                            [% FOREACH languages_loo IN languages_loop %]
40
                            [% FOREACH languages_loo IN languages_loop.sort('rfc4646_subtag') %]
41
                                [% IF ( languages_loo.group_enabled ) %]
41
                                [% IF ( languages_loo.group_enabled ) %]
42
                                    [% IF ( languages_loo.plural ) %]
42
                                    [% IF ( languages_loo.plural ) %]
43
                                        <li class="dropdown">
43
                                        <li class="dropdown">
44
                                            <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>
44
                                            <a data-toggle="dropdown" class="dropdown-toggle sublangs" id="show[% languages_loo.rfc4646_subtag %]" href="#">
45
                                                [% PROCESS lang_getname subtag = languages_loo.rfc4646_subtag %] <b class="caret"></b></a>
45
                                                <ul id="sub[% languages_loo.rfc4646_subtag %]" class="dropdown-menu">
46
                                                <ul id="sub[% languages_loo.rfc4646_subtag %]" class="dropdown-menu">
46
                                                    [% FOREACH sublanguages_loo IN languages_loo.sublanguages_loop %]
47
                                                    [% FOREACH sublanguages_loo IN languages_loo.sublanguages_loop.sort('rfc4646_subtag') %]
47
                                                        [% IF ( sublanguages_loo.enabled ) %]
48
                                                        [% IF ( sublanguages_loo.enabled ) %]
48
                                                            [% IF ( sublanguages_loo.sublanguage_current ) %]
49
                                                            [% IF ( sublanguages_loo.sublanguage_current ) %]
49
                                                                <li> <p>[% sublanguages_loo.native_description %] [% sublanguages_loo.script_description %] [% sublanguages_loo.region_description %] [% sublanguages_loo.variant_description %] ([% sublanguages_loo.rfc4646_subtag %])</p></li>
50
                                                                <li><p>
51
                                                                [% PROCESS lang_getregion subtag = sublanguages_loo.rfc4646_subtag %] ([% sublanguages_loo.rfc4646_subtag %])</p></li>
50
                                                            [% ELSE %]
52
                                                            [% ELSE %]
51
                                                                <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>
53
                                                                <li><a href="/cgi-bin/koha/opac-changelanguage.pl?language=[% sublanguages_loo.rfc4646_subtag %]"> [% PROCESS lang_getregion subtag = sublanguages_loo.rfc4646_subtag %] ([% sublanguages_loo.rfc4646_subtag %])</a></li>
52
                                                            [% END %]
54
                                                            [% END %]
53
                                                        [% END # / IF sublanguages_loo.enabled %]
55
                                                        [% END # / IF sublanguages_loo.enabled %]
54
                                                    [% END # / FOREACH sublanguages_loo %]
56
                                                    [% END # / FOREACH sublanguages_loo %]
Lines 57-65 Link Here
57
                                    [% ELSE %]
59
                                    [% ELSE %]
58
                                        [% IF ( languages_loo.group_enabled ) %]
60
                                        [% IF ( languages_loo.group_enabled ) %]
59
                                            [% IF ( languages_loo.current ) %]
61
                                            [% IF ( languages_loo.current ) %]
60
                                                <li class="active"><p class="navbar-text">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description %][% ELSE %][% languages_loo.rfc4646_subtag %][% END %]</p></li>
62
                                                <li class="active"><p class="navbar-text">
63
                                                    [% PROCESS lang_getname subtag = languages_loo.rfc4646_subtag %]</p></li>
61
                                            [% ELSE %]
64
                                            [% ELSE %]
62
                                                <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>
65
                                                <li><a href="/cgi-bin/koha/opac-changelanguage.pl?language=[% languages_loo.rfc4646_subtag %]">
66
                                                    [% PROCESS lang_getname subtag = languages_loo.rfc4646_subtag %]</a></li>
63
                                            [% END %]
67
                                            [% END %]
64
                                        [% END # / IF languages_loo.current %]
68
                                        [% END # / IF languages_loo.current %]
65
                                    [% END # / IF ( languages_loo.plural ) %]
69
                                    [% END # / IF ( languages_loo.plural ) %]
(-)a/koha-tmpl/opac-tmpl/ccsr/en/includes/doc-head-close.inc (+2 lines)
Lines 33-38 Link Here
33
 <link rel="stylesheet" type="text/css" href="[% themelang %]/css/persona-buttons.css" />
33
 <link rel="stylesheet" type="text/css" href="[% themelang %]/css/persona-buttons.css" />
34
[% END %]
34
[% END %]
35
35
36
[% PROCESS 'language.inc' %]
37
36
<!-- yui js -->
38
<!-- yui js -->
37
<script type="text/javascript" src="[% yuipath %]/utilities/utilities.js"></script>
39
<script type="text/javascript" src="[% yuipath %]/utilities/utilities.js"></script>
38
<script type="text/javascript" src="[% yuipath %]/container/container-min.js"></script>
40
<script type="text/javascript" src="[% yuipath %]/container/container-min.js"></script>
(-)a/koha-tmpl/opac-tmpl/ccsr/en/includes/opac-bottom.inc (-6 / +6 lines)
Lines 41-58 Link Here
41
            <div id="changelanguage" class="ft">
41
            <div id="changelanguage" class="ft">
42
            <div class="lang" style="float:left;padding: 0.1em 0;"><strong>Languages:&nbsp;</strong></div>
42
            <div class="lang" style="float:left;padding: 0.1em 0;"><strong>Languages:&nbsp;</strong></div>
43
            <ul id="i18nMenu" class="footermenu">
43
            <ul id="i18nMenu" class="footermenu">
44
            [% FOREACH languages_loo IN languages_loop %]
44
            [% FOREACH languages_loo IN languages_loop.sort('rfc4646_subtag') %]
45
45
46
                [% IF ( languages_loo.group_enabled ) %]
46
                [% IF ( languages_loo.group_enabled ) %]
47
                [% IF ( languages_loo.plural ) %]
47
                [% IF ( languages_loo.plural ) %]
48
                <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 %]">
48
                <li class="more" style="float:left;"><a class="sublangs" id="show[% languages_loo.rfc4646_subtag %]" href="#">[%- PROCESS lang_getname subtag = languages_loo.rfc4646_subtag -%]</a><div id="sub[% languages_loo.rfc4646_subtag %]">
49
                <div class="bd"><ul>
49
                <div class="bd"><ul>
50
                [% FOREACH sublanguages_loo IN languages_loo.sublanguages_loop %]
50
                [% FOREACH sublanguages_loo IN languages_loo.sublanguages_loop %]
51
            [% IF ( sublanguages_loo.enabled ) %]
51
            [% IF ( sublanguages_loo.enabled ) %]
52
                    [% IF ( sublanguages_loo.sublanguage_current ) %]
52
                    [% IF ( sublanguages_loo.sublanguage_current ) %]
53
                        <li> [% sublanguages_loo.native_description %] [% sublanguages_loo.script_description %] [% sublanguages_loo.region_description %] [% sublanguages_loo.variant_description %] ([% sublanguages_loo.rfc4646_subtag %])</li>
53
                        <li> [%- PROCESS lang_getregion subtag = sublanguages_loo.rfc4646_subtag -%] ([% sublanguages_loo.rfc4646_subtag %])</li>
54
                    [% ELSE %]
54
                    [% ELSE %]
55
                    <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>
55
                    <li><a href="/cgi-bin/koha/opac-changelanguage.pl?language=[% sublanguages_loo.rfc4646_subtag %]"> [%- PROCESS lang_getregion subtag = sublanguages_loo.rfc4646_subtag -%] ([% sublanguages_loo.rfc4646_subtag %])</a></li>
56
            [% END %]
56
            [% END %]
57
                    [% END %]
57
                    [% END %]
58
58
Lines 62-70 Link Here
62
                [% ELSE %]
62
                [% ELSE %]
63
                [% IF ( languages_loo.group_enabled ) %]
63
                [% IF ( languages_loo.group_enabled ) %]
64
                    [% IF ( languages_loo.current ) %]
64
                    [% IF ( languages_loo.current ) %]
65
                        <li style="float:left;">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description %][% ELSE %][% languages_loo.rfc4646_subtag %][% END %]</li>
65
                        <li style="float:left;">[%- PROCESS lang_getname subtag = languages_loo.rfc4646_subtag -%]</li>
66
                    [% ELSE %]
66
                    [% ELSE %]
67
                        <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>
67
                        <li style="float:left;"><a href="/cgi-bin/koha/opac-changelanguage.pl?language=[% languages_loo.rfc4646_subtag %]">[%- PROCESS lang_getname subtag = languages_loo.rfc4646_subtag -%]</a></li>
68
                    [% END %]
68
                    [% END %]
69
            [% END %]
69
            [% END %]
70
                [% END %]
70
                [% END %]
(-)a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc (+3 lines)
Lines 27-32 Link Here
27
[% IF ( bidi ) %]
27
[% IF ( bidi ) %]
28
    <link rel="stylesheet" type="text/css" href="[% themelang %]/css/right-to-left.css" />
28
    <link rel="stylesheet" type="text/css" href="[% themelang %]/css/right-to-left.css" />
29
[% END %]
29
[% END %]
30
31
[% PROCESS 'language.inc' %]
32
30
<style id="region-opacusercss" type="text/css">[% OPACUserCSS %]</style>
33
<style id="region-opacusercss" type="text/css">[% OPACUserCSS %]</style>
31
<!-- yui js --> 
34
<!-- yui js --> 
32
<script type="text/javascript" src="[% yuipath %]/utilities/utilities.js"></script> 
35
<script type="text/javascript" src="[% yuipath %]/utilities/utilities.js"></script> 
(-)a/koha-tmpl/opac-tmpl/prog/en/includes/language.inc (+114 lines)
Line 0 Link Here
1
[%- BLOCK decompose_subtag -%]
2
[%- IF ( matches = subtag.match('^(\w+)$')) -%]
3
        [%- SET lang   = subtag    -%]
4
        [%- SET script = ''        -%]
5
        [%- IF ( lang == 'en' )    -%]
6
        [%- SET region = 'US'      -%]
7
        [%- ELSE                   -%]
8
        [%- SET region = ''        -%]
9
        [%- END                    -%]
10
[%- ELSIF ( matches = subtag.match('^(\w+)-(\w+)$')) -%]
11
        [%- SET lang   = matches.0 -%]
12
    [%- IF matches.1.length == 2   -%]
13
        [%- SET script = ''        -%]
14
        [%- SET region = matches.1 -%]
15
    [%- ELSE                       -%]
16
        [%- SET script = matches.1 -%]
17
        [%- SET region = ''        -%]
18
    [%- END                        -%]
19
[%- ELSIF ( matches = subtag.match('^(\w+)-(\w+)-(\w+)$')) -%]
20
        [%- SET lang   = matches.0 -%]
21
        [%- SET script = matches.1 -%]
22
        [%- SET region = matches.2 -%]
23
[%- END -%]
24
[%- END -%]
25
26
[%- BLOCK lang_description -%]
27
[%- PROCESS decompose_subtag subtag = subtag -%]
28
[%- PROCESS lang_name lang = lang %] [% PROCESS lang_script script = script %] [% PROCESS lang_region region = region -%]
29
[%- END -%]
30
31
[%- BLOCK lang_getregion -%]
32
[%- PROCESS decompose_subtag subtag = subtag -%]
33
[%- PROCESS lang_region region = region -%]
34
[%- END -%]
35
36
[%- BLOCK lang_getname -%]
37
[%- PROCESS decompose_subtag subtag = subtag -%]
38
[%- PROCESS lang_name lang = lang %]
39
[%- END -%]
40
41
[%- BLOCK lang_name -%]
42
[%- SWITCH lang -%]
43
  [%- CASE 'ar' -%]<span>Arabic</span>
44
  [%- CASE 'hy' -%]<span>Armenian</span>
45
  [%- CASE 'bg' -%]<span>Bulgarian</span>
46
  [%- CASE 'ca' -%]<span>Catalan</span>
47
  [%- CASE 'zh' -%]<span>Chinese</span>
48
  [%- CASE 'cs' -%]<span>Czech</span>
49
  [%- CASE 'da' -%]<span>Danish</span>
50
  [%- CASE 'nl' -%]<span>Dutch</span>
51
  [%- CASE 'en' -%]<span>English</span>
52
  [%- CASE 'fi' -%]<span>Finnish</span>
53
  [%- CASE 'fr' -%]<span>French</span>
54
  [%- CASE 'gl' -%]<span>Galician</span>
55
  [%- CASE 'de' -%]<span>German</span>
56
  [%- CASE 'el' -%]<span>Greek</span>
57
  [%- CASE 'he' -%]<span>Hebrew</span>
58
  [%- CASE 'hi' -%]<span>Hindi</span>
59
  [%- CASE 'hu' -%]<span>Hungarian</span>
60
  [%- CASE 'id' -%]<span>Indonesian</span>
61
  [%- CASE 'it' -%]<span>Italian</span>
62
  [%- CASE 'ja' -%]<span>Japanese</span>
63
  [%- CASE 'ko' -%]<span>Korean</span>
64
  [%- CASE 'lo' -%]<span>Lao</span>
65
  [%- CASE 'la' -%]<span>Latin</span>
66
  [%- CASE 'nb' -%]<span>Norwegian bokmål</span>
67
  [%- CASE 'nn' -%]<span>Norwegian nynorsk</span>
68
  [%- CASE 'fa' -%]<span>Persian</span>
69
  [%- CASE 'pl' -%]<span>Polish</span>
70
  [%- CASE 'pt' -%]<span>Portuguese</span>
71
  [%- CASE 'ro' -%]<span>Romanian</span>
72
  [%- CASE 'ru' -%]<span>Russian</span>
73
  [%- CASE 'sr' -%]<span>Serbian</span>
74
  [%- CASE 'es' -%]<span>Spanish</span>
75
  [%- CASE 'sv' -%]<span>Swedish</span>
76
  [%- CASE 'tet' -%]<span>Tetum</span>
77
  [%- CASE 'th' -%]<span>Thai</span>
78
  [%- CASE 'tr' -%]<span>Turkish</span>
79
  [%- CASE 'uk' -%]<span>Ukranian</span>
80
  [%- CASE 'ur' -%]<span>Urdu</span>
81
  [%- CASE -%][%- lang -%]
82
[%- END -%]
83
[%- END -%]
84
85
[%- BLOCK lang_script -%]
86
[%- SWITCH script -%]
87
  [%- CASE 'Arab' -%]<span>Arabic</span>
88
  [%- CASE 'Cyrl' -%]<span>Cyrillic</span>
89
  [%- CASE 'Grek' -%]<span>Greek</span>
90
  [%- CASE 'Hans' -%]<span>Han (Simplified variant)</span>
91
  [%- CASE 'Hant' -%]<span>Han (Traditional variant)</span>
92
  [%- CASE 'Hebr' -%]<span>Hebrew</span>
93
  [%- CASE 'Laoo' -%]<span>Lao</span>
94
  [%- CASE -%][% script %]
95
[%- END -%]
96
[%- END -%]
97
98
[%- BLOCK lang_region -%]
99
[%- SWITCH region -%]
100
  [%- CASE 'CA' -%]<span>Canada</span>
101
  [%- CASE 'DK' -%]<span>Denmark</span>
102
  [%- CASE 'ES' -%]<span>Spain</span>
103
  [%- CASE 'FR' -%]<span>France</span>
104
  [%- CASE 'GR' -%]<span>Greece</span>
105
  [%- CASE 'NZ' -%]<span>New Zealand</span>
106
  [%- CASE 'GB' -%]<span>United Kingdom</span>
107
  [%- CASE 'US' -%]<span>United States</span>
108
  [%- CASE 'TW' -%]<span>Taiwan</span>
109
  [%- CASE 'CN' -%]<span>China</span>
110
  [%- CASE -%][% region %]
111
[%- END -%]
112
[%- END -%]
113
114
(-)a/koha-tmpl/opac-tmpl/prog/en/includes/opac-bottom.inc (-7 / +6 lines)
Lines 9-26 Link Here
9
            <div id="changelanguage" class="ft">
9
            <div id="changelanguage" class="ft">
10
            <div class="lang"><strong>Languages:&nbsp;</strong></div>
10
            <div class="lang"><strong>Languages:&nbsp;</strong></div>
11
            <ul id="i18nMenu" class="footermenu">
11
            <ul id="i18nMenu" class="footermenu">
12
            [% FOREACH languages_loo IN languages_loop %]
12
            [% FOREACH languages_loo IN languages_loop.sort('rfc4646_subtag') %]
13
13
14
                [% IF ( languages_loo.group_enabled ) %]
14
                [% IF ( languages_loo.group_enabled ) %]
15
                [% IF ( languages_loo.plural ) %]
15
                [% IF ( languages_loo.plural ) %]
16
                <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 %]">
16
                <li class="more"><a class="sublangs" id="show[% languages_loo.rfc4646_subtag %]" href="#">[%- PROCESS lang_getname subtag = languages_loo.rfc4646_subtag -%]</a><div id="sub[% languages_loo.rfc4646_subtag %]">
17
                <div class="bd"><ul>
17
                <div class="bd"><ul>
18
                [% FOREACH sublanguages_loo IN languages_loo.sublanguages_loop %]
18
                [% FOREACH sublanguages_loo IN languages_loo.sublanguages_loop %]
19
            [% IF ( sublanguages_loo.enabled ) %]
19
            [% IF ( sublanguages_loo.enabled ) %]
20
                    [% IF ( sublanguages_loo.sublanguage_current ) %]
20
                    [% IF ( sublanguages_loo.sublanguage_current ) %]
21
                        <li> [% sublanguages_loo.native_description %] [% sublanguages_loo.script_description %] [% sublanguages_loo.region_description %] [% sublanguages_loo.variant_description %] ([% sublanguages_loo.rfc4646_subtag %])</li>
21
                        <li> [%- PROCESS lang_getregion subtag = sublanguages_loo.rfc4646_subtag -%] ([% sublanguages_loo.rfc4646_subtag %])</li>
22
                    [% ELSE %]
22
                    [% ELSE %]
23
                    <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>
23
                    <li><a href="/cgi-bin/koha/opac-changelanguage.pl?language=[% sublanguages_loo.rfc4646_subtag %]"> [%- PROCESS lang_getregion subtag = sublanguages_loo.rfc4646_subtag -%] ([% sublanguages_loo.rfc4646_subtag %])</a></li>
24
            [% END %]
24
            [% END %]
25
                    [% END %]
25
                    [% END %]
26
26
Lines 30-38 Link Here
30
                [% ELSE %]
30
                [% ELSE %]
31
                [% IF ( languages_loo.group_enabled ) %]
31
                [% IF ( languages_loo.group_enabled ) %]
32
                    [% IF ( languages_loo.current ) %]
32
                    [% IF ( languages_loo.current ) %]
33
                        <li class="morelang">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description %][% ELSE %][% languages_loo.rfc4646_subtag %][% END %]</li>
33
                        <li class="morelang">[%- PROCESS lang_getname subtag = languages_loo.rfc4646_subtag -%]</li>
34
                    [% ELSE %]
34
                    [% ELSE %]
35
                        <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>
35
                        <li class="morelang"><a href="/cgi-bin/koha/opac-changelanguage.pl?language=[% languages_loo.rfc4646_subtag %]">[%- PROCESS lang_getname subtag = languages_loo.rfc4646_subtag -%]</a></li>
36
                    [% END %]
36
                    [% END %]
37
            [% END %]
37
            [% END %]
38
                [% END %]
38
                [% END %]
39
- 

Return to bug 12017