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

[<tr...@us...>]

Revision: 10966
          http://sourceforge.net/p/xoops/svn/10966
Author:   trabis
Date:     2013-02-01 22:37:55 +0000 (Fri, 01 Feb 2013)
Log Message:
-----------
Updating system cpanel locale

Modified Paths:
--------------
    XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/help.php
    XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/default.php

Added Paths:
-----------
    XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/_cpanel.php

Removed Paths:
-------------
    XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/cpanel.php

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/help.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/help.php	2013-02-01 22:33:03 UTC (rev 10965)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/help.php	2013-02-01 22:37:55 UTC (rev 10966)
@@ -166,7 +166,7 @@
     if (XoopsLoad::fileExists(XOOPS_ROOT_PATH . '/modules/system/language/' . $xoops->getConfig('language') . '/help/help_center.html')) {
         $helpcontent = $xoops->tpl()->fetch(XOOPS_ROOT_PATH . '/modules/system/language/' . $xoops->getConfig('language') . '/help/help_center.html');
     } else {
-        $helpcontent = '<div id="non-modhelp">' . _MD_CPANEL_HELPCENTER . '</div>';
+        $helpcontent = '<div id="non-modhelp">' . SystemLocale::WELCOME_TO_XOOPS_HELP_CENTER . '</div>';
     }
 
     $xoops->tpl()->assign('helpcontent', $helpcontent);

Copied: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/_cpanel.php (from rev 10963, XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/cpanel.php)
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/_cpanel.php	                        (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/_cpanel.php	2013-02-01 22:37:55 UTC (rev 10966)
@@ -0,0 +1,27 @@
+<?php
+// $Id$
+// _LANGCODE: en
+// _CHARSET : UTF-8
+// Translator: XOOPS Translation Team
+
+/*define("_MD_AM_VRSN", "Version");
+define("_MD_AM_FINDUSER", "Find Users");
+define("_MD_CPANEL_NEWS", "News");
+define("_MD_CPANEL_NEWS_DESC", "XOOPS development news");
+define("_MD_CPANEL_PROJECT", "Project");
+define("_MD_CPANEL_PROJECT_DESC", "XOOPS Project website");
+define("_MD_CPANEL_COMMUNITY", "Community");
+define("_MD_CPANEL_COMMUNITY_DESC", "XOOPS Official Community website");
+define("_MD_CPANEL_LOCAL", "Local Support");
+define("_MD_CPANEL_LOCAL_DESC", "XOOPS Certified Local Support websites");
+
+define("_MD_CPANEL_OVERVIEW", "System Overview");
+define("_MD_CPANEL_PHPEXTENSIONS", "Loaded PHP extensions");
+define("_MD_CPANEL_VERSION", "%s Version");
+
+define("_MD_CPANEL_QUICKLINKS", "Quick links");
+
+define("_MD_CPANEL_SITE_ADMINISTRATION", "%s administration");*/
+
+// for help page
+//define("_MD_CPANEL_HELPCENTER", "Welcome to XOOPS Help Center");
\ No newline at end of file

Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/cpanel.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/cpanel.php	2013-02-01 22:33:03 UTC (rev 10965)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/cpanel.php	2013-02-01 22:37:55 UTC (rev 10966)
@@ -1,27 +0,0 @@
-<?php
-// $Id$
-// _LANGCODE: en
-// _CHARSET : UTF-8
-// Translator: XOOPS Translation Team
-
-/*define("_MD_AM_VRSN", "Version");
-define("_MD_AM_FINDUSER", "Find Users");
-define("_MD_CPANEL_NEWS", "News");
-define("_MD_CPANEL_NEWS_DESC", "XOOPS development news");
-define("_MD_CPANEL_PROJECT", "Project");
-define("_MD_CPANEL_PROJECT_DESC", "XOOPS Project website");
-define("_MD_CPANEL_COMMUNITY", "Community");
-define("_MD_CPANEL_COMMUNITY_DESC", "XOOPS Official Community website");
-define("_MD_CPANEL_LOCAL", "Local Support");
-define("_MD_CPANEL_LOCAL_DESC", "XOOPS Certified Local Support websites");
-
-define("_MD_CPANEL_OVERVIEW", "System Overview");
-define("_MD_CPANEL_PHPEXTENSIONS", "Loaded PHP extensions");
-define("_MD_CPANEL_VERSION", "%s Version");
-
-define("_MD_CPANEL_QUICKLINKS", "Quick links");
-
-define("_MD_CPANEL_SITE_ADMINISTRATION", "%s administration");*/
-
-// for help page 
-define("_MD_CPANEL_HELPCENTER", "Welcome to XOOPS Help Center");
\ No newline at end of file

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/default.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/default.php	2013-02-01 22:33:03 UTC (rev 10965)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/default.php	2013-02-01 22:37:55 UTC (rev 10966)
@@ -34,8 +34,6 @@
     {
         $xoops = Xoops::getInstance();
         $xoops->loadLanguage('admin', 'system');
-        $xoops->loadLanguage('cpanel', 'system');
-        $xoops->loadLanguage('modinfo', 'system');
 
         $xoops->theme()->addStylesheet('media/xoops/css/moduladmin.css');
         $xoops->theme()->addStylesheet(XOOPS_ADMINTHEME_URL . '/default/css/style.css');