mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #8209 from owncloud/set-language-explicitly-master 

Set language explicitly master
This commit is contained in:
Thomas Müller 2014-04-15 16:57:38 +02:00
parent 2eeab60378 596177727a
commit 242b3e240d
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/private/l10n.php
View File

@ -418,6 +418,14 @@ class OC_L10N implements \OCP\IL10N {
return $text[$lang]; return $text[$lang];
} }
/**
* The given language is forced to be used while executing the current request
* @param string $lang
*/
public static function forceLanguage($lang) {
self::$language = $lang;
}
/** /**
* @brief find the best language * @brief find the best language
* @param array|string $app details below * @param array|string $app details below

3
ocs/v1.php
View File

@ -30,6 +30,9 @@ try {
// load all apps to get all api routes properly setup // load all apps to get all api routes properly setup
OC_App::loadApps(); OC_App::loadApps();
// api calls always will return English
\OC_L10N::forceLanguage('en');
OC::$server->getRouter()->match('/ocs'.OC_Request::getRawPathInfo()); OC::$server->getRouter()->match('/ocs'.OC_Request::getRawPathInfo());
} catch (ResourceNotFoundException $e) { } catch (ResourceNotFoundException $e) {
OC_API::setContentType(); OC_API::setContentType();