In opac-search.pl and search.pl, this patch moves the $lang variable from the
end to the begining of the script, and use it as a parameter of getAllLanguages
method.
To test, set your opac and staff interface in english and in other languages
and check search.pl and opac-search.pl :
- If language names in your languages_description table are translated in the
same language you use for your GUI, the language names in dropdown list will be
translated in this language (+native name).
- If your GUI is in english, or in a language into which languages names are
not translated in languages_description, the dropdown list will stay in english
(+native name).
---
catalogue/search.pl | 5 ++---
opac/opac-search.pl | 5 ++---
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/catalogue/search.pl b/catalogue/search.pl
index 8b1234b..d1a3ca2 100755
--- a/catalogue/search.pl
+++ b/catalogue/search.pl
@@ -158,7 +158,7 @@ use CGI qw('-no_undef_params');
my $cgi = new CGI;
my ($template,$borrowernumber,$cookie);
-
+my $lang = C4::Templates::getlanguage($cgi, 'intranet');
# decide which template to use
my $template_name;
my $template_type;
@@ -334,7 +334,7 @@ if ( $template_type eq 'advsearch' ) {
search_boxes_loop => \@search_boxes_array);
# load the language limits (for search)
- my $languages_limit_loop = getAllLanguages();
+ my $languages_limit_loop = getAllLanguages($lang);
$template->param(search_languages_loop => $languages_limit_loop,);
# Expanded search options in advanced search:
@@ -472,7 +472,6 @@ my (
$error,$query,$simple_query,$query_cgi,$query_desc,$limit,$limit_cgi,$limit
my @results;
## I. BUILD THE QUERY
-my $lang = C4::Templates::getlanguage($cgi, 'intranet');
(
$error,$query,$simple_query,$query_cgi,$query_desc,$limit,$limit_cgi,$limit_desc,$stopwords_removed,$query_type)
= buildQuery(\@operators,\@operands,\@indexes,\@limits,\@sort_by,$scan,$lang);
## parse the query_cgi string and put it into a form suitable for <input>s
diff --git a/opac/opac-search.pl b/opac/opac-search.pl
index 7677d86..73d2c53 100755
--- a/opac/opac-search.pl
+++ b/opac/opac-search.pl
@@ -71,7 +71,7 @@ BEGIN {
}
my ($template,$borrowernumber,$cookie);
-
+my $lang = C4::Templates::getlanguage($cgi, 'opac');
# decide which template to use
my $template_name;
my $template_type = 'basic';
@@ -178,7 +178,7 @@ $template->param(
);
# load the language limits (for search)
-my $languages_limit_loop = getAllLanguages();
+my $languages_limit_loop = getAllLanguages($lang);
$template->param(search_languages_loop => $languages_limit_loop,);
# load the Type stuff
@@ -418,7 +418,6 @@ my
($error,$query,$simple_query,$query_cgi,$query_desc,$limit,$limit_cgi,$limit_
my @results;
## I. BUILD THE QUERY
-my $lang = C4::Templates::getlanguage($cgi, 'opac');
(
$error,$query,$simple_query,$query_cgi,$query_desc,$limit,$limit_cgi,$limit_desc,$stopwords_removed,$query_type)
= buildQuery(\@operators,\@operands,\@indexes,\@limits,\@sort_by, 0, $lang);
sub _input_cgi_parse {
--
1.7.9.5
--
Mathieu Saby
Service d'Informatique Documentaire
Service Commun de Documentation
Université Rennes 2
Téléphone : 02 99 14 12 65
Courriel : [email protected]
_______________________________________________
Koha-patches mailing list
[email protected]
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/
