[Koha-patches] [PATCH] [followup](bug #3754) couldn't choose the language

[Nahuel ANGELINETTI]

This fix, when the user has choosen his language.
---
 C4/Output.pm |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/C4/Output.pm b/C4/Output.pm
index 30b61d3..087ebdd 100644
--- a/C4/Output.pm
+++ b/C4/Output.pm
@@ -138,7 +138,12 @@ sub themelanguage {
     my $lang;
     my $http_accept_language = $ENV{ HTTP_ACCEPT_LANGUAGE };
     # But, if there's a cookie set, obey it
-    $lang = $query->cookie('KohaOpacLanguage') if $query->cookie('KohaOpacLanguage');
+    if ($query->cookie('KohaOpacLanguage')){
+        $lang = $query->cookie('KohaOpacLanguage');
+    }elsif($http_accept_language){
+        $lang = accept_language( $http_accept_language,
+              getTranslatedLanguages($interface,'prog') );
+    }
     # Fall back to English
     my @languages;
     if ($interface eq 'intranet') {
@@ -146,9 +151,6 @@ sub themelanguage {
     } else {
         @languages = split ",", C4::Context->preference("opaclanguages");
     }
-    $lang = accept_language( $http_accept_language,
-              getTranslatedLanguages($interface,'prog') )
-      if $http_accept_language;
 
     if (grep(/^$lang$/, @languages)){
         @languages=($lang, at languages);
-- 
1.6.3.3