Paul Vriens : transl: Don't show English(US) as a sublanguage of English( Neutral).
Alexandre Julliard
julliard at winehq.org
Thu Jul 23 09:42:40 CDT 2009
Module: tools
Branch: master
Commit: d146316c353e706d6d7ada2ad12335eeb990f9e8
URL: http://source.winehq.org/git/tools.git/?a=commit;h=d146316c353e706d6d7ada2ad12335eeb990f9e8
Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date: Thu Jul 23 09:33:30 2009 +0200
transl: Don't show English(US) as a sublanguage of English(Neutral).
---
transl/php/lib.php | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/transl/php/lib.php b/transl/php/lib.php
index b293ec2..48ea48b 100644
--- a/transl/php/lib.php
+++ b/transl/php/lib.php
@@ -105,14 +105,16 @@ function get_sublangs($id)
{
if (preg_match("/:00/", $id))
{
+ global $MASTER_LANGUAGE;
global $LOCALE_NAMES;
enum_locale_names();
$base = preg_replace("/:00/", "", $id);
$sublangs = array();
foreach ($LOCALE_NAMES as $key => $value)
- if (preg_match("/$base/", $key) && ($key != $id))
- $sublangs[] = $key;
+ if (preg_match("/$base/", $key) && ($key != $id) && ($key != $MASTER_LANGUAGE))
+ $sublangs[$key] = $value;
+ asort($sublangs);
return $sublangs;
}
else
@@ -131,7 +133,7 @@ function show_sublangs($id)
echo "<table>\n";
echo "<tr><th>Sublanguage</th></tr>\n";
$sublangs = get_sublangs($id);
- foreach ($sublangs as $key)
+ foreach ($sublangs as $key => $value)
{
echo "<tr><td>".gen_lang_a($key).get_lang_name($key)."</a></td></tr>";
}
More information about the wine-cvs
mailing list