Fix language detection + update Catala localization

git-svn-id: https://svn.roundcube.net/trunk@1486 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 4 insertions, 4 deletions

diff --git a/roundcubemail/program/include/rcmail.php b/roundcubemail/program/include/rcmail.php
index b01e5fd2b..6352f80f8 100644
--- a/roundcubemail/program/include/rcmail.php
+++ b/roundcubemail/program/include/rcmail.php
@@ -181,21 +181,21 @@ class rcmail
     if (empty($rcube_languages)) {
       @include(INSTALL_PATH . 'program/localization/index.inc');
     }
-
+    
     // check if we have an alias for that language
     if (!isset($rcube_languages[$lang]) && isset($rcube_language_aliases[$lang])) {
       $lang = $rcube_language_aliases[$lang];
     }
-    
     // try the first two chars
-    else if (!isset($rcube_languages[$lang]) && strlen($lang) > 2) {
+    else if (!isset($rcube_languages[$lang])) {
       $short = $this->language_prop(substr($lang, 0, 2));
       
       // check if we have an alias for the short language code
       if (!isset($rcube_languages[$short]) && isset($rcube_language_aliases[$short])) {
         $lang = $rcube_language_aliases[$short];
       }
-      else {  // expand 'de' to 'de_DE'
+      // expand 'nn' to 'nn_NN'
+      else if (!isset($rcube_languages[$short])) {
         $lang = $short.'_'.strtoupper($short);
       }
     }