Commit 4312278b authored by Côme Chilliet's avatar Côme Chilliet
Browse files

:ambulance: fix(Language) Removed unused option and related dead code

issue #5820
Showing with 5 additions and 16 deletions
+5 -16
...@@ -127,11 +127,9 @@ class Language ...@@ -127,11 +127,9 @@ class Language
/*! /*!
* \brief Get the language for the user connecting * \brief Get the language for the user connecting
* *
* \param boolean $languages_in_own_language FALSE * \param boolean $ownLanguage Should language names be stated in their own language as well
*
* \param boolean $strip_region_tag FALSE
*/ */
public static function list($languages_in_own_language = FALSE, $strip_region_tag = FALSE) public static function list($ownLanguage = FALSE)
{ {
/* locales in english */ /* locales in english */
$tmp_english = array( $tmp_english = array(
...@@ -166,7 +164,7 @@ class Language ...@@ -166,7 +164,7 @@ class Language
); );
$ret = array(); $ret = array();
if ($languages_in_own_language) { if ($ownLanguage) {
/* locales in their own language */ /* locales in their own language */
$tmp_ownlang = array( $tmp_ownlang = array(
'en_US' => 'English', 'en_US' => 'English',
...@@ -200,20 +198,11 @@ class Language ...@@ -200,20 +198,11 @@ class Language
); );
foreach ($tmp_english as $key => $name) { foreach ($tmp_english as $key => $name) {
$label = _($name)." (".$tmp_ownlang[$key].")"; $ret[$key] = _($name).' ('.$tmp_ownlang[$key].')';
if ($strip_region_tag) {
$ret[preg_replace("/^([^_]*).*$/", "\\1", $key)] = $label;
} else {
$ret[$key] = $label;
}
} }
} else { } else {
foreach ($tmp_english as $key => $name) { foreach ($tmp_english as $key => $name) {
if ($strip_region_tag) { $ret[$key] = _($name);
$ret[preg_replace("/^([^_]*).*/", "\\1", $key)] = _($name);
} else {
$ret[$key] = _($name);
}
} }
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment