projects
/
koha_gimpoz
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'koha_gimpoz' of /srv/koha/ into koha_gimpoz
[koha_gimpoz]
/
C4
/
Templates.pm
diff --git
a/C4/Templates.pm
b/C4/Templates.pm
index
7585727
..
d6e3ce4
100644
(file)
--- a/
C4/Templates.pm
+++ b/
C4/Templates.pm
@@
-4,7
+4,7
@@
use strict;
use warnings;
use Carp;
use CGI;
use warnings;
use Carp;
use CGI;
-use List::
Util qw/first
/;
+use List::
MoreUtils qw/any
/;
# Copyright 2009 Chris Cormack and The Koha Dev Team
#
# Copyright 2009 Chris Cormack and The Koha Dev Team
#
@@
-53,11
+53,13
@@
sub new {
else {
$htdocs = C4::Context->config('intrahtdocs');
}
else {
$htdocs = C4::Context->config('intrahtdocs');
}
-
my ($theme, $lang)= themelanguage( $htdocs, $tmplbase, $interface, $query);
my $template = Template->new(
{ EVAL_PERL => 1,
ABSOLUTE => 1,
my ($theme, $lang)= themelanguage( $htdocs, $tmplbase, $interface, $query);
my $template = Template->new(
{ EVAL_PERL => 1,
ABSOLUTE => 1,
+ PLUGIN_BASE => 'Koha::Template::Plugin',
+ COMPILE_EXT => C4::Context->config('template_cache_dir')?'.ttc':'',
+ COMPILE_DIR => C4::Context->config('template_cache_dir')?C4::Context->config('template_cache_dir'):'',,
INCLUDE_PATH => [
"$htdocs/$theme/$lang/includes",
"$htdocs/$theme/en/includes"
INCLUDE_PATH => [
"$htdocs/$theme/$lang/includes",
"$htdocs/$theme/en/includes"
@@
-311,9
+313,9
@@
sub getlanguage {
my ($query, $interface) = @_;
# Select a language based on cookie, syspref available languages & browser
my ($query, $interface) = @_;
# Select a language based on cookie, syspref available languages & browser
- my $
is_intranet = $interface eq 'intranet';
- my @languages = split(",", C4::Context->preference(
-
$is_intranet ? 'language' : 'opaclanguages')
);
+ my $
preference_to_check =
+ $interface eq 'intranet' ? 'language' : 'opaclanguages';
+
my @languages = split /,/, C4::Context->preference($preference_to_check
);
my $lang;
my $lang;
@@
-324,20
+326,18
@@
sub getlanguage {
}
# HTTP_ACCEPT_LANGUAGE
}
# HTTP_ACCEPT_LANGUAGE
- unless ($lang) {
- my $http_accept_language = $ENV{ HTTP_ACCEPT_LANGUAGE };
- $lang = accept_language( $http_accept_language,
- getTranslatedLanguages($interface,'prog') );
+ if ( !$lang && $ENV{HTTP_ACCEPT_LANGUAGE} ) {
+ $lang = accept_language( $ENV{HTTP_ACCEPT_LANGUAGE},
+ getTranslatedLanguages( $interface, 'prog' ) );
}
# Ignore a lang not selected in sysprefs
}
# Ignore a lang not selected in sysprefs
- $lang = undef unless first { $_ eq $lang } @languages;
+ if ( $lang && any { $_ eq $lang } @languages ) {
+ return $lang;
+ }
# Fall back to English if necessary
# Fall back to English if necessary
- $lang = 'en' unless $lang;
-
- return $lang;
+ return 'en';
}
1;
}
1;
-