Bugzilla – Attachment 39644 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: followup to patch 5
Bug-12017-followup-to-patch-5.patch (text/plain), 4.45 KB, created by
Bernardo Gonzalez Kriegel
on 2015-05-28 16:41:36 UTC
(
hide
)
Description:
Bug 12017: followup to patch 5
Filename:
MIME Type:
Creator:
Bernardo Gonzalez Kriegel
Created:
2015-05-28 16:41:36 UTC
Size:
4.45 KB
patch
obsolete
>From ba16af50fd98ca6d87165037a5eba78aac895ae1 Mon Sep 17 00:00:00 2001 >From: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> >Date: Thu, 28 May 2015 13:31:52 -0300 >Subject: [PATCH] Bug 12017: followup to patch 5 > >Local use syspref of type language need to use a different >variable to store languages, if not bottom language selector >does not show. > >Also change multiple and selected attributes for >XHTML compatibility, and a tab char > >To test: >1) Apply patch 5 and this one >2) On add/edit Language type Local use syspref, >check bottom language selector shows up. >--- > admin/systempreferences.pl | 2 +- > .../prog/en/modules/admin/systempreferences.tt | 16 ++++++++-------- > .../prog/en/modules/catalogue/advsearch.tt | 2 +- > 3 files changed, 10 insertions(+), 10 deletions(-) > >diff --git a/admin/systempreferences.pl b/admin/systempreferences.pl >index 30d288f..9f5493b 100755 >--- a/admin/systempreferences.pl >+++ b/admin/systempreferences.pl >@@ -168,7 +168,7 @@ sub GetPrefParams { > > my $languages_loop = getLanguages_iso( $currently_selected_languages ); > >- $params->{'languages_loop'} = $languages_loop; >+ $params->{'pref_languages_loop'} = $languages_loop; > $params->{'type_langselector'} = 1; > } else { > $params->{'type_free'} = 1; >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 ce3b7c5..2dfb677 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt >@@ -122,11 +122,11 @@ > </select> > [% END %] > [% IF ( type_langselector ) %] >- [% IF ( languages_loop ) %] >- <select name="value" size=10 multiple > >- [% FOREACH languages_loo IN languages_loop.sort('iso639_2_code') %] >+ [% IF ( pref_languages_loop ) %] >+ <select name="value" size=10 multiple="multiple"> >+ [% FOREACH languages_loo IN pref_languages_loop.sort('iso639_2_code') %] > [% IF ( languages_loo.enabled ) %] >- <option value="[% languages_loo.iso639_2_code %]" selected > >+ <option value="[% languages_loo.iso639_2_code %]" selected="selected"> > [% ELSE %] > <option value="[% languages_loo.iso639_2_code %]" > > [% END %] >@@ -261,11 +261,11 @@ > </select> > [% END %] > [% IF ( loo.type_langselector ) %] >- [% IF ( loo.languages_loop ) %] >- <select name="value" size=10 multiple > >- [% FOREACH languages_loo IN loo.languages_loop.sort('iso639_2_code') %] >+ [% IF ( loo.pref_languages_loop ) %] >+ <select name="value" size="10" multiple="multiple"> >+ [% FOREACH languages_loo IN loo.pref_languages_loop.sort('iso639_2_code') %] > [% IF ( languages_loo.enabled ) %] >- <option value="[% languages_loo.iso639_2_code %]" selected > >+ <option value="[% languages_loo.iso639_2_code %]" selected="selected"> > [% ELSE %] > <option value="[% languages_loo.iso639_2_code %]" > > [% END %] >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 73cff59..7867350 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt >@@ -140,7 +140,7 @@ > <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.sort('iso639_2_code') %] >+ [% FOREACH search_languages_loo IN search_languages_loop.sort('iso639_2_code') %] > [% IF ( search_languages_loo.selected ) %] > <option value="ln,rtrn:[% search_languages_loo.iso639_2_code %]" selected="selected">[%- INCLUDE language_descriptions code = search_languages_loo.rfc4646_subtag t=1 -%] ([%- INCLUDE language_descriptions code = search_languages_loo.rfc4646_subtag -%])</option> > [% ELSE %] >-- >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