Revert "bug-1280: Handle more different types of "languages":"
authorMichael Tänzer <neo@nhng.de>
Sat, 21 Jun 2014 15:37:53 +0000 (17:37 +0200)
committerMichael Tänzer <neo@nhng.de>
Sat, 21 Jun 2014 15:37:53 +0000 (17:37 +0200)
This reverts commit 0730c9df3eb440205d7963e3c0762765d9b47031.

includes/lib/l10n.php
pages/wot/9.php

index 468562c..85b7aff 100644 (file)
@@ -64,7 +64,7 @@ class L10n {
         * 
         * @var array(string => string)
         */
-       public static $locales = array(
+       private static $locales = array(
                                "ar" => "ar_JO",
                                "bg" => "bg_BG",
                                "cs" => "cs_CZ",
index d04c4fa..94523f2 100644 (file)
   <tr>
     <td class="DataTD"><?=_("Language")?>:</td>
     <?
-       $parts = explode("_", $userlang ,2);
-       if(count($parts == 2)){
-               $printlang = array_search( strtolower($parts[0])."_".strtoupper($parts[1]), L10n::$locales);
-               if($printlang === false){
-                       $printlang = $parts[0];
-               }
-       }else{
-               $printlang = strtolower($parts[0]);
-       }
+    $parts = explode("_", $userlang ,2);
+    $printlang = strtolower($parts[0]);
     ?>
     <td class="DataTD" align="left"><? printf(_("%s prefers to be contacted in %s"), sanitizeHTML($user['fname']), L10n::$translations[$printlang]) ?></td>
   </tr>