https://reisub.nsupdate.info/git
/
friendica.git
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ab463bb
)
begone
author
Jeroen De meerleer
<me@jeroened.be>
Sat, 29 Dec 2018 20:35:35 +0000
(21:35 +0100)
committer
Hypolite Petovan
<hypolite@mrpetovan.com>
Mon, 21 Jan 2019 14:50:59 +0000
(09:50 -0500)
src/Core/L10n.php
patch
|
blob
|
history
diff --git
a/src/Core/L10n.php
b/src/Core/L10n.php
index
2fcf6bf
..
dfeeeb0
100644
(file)
--- a/
src/Core/L10n.php
+++ b/
src/Core/L10n.php
@@
-74,7
+74,7
@@
class L10n extends BaseObject
}
}
}
- //if $_GET['lang'] is set force $_GET['lang']
+
if (isset($_GET['lang'])) {
$_SESSION['language'] = $_GET['lang'];
}
@@
-113,10
+113,11
@@
class L10n extends BaseObject
}
}
}
- //if $_GET['lang'] is set force $_GET['lang']
+
if (isset($_GET['lang'])) {
$lang_list = [$_GET['lang']];
}
+
// check if we have translations for the preferred languages and pick the 1st that has
foreach ($lang_list as $lang) {
if ($lang === 'en' || (file_exists("view/lang/$lang") && is_dir("view/lang/$lang"))) {