upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

Merge pull request #19480 from owncloud/fix-l10n

Browse source 
Fix l10n on master
This commit is contained in:
Jörn Friedrich Dreyer 2015-10-02 08:56:33 +02:00
commit b18307aafb
1 changed files with 5 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
lib/private/l10n.php
View file

@ -102,16 +102,11 @@ class OC_L10N implements \OCP\IL10N {
}
/**
* @param $app
* @return string
*/
public static function setLanguageFromRequest($app = null) {
public static function setLanguageFromRequest() {
if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
if (is_array($app)) {
$available = $app;
} else {
$available = self::findAvailableLanguages($app);
}
$available = self::findAvailableLanguages();
// E.g. make sure that 'de' is before 'de_DE'.
sort($available);
@ -122,17 +117,13 @@ class OC_L10N implements \OCP\IL10N {
$preferred_language = str_replace('-', '_', $preferred_language);
foreach ($available as $available_language) {
if ($preferred_language === strtolower($available_language)) {
if (!is_array($app)) {
self::$language = $available_language;
}
self::$language = $available_language;
return $available_language;
}
}
foreach ($available as $available_language) {
if (substr($preferred_language, 0, 2) === $available_language) {
if (!is_array($app)) {
self::$language = $available_language;
}
self::$language = $available_language;
return $available_language;
}
}
@ -469,7 +460,7 @@ class OC_L10N implements \OCP\IL10N {
return $default_language;
}
$lang = self::setLanguageFromRequest($app);
$lang = self::setLanguageFromRequest();
if($userId && !$config->getUserValue($userId, 'core', 'lang')) {
$config->setUserValue($userId, 'core', 'lang', $lang);
}