diff options
| author | Michael Tänzer <neo@nhng.de> | 2014-06-21 17:37:53 +0200 |
|---|---|---|
| committer | Michael Tänzer <neo@nhng.de> | 2014-06-21 17:37:53 +0200 |
| commit | 8fdd089f1f938aff06448a33ac79bd0b5cf79a4f (patch) | |
| tree | b674f197a4ca5b264c302e3f9998ff5b5a4faaa3 | |
| parent | 5118f86c68062c38c2b5cb419c526819843d2ea6 (diff) | |
| download | cacert-devel-8fdd089f1f938aff06448a33ac79bd0b5cf79a4f.tar.gz cacert-devel-8fdd089f1f938aff06448a33ac79bd0b5cf79a4f.tar.xz cacert-devel-8fdd089f1f938aff06448a33ac79bd0b5cf79a4f.zip | |
Revert "bug-1280: Handle more different types of "languages":"
This reverts commit 0730c9df3eb440205d7963e3c0762765d9b47031.
| -rw-r--r-- | includes/lib/l10n.php | 2 | ||||
| -rw-r--r-- | pages/wot/9.php | 11 |
2 files changed, 3 insertions, 10 deletions
diff --git a/includes/lib/l10n.php b/includes/lib/l10n.php index 468562c..85b7aff 100644 --- a/includes/lib/l10n.php +++ b/includes/lib/l10n.php @@ -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", diff --git a/pages/wot/9.php b/pages/wot/9.php index d04c4fa..94523f2 100644 --- a/pages/wot/9.php +++ b/pages/wot/9.php @@ -50,15 +50,8 @@ <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> |