diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-10-29 13:09:02 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-10-29 13:09:02 +0100 |
| commit | 105940b9dcb52d43440dfbc738d284ce8f2b0acd (patch) | |
| tree | a66b0fc06ef6bcb4715427fccbd33ee0ef974b9d /lib/base.php | |
| parent | c353cbe63306aecda572557bc09f30cfe7704c47 (diff) | |
| parent | fb4f9933363a83d98db81afd796043e48cff5a4e (diff) | |
| download | nextcloud-server-105940b9dcb52d43440dfbc738d284ce8f2b0acd.tar.gz nextcloud-server-105940b9dcb52d43440dfbc738d284ce8f2b0acd.zip | |
Merge pull request #11638 from owncloud/oc8-translations
[OC8] Load javascript translations using standard web technologies
Diffstat (limited to 'lib/base.php')
| -rw-r--r-- | lib/base.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/base.php b/lib/base.php index 049f4216ee1..58695f31849 100644 --- a/lib/base.php +++ b/lib/base.php @@ -338,6 +338,8 @@ class OC { OC_Util::addScript("jquery.ocdialog"); 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"); @@ -523,7 +525,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(''); @@ -531,6 +532,7 @@ class OC { self::initSession(); } \OC::$server->getEventLogger()->end('init_session'); + self::initTemplateEngine(); self::checkConfig(); self::checkInstalled(); self::checkSSL(); |