summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2014-10-24 12:50:54 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2014-10-29 10:09:12 +0100
commitd71cd680dd6133ad254fd296319aeab6deb77686 (patch)
tree5540046761fb4d14c0142c87b8692011b9e21c65
parenta589d61b78fbfedad8fcf3ee59522b2e95de48ed (diff)
downloadnextcloud-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.
-rw-r--r--core/js/js.js9
-rw-r--r--lib/base.php3
-rw-r--r--search/js/result.js19
3 files changed, 20 insertions, 11 deletions
diff --git a/core/js/js.js b/core/js/js.js
index 7f657f0e945..b1a61ddf502 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -468,15 +468,6 @@ OC.search.customResults={};
OC.search.currentResult=-1;
OC.search.lastQuery='';
OC.search.lastResults={};
-//translations for result type ids, can be extended by apps
-// FIXME: move to later in the init process, after translations were loaded
-
-OC.search.resultTypes={
- file: 'File', //t('core','File'),
- folder: 'Folder', //t('core','Folder'),
- image: 'Image', //t('core','Image'),
- audio: 'Audio' //t('core','Audio')
-};
OC.addStyle.loaded=[];
OC.addScript.loaded=[];
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();
diff --git a/search/js/result.js b/search/js/result.js
index 13be0b552bf..fe84aecde3e 100644
--- a/search/js/result.js
+++ b/search/js/result.js
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2014
+ *
+ * This file is licensed under the Affero General Public License version 3
+ * or later.
+ *
+ * See the COPYING-README file.
+ *
+ */
+
+//translations for result type ids, can be extended by apps
+OC.search.resultTypes={
+ file: t('core','File'),
+ folder: t('core','Folder'),
+ image: t('core','Image'),
+ audio: t('core','Audio')
+};
OC.search.catagorizeResults=function(results){
var types={};
for(var i=0;i<results.length;i++){
@@ -118,4 +135,4 @@ OC.search.renderCurrent=function(){
$('#searchresults tr.result').removeClass('current');
$(result).addClass('current');
}
-}; \ No newline at end of file
+};