Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
fusiondirectory
fusiondirectory
Commits
4312278b
Commit
4312278b
authored
7 years ago
by
Côme Chilliet
Browse files
Options
Download
Patches
Plain Diff
fix(Language) Removed unused option and related dead code
issue #5820
parent
5a2c023d
dev
6342-update-the-locales-for-1-5
6344-template-issue-when-creating-a-template-with-empty-password-error-message-should-not-be-seen
6365-core-locking-mechanism-is-not-changing-the-mail-ressource-it-does-lock-the-mail-account
6365-core-when-lock-mechanism-is-trigger-the-user-should-not-be-editable-if-not-unlock
6378-orcid-test-method-is-wrong-and-break-orcid-saving
core-php8
master
fusiondirectory-1.5
fusiondirectory-1.4
fusiondirectory-1.3.1
fusiondirectory-1.3
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
include/class_Language.inc
+5
-16
include/class_Language.inc
with
5 additions
and
16 deletions
+5
-16
include/class_Language.inc
+
5
−
16
View file @
4312278b
...
@@ -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
_l
anguage
=
FALSE
,
$strip_region_tag
=
FALSE
)
public
static
function
list
(
$own
L
anguage
=
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
_l
anguage
)
{
if
(
$own
L
anguage
)
{
/* 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
);
}
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets