[xoops-svn] SF.net SVN: xoops-svn:[10231] XoopsCore/branches/2.6.x/2.6.0/htdocs

[<du...@us...>]

Revision: 10231
          http://sourceforge.net/p/xoops/svn/10231
Author:   dugris
Date:     2012-10-25 12:33:41 +0000 (Thu, 25 Oct 2012)
Log Message:
-----------
Fix for xlanguage

Modified Paths:
--------------
    XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoops.php
    XoopsCore/branches/2.6.x/2.6.0/htdocs/include/common.php
    XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/language/english/main.php

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoops.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoops.php	2012-10-22 07:38:25 UTC (rev 10230)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoops.php	2012-10-25 12:33:41 UTC (rev 10231)
@@ -399,6 +399,9 @@
         // for legacy support when template is set after header.
         $this->option['template_main'] = $this->tpl_name;
 
+        // Load xlanguage api
+        $this->preload->triggerEvent('core.language.common');
+
         $xoopsThemeFactory = null;
         $xoopsThemeFactory = new XoopsThemeFactory();
         $xoopsThemeFactory->allowedThemes = $this->getConfig('theme_set_allowed');
@@ -408,6 +411,9 @@
 
         $this->preload->triggerEvent('core.header.addmeta');
 
+        // load xlanguage block
+        $this->preload->triggerEvent('core.language.block');
+
         // Temporary solution for start page redirection
         if (defined("XOOPS_STARTPAGE_REDIRECTED")) {
             $this->theme->headContent(null, "<base href='" . XOOPS_URL . '/modules/' . $this->getConfig('startpage') . "/' />", null, null);

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/include/common.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/include/common.php	2012-10-22 07:38:25 UTC (rev 10230)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/include/common.php	2012-10-25 12:33:41 UTC (rev 10231)
@@ -143,7 +143,6 @@
 /**
  * Load Language settings and defines
  */
-$xoops->preload->triggerEvent('core.include.common.language');
 $xoops->loadLanguage('global');
 $xoops->loadLanguage('locale');
 $xoops->loadLanguage('errors');
@@ -301,4 +300,3 @@
 $xoops->logger->stopTime('XOOPS Boot');
 $xoops->logger->startTime('Module init');
 $xoops->preload->triggerEvent('core.include.common.end');
-$xoops->preload->triggerEvent('core.include.block.language');
\ No newline at end of file

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/language/english/main.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/language/english/main.php	2012-10-22 07:38:25 UTC (rev 10230)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/language/english/main.php	2012-10-25 12:33:41 UTC (rev 10231)
@@ -36,4 +36,6 @@
 define("_THEME_PM", "Inbox");
 define("_THEME_LOGOUT", "Logout");
 
-define("_THEME_BACKTOP", "Back to top");
\ No newline at end of file
+define("_THEME_BACKTOP", "Back to top");
+
+define("_THEME_LANGUAGE", "Choose your language");
\ No newline at end of file