X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=C4%2FTemplates.pm;h=2d2304f9d66e72214a0a9fcd860d64a0aba3e9b0;hb=1db56c834b297eb7fd968691f66ef3517771cba5;hp=88b9b01687ad18a55204eea1099dce6a52639eb5;hpb=fb28e0e53dd8cbfe02eb84bfe146bd1456741dde;p=koha_fer

diff --git a/C4/Templates.pm b/C4/Templates.pm
index 88b9b01687..2d2304f9d6 100644
--- a/C4/Templates.pm
+++ b/C4/Templates.pm
@@ -316,19 +316,51 @@ sub setlanguagecookie {
     );
 }
 
+=head2 getlanguagecookie
+
+    my $cookie = getlanguagecookie($query,$language);
+
+Returns a cookie object containing the calculated language to be used.
+
+=cut
+
+sub getlanguagecookie {
+    my ( $query, $language ) = @_;
+    my $cookie = $query->cookie(
+        -name    => 'KohaOpacLanguage',
+        -value   => $language,
+        -HttpOnly => 1,
+        -expires => '+3y'
+    );
+
+    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) = @_;
 
-    # Select a language based on cookie, syspref available languages & browser
     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->cookie('KohaOpacLanguage') ) {
+    if ($query and $query->cookie('KohaOpacLanguage') ) {
         $lang = $query->cookie('KohaOpacLanguage');
         $lang =~ s/[^a-zA-Z_-]*//; # sanitize cookie
     }
@@ -344,6 +376,10 @@ sub getlanguage {
         return $lang;
     }
 
+    # Pick the first selected syspref language
+    $lang = shift @languages;
+    return $lang if $lang;
+
     # Fall back to English if necessary
     return 'en';
 }