Revision 1913
Added by Dietmar over 11 years ago
| branches/2.8.x/CHANGELOG | ||
|---|---|---|
| 12 | 12 |
=============================================================================== |
| 13 | 13 |
|
| 14 | 14 |
|
| 15 |
07 Jun-2013 Build 1913 Dietmar Woellbrink (Luisehahne) |
|
| 16 |
! /admin/addons/ change to new Translate class |
|
| 15 | 17 |
07 Jun-2013 Build 1912 Dietmar Woellbrink (Luisehahne) |
| 16 | 18 |
! /admin/preferences/index.php change to new Translate class |
| 17 | 19 |
languages only given for existing page languages |
| branches/2.8.x/wb/admin/templates/details.php | ||
|---|---|---|
| 110 | 110 |
) |
| 111 | 111 |
); |
| 112 | 112 |
|
| 113 |
$mLang = ModLanguage::getInstance(); |
|
| 114 |
$mLang->setLanguage(ADMIN_PATH.'/addons/languages/', LANGUAGE, DEFAULT_LANGUAGE); |
|
| 113 |
//$mLang = ModLanguage::getInstance(); |
|
| 114 |
//$mLang->setLanguage(ADMIN_PATH.'/addons/languages/', LANGUAGE, DEFAULT_LANGUAGE); |
|
| 115 |
$mLang = Translate::getinstance(); |
|
| 116 |
$mLang->enableAddon('admin\addons');
|
|
| 115 | 117 |
|
| 116 | 118 |
/*-- insert all needed vars from language files ----------------------------------------*/ |
| 117 | 119 |
$template->set_var($mLang->getLangArray()); |
| branches/2.8.x/wb/admin/templates/index.php | ||
|---|---|---|
| 53 | 53 |
$template->set_var('DISPLAY_LIST', 'hide');
|
| 54 | 54 |
} |
| 55 | 55 |
|
| 56 |
$mLang = ModLanguage::getInstance(); |
|
| 57 |
$mLang->setLanguage(ADMIN_PATH.'/addons/languages/', LANGUAGE, DEFAULT_LANGUAGE); |
|
| 56 |
//$mLang = ModLanguage::getInstance(); |
|
| 57 |
//$mLang->setLanguage(ADMIN_PATH.'/addons/languages/', LANGUAGE, DEFAULT_LANGUAGE); |
|
| 58 |
$mLang = Translate::getinstance(); |
|
| 59 |
$mLang->enableAddon('admin\addons');
|
|
| 58 | 60 |
|
| 59 | 61 |
/*-- insert all needed vars from language files ----------------------------------------*/ |
| 60 | 62 |
$template->set_var($mLang->getLangArray()); |
| branches/2.8.x/wb/admin/interface/version.php | ||
|---|---|---|
| 51 | 51 |
|
| 52 | 52 |
// check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled) |
| 53 | 53 |
if(!defined('VERSION')) define('VERSION', '2.8.3');
|
| 54 |
if(!defined('REVISION')) define('REVISION', '1912');
|
|
| 54 |
if(!defined('REVISION')) define('REVISION', '1913');
|
|
| 55 | 55 |
if(!defined('SP')) define('SP', '');
|
| branches/2.8.x/wb/admin/languages/details.php | ||
|---|---|---|
| 90 | 90 |
) |
| 91 | 91 |
); |
| 92 | 92 |
|
| 93 |
$mLang = ModLanguage::getInstance(); |
|
| 94 |
$mLang->setLanguage(ADMIN_PATH.'/addons/languages/', LANGUAGE, DEFAULT_LANGUAGE); |
|
| 93 |
//$mLang = ModLanguage::getInstance(); |
|
| 94 |
//$mLang->setLanguage(ADMIN_PATH.'/addons/languages/', LANGUAGE, DEFAULT_LANGUAGE); |
|
| 95 |
$mLang = Translate::getinstance(); |
|
| 96 |
$mLang->enableAddon('admin\addons');
|
|
| 95 | 97 |
|
| 96 | 98 |
/*-- insert all needed vars from language files ----------------------------------------*/ |
| 97 | 99 |
$template->set_var($mLang->getLangArray()); |
| branches/2.8.x/wb/admin/languages/index.php | ||
|---|---|---|
| 50 | 50 |
$template->set_var('DISPLAY_LIST', 'hide');
|
| 51 | 51 |
} |
| 52 | 52 |
|
| 53 |
$mLang = ModLanguage::getInstance(); |
|
| 54 |
$mLang->setLanguage(ADMIN_PATH.'/addons/languages/', LANGUAGE, DEFAULT_LANGUAGE); |
|
| 53 |
//$mLang = ModLanguage::getInstance(); |
|
| 54 |
//$mLang->setLanguage(ADMIN_PATH.'/addons/languages/', LANGUAGE, DEFAULT_LANGUAGE); |
|
| 55 |
$mLang = Translate::getinstance(); |
|
| 56 |
$mLang->enableAddon('admin\addons');
|
|
| 55 | 57 |
|
| 56 | 58 |
/*-- insert all needed vars from language files ----------------------------------------*/ |
| 57 | 59 |
$template->set_var($mLang->getLangArray()); |
| ... | ... | |
| 65 | 67 |
); |
| 66 | 68 |
// Insert language text and messages |
| 67 | 69 |
$template->set_var(array( |
| 68 |
'URL_ADVANCED' => '<b>'.$TEXT['ADVANCED'].'</b>' ,
|
|
| 70 |
'URL_ADVANCED' => '<b>'.$mLang->TEXT_ADVANCED.'</b>' ,
|
|
| 69 | 71 |
'URL_MODULES' => $admin->get_permission('modules') ?
|
| 70 | 72 |
'<a href="' . ADMIN_URL . '/modules/index.php">' . $mLang->MENU_MODULES . '</a>' : '<b>'.$mLang->MENU_MODULES.'</b>', |
| 71 | 73 |
'URL_TEMPLATES' => $admin->get_permission('templates') ?
|
| branches/2.8.x/wb/admin/modules/details.php | ||
|---|---|---|
| 4 | 4 |
* @category admin |
| 5 | 5 |
* @package modules |
| 6 | 6 |
* @author Ryan Djurovich, WebsiteBaker Project |
| 7 |
* @copyright 2009-2012, WebsiteBaker Org. e.V.
|
|
| 8 |
* @link http://www.websitebaker2.org/
|
|
| 7 |
* @copyright 2009-2013, WebsiteBaker Org. e.V.
|
|
| 8 |
* @link http://www.websitebaker.org/
|
|
| 9 | 9 |
* @license http://www.gnu.org/licenses/gpl.html |
| 10 | 10 |
* @platform WebsiteBaker 2.8.x |
| 11 | 11 |
* @requirements PHP 5.2.2 and higher |
| 12 | 12 |
* @version $Id$ |
| 13 |
* @filesource $HeadURL$
|
|
| 13 |
* @filesource $HeadURL$
|
|
| 14 | 14 |
* @lastmodified $Date$ |
| 15 | 15 |
* |
| 16 | 16 |
*/ |
| ... | ... | |
| 29 | 29 |
// After check print the header |
| 30 | 30 |
$admin->print_header(); |
| 31 | 31 |
|
| 32 |
$mLang = ModLanguage::getInstance(); |
|
| 33 |
$mLang->setLanguage(ADMIN_PATH.'/addons/languages/', LANGUAGE, DEFAULT_LANGUAGE); |
|
| 32 |
//$mLang = ModLanguage::getInstance(); |
|
| 33 |
//$mLang->setLanguage(ADMIN_PATH.'/addons/languages/', LANGUAGE, DEFAULT_LANGUAGE); |
|
| 34 |
$mLang = Translate::getinstance(); |
|
| 35 |
$mLang->enableAddon('admin\addons');
|
|
| 34 | 36 |
|
| 35 | 37 |
if(!isset($_POST['file']) OR $_POST['file'] == "") {
|
| 36 | 38 |
$admin->print_error($MESSAGE['GENERIC_FORGOT_OPTIONS']); |
| ... | ... | |
| 116 | 118 |
|
| 117 | 119 |
switch ($module['function']) {
|
| 118 | 120 |
case NULL: |
| 119 |
$type_name = $TEXT['UNKNOWN'];
|
|
| 121 |
$type_name = $mLang->TEXT_UNKNOWN;
|
|
| 120 | 122 |
break; |
| 121 | 123 |
case 'page': |
| 122 |
$type_name = $TEXT['PAGE'];
|
|
| 124 |
$type_name = $mLang->TEXT_PAGE;
|
|
| 123 | 125 |
break; |
| 124 | 126 |
case 'wysiwyg': |
| 125 |
$type_name = $TEXT['WYSIWYG_EDITOR'];
|
|
| 127 |
$type_name = $mLang->TEXT_WYSIWYG_EDITOR;
|
|
| 126 | 128 |
break; |
| 127 | 129 |
case 'tool': |
| 128 |
$type_name = $TEXT['ADMINISTRATION_TOOL'];
|
|
| 130 |
$type_name = $mLang->TEXT_ADMINISTRATION_TOOL;
|
|
| 129 | 131 |
break; |
| 130 | 132 |
case 'admin': |
| 131 |
$type_name = $TEXT['ADMIN'];
|
|
| 133 |
$type_name = $mLang->TEXT_ADMIN;
|
|
| 132 | 134 |
break; |
| 133 | 135 |
case 'administration': |
| 134 |
$type_name = $TEXT['ADMINISTRATION'];
|
|
| 136 |
$type_name = $mLang->TEXT_ADMINISTRATION;
|
|
| 135 | 137 |
break; |
| 136 | 138 |
case 'snippet': |
| 137 |
$type_name = $TEXT['CODE_SNIPPET'];
|
|
| 139 |
$type_name = $mLang->TEXT_CODE_SNIPPET;
|
|
| 138 | 140 |
break; |
| 139 | 141 |
default: |
| 140 |
$type_name = $TEXT['UNKNOWN'];
|
|
| 142 |
$type_name = $mLang->TEXT_UNKNOWN;
|
|
| 141 | 143 |
} |
| 142 | 144 |
$template->set_var('TYPE', $type_name);
|
| 143 | 145 |
|
| 144 |
//// Insert language headings |
|
| 145 |
//$template->set_var(array( |
|
| 146 |
// 'HEADING_MODULE_DETAILS' => $HEADING['MODULE_DETAILS'] |
|
| 147 |
// ) |
|
| 148 |
// ); |
|
| 149 |
//// Insert language text and messages |
|
| 150 |
//$template->set_var(array( |
|
| 151 |
// 'TEXT_NAME' => $TEXT['NAME'], |
|
| 152 |
// 'TEXT_TYPE' => $TEXT['TYPE'], |
|
| 153 |
// 'TEXT_AUTHOR' => $TEXT['AUTHOR'], |
|
| 154 |
// 'TEXT_VERSION' => $TEXT['VERSION'], |
|
| 155 |
// 'TEXT_DESIGNED_FOR' => $TEXT['DESIGNED_FOR'], |
|
| 156 |
// 'TEXT_DESCRIPTION' => $TEXT['DESCRIPTION'], |
|
| 157 |
// 'TEXT_BACK' => $TEXT['BACK'] |
|
| 158 |
// ) |
|
| 159 |
// ); |
|
| 160 |
// |
|
| 146 |
|
|
| 161 | 147 |
// Parse module object |
| 162 | 148 |
$template->parse('main', 'main_block', false);
|
| 163 | 149 |
$template->pparse('output', 'page');
|
| branches/2.8.x/wb/admin/modules/index.php | ||
|---|---|---|
| 98 | 98 |
$template->set_var('DISPLAY_MANUAL_INSTALL', 'hide');
|
| 99 | 99 |
} |
| 100 | 100 |
|
| 101 |
$mLang = ModLanguage::getInstance(); |
|
| 102 |
$mLang->setLanguage(ADMIN_PATH.'/addons/languages/', LANGUAGE, DEFAULT_LANGUAGE); |
|
| 101 |
//$mLang = ModLanguage::getInstance(); |
|
| 102 |
//$mLang->setLanguage(ADMIN_PATH.'/addons/languages/', LANGUAGE, DEFAULT_LANGUAGE); |
|
| 103 |
$mLang = Translate::getinstance(); |
|
| 104 |
$mLang->enableAddon('admin\addons');
|
|
| 103 | 105 |
|
| 104 | 106 |
/*-- insert all needed vars from language files ----------------------------------------*/ |
| 105 | 107 |
$template->set_var($mLang->getLangArray()); |
Also available in: Unified diff
! /admin/addons/ change to new Translate class