summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 426dc40)
raw | patch | inline | side by side (parent: 426dc40)
author | hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
Tue, 7 Aug 2007 10:38:36 +0000 (10:38 +0000) | ||
committer | hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
Tue, 7 Aug 2007 10:38:36 +0000 (10:38 +0000) |
git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.5@6985 594d385d-05f5-0310-b6e9-bd551577e9d8
include/functions.inc | patch | blob | history |
diff --git a/include/functions.inc b/include/functions.inc
index 9b3e05498995ac19d0b2019ca7c796c5b6e1ebfe..1b1e03b011af27f823df7e953c50d5d3b17510da 100644 (file)
--- a/include/functions.inc
+++ b/include/functions.inc
@@ -2534,7 +2534,7 @@ function get_languages($languages_in_own_language = FALSE,$strip_region_tag = FA
"fr_FR" => "French",
"it_IT" => "Italian",
"es_ES" => "Spanish",
- "en_EN" => "English",
+ "en_US" => "English",
"nl_NL" => "Dutch",
"pl_PL" => "Polish",
"sv_SE" => "Swedish",
@@ -2547,11 +2547,10 @@ function get_languages($languages_in_own_language = FALSE,$strip_region_tag = FA
foreach($tmp as $key => $name){
$lang = $key.".UTF-8";
setlocale(LC_ALL, $lang);
-
if($strip_region_tag){
- $ret[preg_replace("/^([^_]*).*$/","\\1",$key)] = _($name);
+ $ret[preg_replace("/^([^_]*).*$/","\\1",$key)] = _($name)." (".$name.")";
}else{
- $ret[$key] = _($name);
+ $ret[$key] = _($name)." (".$name.")";
}
}
setlocale(LC_ALL, $old_lang);