Bug 11030 - Add 359, 947 and 969 fields in french unimarc_complete framework - followup

[koha_fer] / C4 / Templates.pm

diff --git a/C4/Templates.pm b/C4/Templates.pm
index 2d2304f..b326f53 100644 (file)
--- a/C4/Templates.pm
+++ b/C4/Templates.pm
@@ -163,20 +163,6 @@ sub utf8_hashref {
         utf8::encode($hashref->{$key}) if utf8::is_utf8($hashref->{$key});
     }
 }
-        
-        
-# FIXME - this is a horrible hack to cache
-# the current known-good language, temporarily
-# put in place to resolve bug 4403.  It is
-# used only by C4::XSLT::XSLTParse4Display;
-# the language is set via the usual call
-# to themelanguage.
-my $_current_language = 'en';
-
-sub _current_language {
-    return $_current_language;
-}
-
 
 # wrapper method to allow easier transition from HTML template pro to Template Toolkit
 sub param {
@@ -253,10 +239,13 @@ sub gettemplate {
 #        lang      => $lang
 #    );
 
-    # Bidirectionality
+    # Bidirectionality, must be sent even if is the only language
     my $current_lang = regex_lang_subtags($lang);
     my $bidi;
     $bidi = get_bidi($current_lang->{script}) if $current_lang->{script};
+    $template->param(
+            bidi                 => $bidi,
+    );
     # Languages
     my $languages_loop = getTranslatedLanguages($interface,$theme,$lang);
     my $num_languages_enabled = 0;
@@ -265,11 +254,11 @@ sub gettemplate {
             $num_languages_enabled++ if $sublang->{enabled};
          }
     }
+    my $one_language_enabled = ($num_languages_enabled <= 1) ? 1 : 0; # deal with zero enabled langs as well
     $template->param(
             languages_loop       => $languages_loop,
-            bidi                 => $bidi,
-            one_language_enabled => ($num_languages_enabled <= 1) ? 1 : 0, # deal with zero enabled langs as well
-    ) unless @$languages_loop<2;
+            one_language_enabled => $one_language_enabled,
+    ) unless $one_language_enabled;
 
     return $template;
 }
@@ -282,7 +271,7 @@ sub themelanguage {
     ($query) or warn "no query in themelanguage";
 
     # Select a language based on cookie, syspref available languages & browser
-    my $lang = getlanguage($query, $interface);
+    my $lang = C4::Languages::getlanguage($query);
 
     # Select theme
     my $is_intranet = $interface eq 'intranet';
@@ -293,7 +282,6 @@ sub themelanguage {
     # Try to find first theme for the selected language
     for my $theme (@themes) {
         if ( -e "$htdocs/$theme/$lang/modules/$tmpl" ) {
-            $_current_language = $lang;
             return ($theme, $lang, \@themes)
         }
     }
@@ -304,6 +292,7 @@ sub themelanguage {
 
 sub setlanguagecookie {
     my ( $query, $language, $uri ) = @_;
+
     my $cookie = $query->cookie(
         -name    => 'KohaOpacLanguage',
         -value   => $language,
@@ -336,52 +325,4 @@ sub getlanguagecookie {
     return $cookie;
 }
 
-=head2 getlanguage
-
-    Select a language based on the URL parameter 'language', a cookie,
-    syspref available languages & browser
-
-=cut
-
-sub getlanguage {
-    my ($query, $interface) = @_;
-
-    my $preference_to_check =
-      $interface eq 'intranet' ? 'language' : 'opaclanguages';
-    # Get the available/valid languages list
-    my @languages = split /,/, C4::Context->preference($preference_to_check);
-
-    my $lang;
-
-    # Chose language from the URL
-    $lang = $query->param( 'language' );
-    if ( defined $lang && any { $_ eq $lang } @languages) {
-        return $lang;
-    }
-
-    # cookie
-    if ($query and $query->cookie('KohaOpacLanguage') ) {
-        $lang = $query->cookie('KohaOpacLanguage');
-        $lang =~ s/[^a-zA-Z_-]*//; # sanitize cookie
-    }
-
-    # HTTP_ACCEPT_LANGUAGE
-    if ( !$lang && $ENV{HTTP_ACCEPT_LANGUAGE} ) {
-        $lang = accept_language( $ENV{HTTP_ACCEPT_LANGUAGE},
-            getTranslatedLanguages( $interface, 'prog' ) );
-    }
-
-    # Ignore a lang not selected in sysprefs
-    if ( $lang && any { $_ eq $lang } @languages ) {
-        return $lang;
-    }
-
-    # Pick the first selected syspref language
-    $lang = shift @languages;
-    return $lang if $lang;
-
-    # Fall back to English if necessary
-    return 'en';
-}
-
 1;