Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 1912) +++ branches/2.8.x/CHANGELOG (revision 1913) @@ -12,6 +12,8 @@ =============================================================================== +07 Jun-2013 Build 1913 Dietmar Woellbrink (Luisehahne) +! /admin/addons/ change to new Translate class 07 Jun-2013 Build 1912 Dietmar Woellbrink (Luisehahne) ! /admin/preferences/index.php change to new Translate class languages only given for existing page languages Index: branches/2.8.x/wb/admin/templates/details.php =================================================================== --- branches/2.8.x/wb/admin/templates/details.php (revision 1912) +++ branches/2.8.x/wb/admin/templates/details.php (revision 1913) @@ -110,8 +110,10 @@ ) ); -$mLang = ModLanguage::getInstance(); -$mLang->setLanguage(ADMIN_PATH.'/addons/languages/', LANGUAGE, DEFAULT_LANGUAGE); +//$mLang = ModLanguage::getInstance(); +//$mLang->setLanguage(ADMIN_PATH.'/addons/languages/', LANGUAGE, DEFAULT_LANGUAGE); +$mLang = Translate::getinstance(); +$mLang->enableAddon('admin\addons'); /*-- insert all needed vars from language files ----------------------------------------*/ $template->set_var($mLang->getLangArray()); Index: branches/2.8.x/wb/admin/templates/index.php =================================================================== --- branches/2.8.x/wb/admin/templates/index.php (revision 1912) +++ branches/2.8.x/wb/admin/templates/index.php (revision 1913) @@ -53,8 +53,10 @@ $template->set_var('DISPLAY_LIST', 'hide'); } -$mLang = ModLanguage::getInstance(); -$mLang->setLanguage(ADMIN_PATH.'/addons/languages/', LANGUAGE, DEFAULT_LANGUAGE); +//$mLang = ModLanguage::getInstance(); +//$mLang->setLanguage(ADMIN_PATH.'/addons/languages/', LANGUAGE, DEFAULT_LANGUAGE); +$mLang = Translate::getinstance(); +$mLang->enableAddon('admin\addons'); /*-- insert all needed vars from language files ----------------------------------------*/ $template->set_var($mLang->getLangArray()); Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 1912) +++ branches/2.8.x/wb/admin/interface/version.php (revision 1913) @@ -51,5 +51,5 @@ // check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled) if(!defined('VERSION')) define('VERSION', '2.8.3'); -if(!defined('REVISION')) define('REVISION', '1912'); +if(!defined('REVISION')) define('REVISION', '1913'); if(!defined('SP')) define('SP', ''); Index: branches/2.8.x/wb/admin/languages/details.php =================================================================== --- branches/2.8.x/wb/admin/languages/details.php (revision 1912) +++ branches/2.8.x/wb/admin/languages/details.php (revision 1913) @@ -90,8 +90,10 @@ ) ); -$mLang = ModLanguage::getInstance(); -$mLang->setLanguage(ADMIN_PATH.'/addons/languages/', LANGUAGE, DEFAULT_LANGUAGE); +//$mLang = ModLanguage::getInstance(); +//$mLang->setLanguage(ADMIN_PATH.'/addons/languages/', LANGUAGE, DEFAULT_LANGUAGE); +$mLang = Translate::getinstance(); +$mLang->enableAddon('admin\addons'); /*-- insert all needed vars from language files ----------------------------------------*/ $template->set_var($mLang->getLangArray()); Index: branches/2.8.x/wb/admin/languages/index.php =================================================================== --- branches/2.8.x/wb/admin/languages/index.php (revision 1912) +++ branches/2.8.x/wb/admin/languages/index.php (revision 1913) @@ -50,8 +50,10 @@ $template->set_var('DISPLAY_LIST', 'hide'); } -$mLang = ModLanguage::getInstance(); -$mLang->setLanguage(ADMIN_PATH.'/addons/languages/', LANGUAGE, DEFAULT_LANGUAGE); +//$mLang = ModLanguage::getInstance(); +//$mLang->setLanguage(ADMIN_PATH.'/addons/languages/', LANGUAGE, DEFAULT_LANGUAGE); +$mLang = Translate::getinstance(); +$mLang->enableAddon('admin\addons'); /*-- insert all needed vars from language files ----------------------------------------*/ $template->set_var($mLang->getLangArray()); @@ -65,7 +67,7 @@ ); // Insert language text and messages $template->set_var(array( - 'URL_ADVANCED' => ''.$TEXT['ADVANCED'].'' , + 'URL_ADVANCED' => ''.$mLang->TEXT_ADVANCED.'' , 'URL_MODULES' => $admin->get_permission('modules') ? '' . $mLang->MENU_MODULES . '' : ''.$mLang->MENU_MODULES.'', 'URL_TEMPLATES' => $admin->get_permission('templates') ? Index: branches/2.8.x/wb/admin/modules/details.php =================================================================== --- branches/2.8.x/wb/admin/modules/details.php (revision 1912) +++ branches/2.8.x/wb/admin/modules/details.php (revision 1913) @@ -4,13 +4,13 @@ * @category admin * @package modules * @author Ryan Djurovich, WebsiteBaker Project - * @copyright 2009-2012, WebsiteBaker Org. e.V. - * @link http://www.websitebaker2.org/ + * @copyright 2009-2013, WebsiteBaker Org. e.V. + * @link http://www.websitebaker.org/ * @license http://www.gnu.org/licenses/gpl.html * @platform WebsiteBaker 2.8.x * @requirements PHP 5.2.2 and higher * @version $Id$ - * @filesource $HeadURL$ + * @filesource $HeadURL$ * @lastmodified $Date$ * */ @@ -29,8 +29,10 @@ // After check print the header $admin->print_header(); -$mLang = ModLanguage::getInstance(); -$mLang->setLanguage(ADMIN_PATH.'/addons/languages/', LANGUAGE, DEFAULT_LANGUAGE); +//$mLang = ModLanguage::getInstance(); +//$mLang->setLanguage(ADMIN_PATH.'/addons/languages/', LANGUAGE, DEFAULT_LANGUAGE); +$mLang = Translate::getinstance(); +$mLang->enableAddon('admin\addons'); if(!isset($_POST['file']) OR $_POST['file'] == "") { $admin->print_error($MESSAGE['GENERIC_FORGOT_OPTIONS']); @@ -116,48 +118,32 @@ switch ($module['function']) { case NULL: - $type_name = $TEXT['UNKNOWN']; + $type_name = $mLang->TEXT_UNKNOWN; break; case 'page': - $type_name = $TEXT['PAGE']; + $type_name = $mLang->TEXT_PAGE; break; case 'wysiwyg': - $type_name = $TEXT['WYSIWYG_EDITOR']; + $type_name = $mLang->TEXT_WYSIWYG_EDITOR; break; case 'tool': - $type_name = $TEXT['ADMINISTRATION_TOOL']; + $type_name = $mLang->TEXT_ADMINISTRATION_TOOL; break; case 'admin': - $type_name = $TEXT['ADMIN']; + $type_name = $mLang->TEXT_ADMIN; break; case 'administration': - $type_name = $TEXT['ADMINISTRATION']; + $type_name = $mLang->TEXT_ADMINISTRATION; break; case 'snippet': - $type_name = $TEXT['CODE_SNIPPET']; + $type_name = $mLang->TEXT_CODE_SNIPPET; break; default: - $type_name = $TEXT['UNKNOWN']; + $type_name = $mLang->TEXT_UNKNOWN; } $template->set_var('TYPE', $type_name); -//// Insert language headings -//$template->set_var(array( -// 'HEADING_MODULE_DETAILS' => $HEADING['MODULE_DETAILS'] -// ) -// ); -//// Insert language text and messages -//$template->set_var(array( -// 'TEXT_NAME' => $TEXT['NAME'], -// 'TEXT_TYPE' => $TEXT['TYPE'], -// 'TEXT_AUTHOR' => $TEXT['AUTHOR'], -// 'TEXT_VERSION' => $TEXT['VERSION'], -// 'TEXT_DESIGNED_FOR' => $TEXT['DESIGNED_FOR'], -// 'TEXT_DESCRIPTION' => $TEXT['DESCRIPTION'], -// 'TEXT_BACK' => $TEXT['BACK'] -// ) -// ); -// + // Parse module object $template->parse('main', 'main_block', false); $template->pparse('output', 'page'); Index: branches/2.8.x/wb/admin/modules/index.php =================================================================== --- branches/2.8.x/wb/admin/modules/index.php (revision 1912) +++ branches/2.8.x/wb/admin/modules/index.php (revision 1913) @@ -98,8 +98,10 @@ $template->set_var('DISPLAY_MANUAL_INSTALL', 'hide'); } -$mLang = ModLanguage::getInstance(); -$mLang->setLanguage(ADMIN_PATH.'/addons/languages/', LANGUAGE, DEFAULT_LANGUAGE); +//$mLang = ModLanguage::getInstance(); +//$mLang->setLanguage(ADMIN_PATH.'/addons/languages/', LANGUAGE, DEFAULT_LANGUAGE); +$mLang = Translate::getinstance(); +$mLang->enableAddon('admin\addons'); /*-- insert all needed vars from language files ----------------------------------------*/ $template->set_var($mLang->getLangArray());