X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fi18n.php;h=01f90a2cb9418c709fc654a91f71a9fcab7691fc;hb=856b2ee25a1cd7e05dd5ccdbe9d0e4744673351a;hp=64f094c8a0ed1e1b892a49771e5861a3103df622;hpb=5c920668d71d6d2c89ddb35cbb57713c67141e3b;p=squirrelmail.git

diff --git a/functions/i18n.php b/functions/i18n.php
index 64f094c8..01f90a2c 100644
--- a/functions/i18n.php
+++ b/functions/i18n.php
@@ -702,27 +702,29 @@ function set_up_language($sm_language, $do_search = false) {
     if ($do_search && ! $sm_language && isset($HTTP_ACCEPT_LANGUAGE)) {
         $sm_language = substr($HTTP_ACCEPT_LANGUAGE, 0, 2);
     }
+    
     if (!$sm_language && isset($squirrelmail_default_language)) {
         $squirrelmail_language = $squirrelmail_default_language;
+        $sm_language = $squirrelmail_default_language;
     }
     $sm_notAlias = $sm_language;
     while (isset($languages[$sm_notAlias]['ALIAS'])) {
         $sm_notAlias = $languages[$sm_notAlias]['ALIAS'];
     }
 
-    if ( isset($sm_language) && 
+    if ( isset($sm_language) &&
          $use_gettext &&
          $sm_language != '' &&
          isset($languages[$sm_notAlias]['CHARSET']) ) {
         bindtextdomain( 'squirrelmail', '../locale/' );
-        textdomain( 'squirrelmail' );         
-        if ( !ini_get('safe_mode') && 
+        textdomain( 'squirrelmail' );
+        if ( !ini_get('safe_mode') &&
              getenv( 'LC_ALL' ) != $sm_notAlias ) {
             putenv( "LC_ALL=$sm_notAlias" );
             putenv( "LANG=$sm_notAlias" );
             putenv( "LANGUAGE=$sm_notAlias" );
         }
-        setlocale('LC_ALL', $sm_notAlias);
+        setlocale(LC_ALL, $sm_notAlias);
         $squirrelmail_language = $sm_notAlias;
         header( 'Content-Type: text/html; charset=' . $languages[$sm_notAlias]['CHARSET'] );
     }
@@ -740,7 +742,7 @@ function set_my_charset(){
      * message blindly with the system-wide $default_charset.
      */
     global $data_dir, $username, $default_charset, $languages;
-    
+
     $my_language = getPref($data_dir, $username, 'language');
     if (!$my_language) {
         return;
@@ -838,8 +840,8 @@ $languages['nl']['ALIAS'] = 'nl_NL';
 $languages['no_NO']['NAME']    = 'Norwegian (Bokmål)';
 $languages['no_NO']['CHARSET'] = 'iso-8859-1';
 $languages['no']['ALIAS'] = 'no_NO';
-$languages['no_NO_ny']['NAME']    = 'Norwegian (Nynorsk)';
-$languages['no_NO_ny']['CHARSET'] = 'iso-8859-1';
+$languages['nn_NO']['NAME']    = 'Norwegian (Nynorsk)';
+$languages['nn_NO']['CHARSET'] = 'iso-8859-1';
 
 $languages['pl_PL']['NAME']    = 'Polish';
 $languages['pl_PL']['CHARSET'] = 'iso-8859-2';
@@ -855,9 +857,9 @@ $languages['ru_RU']['NAME']    = 'Russian';
 $languages['ru_RU']['CHARSET'] = 'koi8-r';
 $languages['ru']['ALIAS'] = 'ru_RU';
 
-$languages['sr']['NAME']    = 'Serbian';
-$languages['sr']['CHARSET'] = 'iso-8859-2';
-$languages['sr_YU']['ALIAS'] = 'sr';
+$languages['sr_YU']['NAME']    = 'Serbian';
+$languages['sr_YU']['CHARSET'] = 'iso-8859-2';
+$languages['sr']['ALIAS'] = 'sr_YU';
 
 $languages['sv_SE']['NAME']    = 'Swedish';
 $languages['sv_SE']['CHARSET'] = 'iso-8859-1';
@@ -936,4 +938,4 @@ elseif ($gettext_flags == 0) {
     }
 }
 
-?>
\ No newline at end of file
+?>