From 4312278b75a3c1bd56c2365c2570c7da18943cfa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come@opensides.be>
Date: Tue, 24 Apr 2018 11:20:26 +0200
Subject: [PATCH] :ambulance: fix(Language) Removed unused option and related
dead code
issue #5820
---
include/class_Language.inc | 21 +++++----------------
1 file changed, 5 insertions(+), 16 deletions(-)
diff --git a/include/class_Language.inc b/include/class_Language.inc
index 0f91eeee6..192d50a2a 100644
--- a/include/class_Language.inc
+++ b/include/class_Language.inc
@@ -127,11 +127,9 @@ class Language
/*!
* \brief Get the language for the user connecting
*
- * \param boolean $languages_in_own_language FALSE
- *
- * \param boolean $strip_region_tag FALSE
+ * \param boolean $ownLanguage Should language names be stated in their own language as well
*/
- public static function list($languages_in_own_language = FALSE, $strip_region_tag = FALSE)
+ public static function list($ownLanguage = FALSE)
{
/* locales in english */
$tmp_english = array(
@@ -166,7 +164,7 @@ class Language
);
$ret = array();
- if ($languages_in_own_language) {
+ if ($ownLanguage) {
/* locales in their own language */
$tmp_ownlang = array(
'en_US' => 'English',
@@ -200,20 +198,11 @@ class Language
);
foreach ($tmp_english as $key => $name) {
- $label = _($name)." (".$tmp_ownlang[$key].")";
- if ($strip_region_tag) {
- $ret[preg_replace("/^([^_]*).*$/", "\\1", $key)] = $label;
- } else {
- $ret[$key] = $label;
- }
+ $ret[$key] = _($name).' ('.$tmp_ownlang[$key].')';
}
} else {
foreach ($tmp_english as $key => $name) {
- if ($strip_region_tag) {
- $ret[preg_replace("/^([^_]*).*/", "\\1", $key)] = _($name);
- } else {
- $ret[$key] = _($name);
- }
+ $ret[$key] = _($name);
}
}
--
GitLab