diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2014-10-24 12:50:54 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-10-29 10:09:12 +0100 |
| commit | d71cd680dd6133ad254fd296319aeab6deb77686 (patch) | |
| tree | 5540046761fb4d14c0142c87b8692011b9e21c65 /lib/base.php | |
| parent | a589d61b78fbfedad8fcf3ee59522b2e95de48ed (diff) | |
| download | nextcloud-server-d71cd680dd6133ad254fd296319aeab6deb77686.tar.gz nextcloud-server-d71cd680dd6133ad254fd296319aeab6deb77686.zip | |
Include core translations
Moved search result type translations to search.js
Load JS translations earlier
Translations need to be loaded earlier to make sure that some JS files
like search.js get access to translations at this time.
This requires the template initialization to be moved to after session
initialization, because only after the session we have access to the
current language.
Diffstat (limited to 'lib/base.php')
| -rw-r--r-- | lib/base.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/base.php b/lib/base.php index 3554911abb9..9a181fafded 100644 --- a/lib/base.php +++ b/lib/base.php @@ -339,6 +339,7 @@ class OC { OC_Util::addScript("oc-dialogs"); OC_Util::addScript("js"); OC_Util::addScript("l10n"); + OC_Util::addTranslations("core"); OC_Util::addScript("octemplate"); OC_Util::addScript("eventsource"); OC_Util::addScript("config"); @@ -526,7 +527,6 @@ class OC { stream_wrapper_register('oc', 'OC\Files\Stream\OC'); \OC::$server->getEventLogger()->start('init_session', 'Initialize session'); - self::initTemplateEngine(); OC_App::loadApps(array('session')); if (self::$CLI) { self::$session = new \OC\Session\Memory(''); @@ -534,6 +534,7 @@ class OC { self::initSession(); } \OC::$server->getEventLogger()->end('init_session'); + self::initTemplateEngine(); self::checkConfig(); self::checkInstalled(); self::checkSSL(); |