Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[10968] XoopsCore/branches/2.6.x/2.6.0
|
From: <tr...@us...> - 2013-02-02 21:45:50
|
Revision: 10968
http://sourceforge.net/p/xoops/svn/10968
Author: trabis
Date: 2013-02-02 21:45:44 +0000 (Sat, 02 Feb 2013)
Log Message:
-----------
Localizing system admin.php
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/extras/modules/system/admin/filemanager/jquery.php
XoopsCore/branches/2.6.x/2.6.0/extras/modules/system/admin/filemanager/main.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/moduleadmin.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/install/include/createconfigform.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/install/page_configsite.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/locale/en_US/en_US.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/avatars/templates/admin/avatars_admin_system.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/admin/banners.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/admin/clients.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/comments/admin/main.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/images/admin/categories.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/images/admin/images.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/images/templates/admin/images_admin_categories.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/images/templates/admin/images_admin_images.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/admin/permissions.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/category.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/field.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/step.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/templates/admin/steplist.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/templates/admin/smilies_smilies.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/blocksadmin/main.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/blocksadmin/xoops_version.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/extensions/main.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/extensions/xoops_version.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/groupperm.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/groups/main.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/groups/xoops_version.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/modulesadmin/main.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/modulesadmin/xoops_version.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/preferences/main.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/preferences/xoops_version.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/tplsets/main.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/tplsets/xoops_version.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/users/main.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/users/users.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/users/xoops_version.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/block.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/group.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/preferences.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/header.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/help.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin/blocksadmin.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin/groups.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin/modulesadmin.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/locale/en_US/en_US.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/admin_index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/admin_tips.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_blocks_item.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_header.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_help.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_index.html
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/xotpl/dashboard.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/xotpl/icons.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/xotpl/menu.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/userconfigs/class/form/configs.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/userrank/templates/admin/userrank.html
Added Paths:
-----------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/_admin.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin/_preferences.php
Removed Paths:
-------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin/preferences.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin.php
Modified: XoopsCore/branches/2.6.x/2.6.0/extras/modules/system/admin/filemanager/jquery.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/extras/modules/system/admin/filemanager/jquery.php 2013-02-02 21:05:43 UTC (rev 10967)
+++ XoopsCore/branches/2.6.x/2.6.0/extras/modules/system/admin/filemanager/jquery.php 2013-02-02 21:45:44 UTC (rev 10968)
@@ -462,7 +462,7 @@
if (file_exists($old_file)) {
if (unlink($new_file)) {
if (rename($old_file, $new_file)) {
- //$xoops->redirect("admin.php?fct=tplsets", 2, _AM_SYSTEM_DBUPDATED);
+ //$xoops->redirect("admin.php?fct=tplsets", 2, XoopsLocale::S_DATABASE_UPDATED);
} else {
//$xoops->redirect("admin.php?fct=tplsets", 2, _AM_SYSTEM_TEMPLATES_RESTORE_ERROR_FILE_RENAME);
}
Modified: XoopsCore/branches/2.6.x/2.6.0/extras/modules/system/admin/filemanager/main.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/extras/modules/system/admin/filemanager/main.php 2013-02-02 21:05:43 UTC (rev 10967)
+++ XoopsCore/branches/2.6.x/2.6.0/extras/modules/system/admin/filemanager/main.php 2013-02-02 21:45:44 UTC (rev 10968)
@@ -32,7 +32,7 @@
}
// Check is active
if (!$xoops->getModuleConfig('active_filemanager', 'system')) {
- $xoops->redirect('admin.php', 2, _AM_SYSTEM_NOTACTIVE);
+ $xoops->redirect('admin.php', 2, XoopsLocale::E_SECTION_NOT_ACTIVE);
}
// Get Action type
@@ -189,7 +189,7 @@
}
fclose($open);
}
- $xoops->redirect("admin.php?fct=filemanager", 2, _AM_SYSTEM_DBUPDATED);
+ $xoops->redirect("admin.php?fct=filemanager", 2, XoopsLocale::S_DATABASE_UPDATED);
} else {
//restore
$old_file = $_REQUEST['path_file'] . '.back';
@@ -199,7 +199,7 @@
if (file_exists($old_file)) {
if (unlink($new_file)) {
if (rename($old_file, $new_file)) {
- $xoops->redirect("admin.php?fct=filemanager", 2, _AM_SYSTEM_DBUPDATED);
+ $xoops->redirect("admin.php?fct=filemanager", 2, XoopsLocale::S_DATABASE_UPDATED);
} else {
$xoops->redirect("admin.php?fct=filemanager", 2, _AM_SYSTEM_FILEMANAGER_RESTORE_ERROR_FILE_RENAME);
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/moduleadmin.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/moduleadmin.php 2013-02-02 21:05:43 UTC (rev 10967)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/moduleadmin.php 2013-02-02 21:45:44 UTC (rev 10968)
@@ -352,7 +352,7 @@
$help = array();
$help['link'] = '../system/help.php?mid=' . $this->_obj->getVar('mid', 's') . "&" . $this->_obj->getInfo('help');
$help['icon'] = $xoops->url("/media/xoops/images/icons/32/help.png");
- $help['title'] = _AM_SYSTEM_HELP;
+ $help['title'] = XoopsLocale::HELP;
$xoops->tpl()->append('xo_admin_index_menu', $help);
}
$xoops->tpl()->assign('xo_admin_box', $this->_itemInfoBox);
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/install/include/createconfigform.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/install/include/createconfigform.php 2013-02-02 21:05:43 UTC (rev 10967)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/install/include/createconfigform.php 2013-02-02 21:45:44 UTC (rev 10968)
@@ -64,8 +64,8 @@
$options =& $config_handler->getConfigOptions(new Criteria('conf_id', $config[$i]->getVar('conf_id')));
$opcount = count($options);
for ($j = 0; $j < $opcount; $j++) {
- $optval = defined($options[$j]->getVar('confop_value')) ? constant($options[$j]->getVar('confop_value')) : $options[$j]->getVar('confop_value');
- $optkey = defined($options[$j]->getVar('confop_name')) ? constant($options[$j]->getVar('confop_name')) : $options[$j]->getVar('confop_name');
+ $optval = Xoops_Locale::translate($options[$j]->getVar('confop_value'), 'system');
+ $optkey = Xoops_Locale::translate($options[$j]->getVar('confop_name'), 'system');
$ele->addOption($optval, $optkey);
}
break;
@@ -75,8 +75,8 @@
$options =& $config_handler->getConfigOptions(new Criteria('conf_id', $config[$i]->getVar('conf_id')));
$opcount = count($options);
for ($j = 0; $j < $opcount; $j++) {
- $optval = defined($options[$j]->getVar('confop_value')) ? constant($options[$j]->getVar('confop_value')) : $options[$j]->getVar('confop_value');
- $optkey = defined($options[$j]->getVar('confop_name')) ? constant($options[$j]->getVar('confop_name')) : $options[$j]->getVar('confop_name');
+ $optval = Xoops_Locale::translate($options[$j]->getVar('confop_value'), 'system');
+ $optkey = Xoops_Locale::translate($options[$j]->getVar('confop_name'), 'system');
$ele->addOption($optval, $optkey);
}
break;
@@ -119,7 +119,7 @@
$criteria = new CriteriaCompo(new Criteria('hasmain', 1));
$criteria->add(new Criteria('isactive', 1));
$moduleslist =& $module_handler->getNameList($criteria, true);
- $moduleslist['--'] = _MD_AM_NONE;
+ $moduleslist['--'] = XoopsLocale::NONE;
$ele->addOptionArray($moduleslist);
break;
@@ -167,7 +167,7 @@
unset($selform);
}
} else {
- $ele = new XoopsFormLabel($title, _MD_AM_NOMODULE);
+ $ele = new XoopsFormLabel($title, SystemLocale::NO_MODULE_TO_CACHE);
}
break;
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/install/page_configsite.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/install/page_configsite.php 2013-02-02 21:05:43 UTC (rev 10967)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/install/page_configsite.php 2013-02-02 21:45:44 UTC (rev 10968)
@@ -46,6 +46,7 @@
$xoops->loadLanguage('admin', 'system', $wizard->language);
$xoops->loadLanguage('admin/preferences', 'system', $wizard->language);
+$xoops->loadLocale('system', $wizard->language);//change this to locale
$config_handler = $xoops->getHandlerConfig();
$criteria = new CriteriaCompo();
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/locale/en_US/en_US.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/locale/en_US/en_US.php 2013-02-02 21:05:43 UTC (rev 10967)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/locale/en_US/en_US.php 2013-02-02 21:45:44 UTC (rev 10968)
@@ -161,6 +161,7 @@
const CF_FOLLOWING_WORDS_SHORTER_THAN_NOT_INCLUDED = "The following words are shorter than allowed minimum length (%u chars) and were not included in your search:";
const CF_WROTE = "%s wrote:";
const CHANGE_LOG = "Change log";
+ const CHANGE_STATUS = "Change status";
const CHARSET = "Charset";
const CHARSETS = "Charsets";
const CHECK_ALL = "Check all";
@@ -467,6 +468,7 @@
const F_YES_DELETE_ALL = "Yes, delete all %s";
const F_YOUR_ACCOUNT_AT = "Your account at %s";
const GO_BACK = "Go back";
+ const GO_TO = "Go to";
const GO_TODAY = "Go today";
const GROUP = "Group";
const GROUPS = "Groups";
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/avatars/templates/admin/avatars_admin_system.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/avatars/templates/admin/avatars_admin_system.html 2013-02-02 21:05:43 UTC (rev 10967)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/avatars/templates/admin/avatars_admin_system.html 2013-02-02 21:45:44 UTC (rev 10968)
@@ -26,7 +26,7 @@
</div>
<div class="xo-actions txtcenter">
<div class="spacer bold"><{$avatar.avatar_name}></div>
- <img id="loading_avt<{$avatar.avatar_id}>" src="<{xoAppUrl media/xoops/images/spinner.gif}>" style="display:none;" alt="<{$smarty.const._AM_SYSTEM_LOADING}>" />
+ <img id="loading_avt<{$avatar.avatar_id}>" src="<{xoAppUrl media/xoops/images/spinner.gif}>" style="display:none;" alt="<{translate key='LOADING'}>" />
<img class="cursorpointer" id="avt<{$avatar.avatar_id}>" onclick="Xoops.changeStatus( 'avatar_system.php', { op: 'update_display', avatar_id: <{$avatar.avatar_id}> }, 'avt<{$avatar.avatar_id}>', 'avatar_system.php' )" src="<{if $avatar.avatar_display}><{xoAdminIcons success.png}><{else}><{xoAdminIcons cancel.png}><{/if}>"
alt="<{if $avatar.avatar_display}><{translate key='DISPLAY_IN_FORM'}><{else}><{translate key='DO_NOT_DISPLAY_IN_FORM'}><{/if}>" title="<{if $avatar.avatar_display}><{translate key='DISPLAY_IN_FORM'}><{else}><{translate key='DO_NOT_DISPLAY_IN_FORM'}><{/if}>" />
<img class="cursorhelp xo-tooltip" src="<{xoAdminIcons forum.png}>" alt="<{$avatar.count}> <{translate key='USERS' dirname='avatars'}>" title="<{$avatar.count}> <{translate key='USERS' dirname='avatars'}>" />
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/admin/banners.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/admin/banners.php 2013-02-02 21:05:43 UTC (rev 10967)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/admin/banners.php 2013-02-02 21:45:44 UTC (rev 10968)
@@ -211,7 +211,7 @@
$form = $xoops->getModuleForm($obj, 'banner');
$xoops->tpl()->assign('form', $form->render());
} else {
- $xoops->redirect('banners.php', 1, _AM_SYSTEM_DBERROR);
+ $xoops->redirect('banners.php', 1, XoopsLocale::E_DATABASE_NOT_UPDATED);
}
break;
@@ -306,7 +306,7 @@
$xoops->confirm(array("ok" => 1, "bid" => $bid, "op" => "delete"), 'banners.php', sprintf(_AM_BANNERS_BANNERS_SUREDEL). '<br \>' . $img . '<br \>');
}
} else {
- $xoops->redirect('banners.php', 1, _AM_SYSTEM_DBERROR);
+ $xoops->redirect('banners.php', 1, XoopsLocale::E_DATABASE_NOT_UPDATED);
}
break;
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/admin/clients.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/admin/clients.php 2013-02-02 21:05:43 UTC (rev 10967)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/admin/clients.php 2013-02-02 21:45:44 UTC (rev 10968)
@@ -126,7 +126,7 @@
$form = $xoops->getModuleForm($obj, 'bannerclient');
$xoops->tpl()->assign('form', $form->render());
} else {
- $xoops->redirect('clients.php', 1, _AM_SYSTEM_DBERROR);
+ $xoops->redirect('clients.php', 1, XoopsLocale::E_DATABASE_NOT_UPDATED);
}
break;
@@ -193,7 +193,7 @@
$xoops->confirm(array("ok" => 1, "cid" => $cid, "op" => "delete"), 'clients.php', sprintf(_AM_BANNERS_CLIENTS_SUREDEL, $obj->getVar("name")) . '<br />');
}
} else {
- $xoops->redirect('clients.php', 1, _AM_SYSTEM_DBERROR);
+ $xoops->redirect('clients.php', 1, XoopsLocale::E_DATABASE_NOT_UPDATED);
}
break;
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/comments/admin/main.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/comments/admin/main.php 2013-02-02 21:05:43 UTC (rev 10967)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/comments/admin/main.php 2013-02-02 21:45:44 UTC (rev 10968)
@@ -175,10 +175,10 @@
}
if ($verif == true) {
if ($comment_handler->deleteAll($criteria)) {
- $helper->redirect("admin/main.php", 3, _AM_SYSTEM_DBUPDATED);
+ $helper->redirect("admin/main.php", 3, XoopsLocale::S_DATABASE_UPDATED);
}
} else {
- $helper->redirect("admin/main.php", 3, _AM_SYSTEM_DBUPDATED);
+ $helper->redirect("admin/main.php", 3, XoopsLocale::S_DATABASE_UPDATED);
}
break;
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/images/admin/categories.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/images/admin/categories.php 2013-02-02 21:05:43 UTC (rev 10967)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/images/admin/categories.php 2013-02-02 21:45:44 UTC (rev 10968)
@@ -49,9 +49,9 @@
$obj->setVar('imgcat_storetype', $request->asStr('imgcat_storetype', 'file'));
$obj->setVar('imgcat_type', 'C');
- if ( $imgcat_id = $helper->getHandlerCategories()->insert($obj)) {
+ if ( $imgcat_id = $helper->getHandlerCategories()->insert($obj)) {
// delete permissions
- if (!$isnew) {
+ if (!$isnew) {
$criteria = new CriteriaCompo(new Criteria('gperm_itemid', $imgcat_id));
$criteria->add(new Criteria('gperm_modid', $xoops->module->getVar('mid')));
$criteria2 = new CriteriaCompo(new Criteria('gperm_name', 'imgcat_write'));
@@ -61,12 +61,12 @@
}
// Save permissions
$permissions = array('readgroup' => 'imgcat_read', 'writegroup' => 'imgcat_write');
- foreach ($permissions as $k => $permission) {
+ foreach ($permissions as $k => $permission) {
$groups = $request->asArray($k, array(XOOPS_GROUP_ADMIN));
- if (!in_array(XOOPS_GROUP_ADMIN, $groups)) {
+ if (!in_array(XOOPS_GROUP_ADMIN, $groups)) {
array_push($groups, XOOPS_GROUP_ADMIN);
}
- foreach ($groups as $group) {
+ foreach ($groups as $group) {
$perm_obj = $xoops->getHandlerGroupperm()->create();
$perm_obj->setVar('gperm_groupid', $group);
$perm_obj->setVar('gperm_itemid', $imgcat_id);
@@ -76,7 +76,7 @@
unset($perm_obj);
}
}
- $xoops->redirect('categories.php', 2, _AM_IMAGES_CAT_SAVE);
+ $xoops->redirect('categories.php', 2, _AM_IMAGES_CAT_SAVE);
}
$xoops->redirect('categories.php', 2, _AM_IMAGES_CAT_NOTSAVE . '<br />' . implode('<br />', $obj->getHtmlErrors()));
break;
@@ -89,7 +89,7 @@
case 'edit':
$imgcat_id = $request->asInt('imgcat_id', 0);
- if ($imgcat_id > 0) {
+ if ($imgcat_id > 0) {
$obj = $helper->getHandlerCategories()->get($imgcat_id);
$form = $helper->getForm($obj, 'category');
$xoops->tpl()->assign('form', $form->render());
@@ -98,7 +98,7 @@
case 'del':
$imgcat_id = $request->asInt('imgcat_id', 0);
- if ($imgcat_id > 0) {
+ if ($imgcat_id > 0) {
$ok = $request->asInt('ok', 0);
$obj = $helper->getHandlerCategories()->get($imgcat_id);
@@ -109,11 +109,11 @@
if ($helper->getHandlerCategories()->delete($obj)) {
// Delete image datas and files
$images = $helper->getHandlerImages()->getByCategory($obj->getVar('imgcat_id'));
- foreach ($images as $image) {
- if ($helper->getHandlerImages()->delete($image)) {
- if ($obj->getVar('imgcat_storetype') == 'db') {
- $helper->getHandlerImagesBody()->delete($helper->getHandlerImagesBody()->get($image->getVar('image_id')));
- } else {
+ foreach ($images as $image) {
+ if ($helper->getHandlerImages()->delete($image)) {
+ if ($obj->getVar('imgcat_storetype') == 'db') {
+ $helper->getHandlerImagesBody()->delete($helper->getHandlerImagesBody()->get($image->getVar('image_id')));
+ } else {
unlink(XOOPS_UPLOAD_PATH . '/' . $image->getVar('image_name'));
}
}
@@ -127,7 +127,7 @@
$criteria->add($criteria2);
$xoops->getHandlerGroupperm()->deleteAll($criteria);
- $xoops->redirect('categories.php', 2, _AM_SYSTEM_DBUPDATED);
+ $xoops->redirect('categories.php', 2, XoopsLocale::S_DATABASE_UPDATED);
}
} else {
$xoops->confirm(
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/images/admin/images.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/images/admin/images.php 2013-02-02 21:05:43 UTC (rev 10967)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/images/admin/images.php 2013-02-02 21:45:44 UTC (rev 10968)
@@ -138,7 +138,7 @@
} else {
unlink(XOOPS_UPLOAD_PATH . '/' . $obj->getVar('image_name'));
}
- $xoops->redirect('images.php?imgcat_id=' . $imgcat_id, 2, _AM_SYSTEM_DBUPDATED);
+ $xoops->redirect('images.php?imgcat_id=' . $imgcat_id, 2, XoopsLocale::S_DATABASE_UPDATED);
}
} else {
$category = $helper->getHandlerCategories()->get($obj->getvar('imgcat_id'));
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/images/templates/admin/images_admin_categories.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/images/templates/admin/images_admin_categories.html 2013-02-02 21:05:43 UTC (rev 10967)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/images/templates/admin/images_admin_categories.html 2013-02-02 21:45:44 UTC (rev 10968)
@@ -36,7 +36,7 @@
<td class="txtcenter width10"><{$category.imgcat_maxwidth}></td>
<td class="txtcenter width10"><{$category.imgcat_maxheight}></td>
<td class="xo-actions txtcenter width10">
- <img id="loading_cat<{$category.imgcat_id}>" src="<{xoAppUrl media/xoops/images/spinner.gif}>" style="display:none;" alt="<{$smarty.const._AM_SYSTEM_LOADING}>" />
+ <img id="loading_cat<{$category.imgcat_id}>" src="<{xoAppUrl media/xoops/images/spinner.gif}>" style="display:none;" alt="<{translate key='LOADING'}>" />
<img class="cursorpointer" id="cat<{$category.imgcat_id}>" onclick="Xoops.changeStatus( 'categories.php', { op: 'display', imgcat_id: <{$category.imgcat_id}> }, 'cat<{$category.imgcat_id}>', 'categories.php' )" src="<{if $category.imgcat_display}><{xoAdminIcons success.png}><{else}><{xoAdminIcons cancel.png}><{/if}>" alt="" title="<{if $category.imgcat_display}><{$smarty.const._AM_IMAGES_CAT_OFF}><{else}><{$smarty.const._AM_IMAGES_CAT_ON}><{/if}>" />
</td>
<td class="xo-actions txtcenter width10">
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/images/templates/admin/images_admin_images.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/images/templates/admin/images_admin_images.html 2013-02-02 21:05:43 UTC (rev 10967)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/images/templates/admin/images_admin_images.html 2013-02-02 21:45:44 UTC (rev 10968)
@@ -36,7 +36,7 @@
</div>
<div class="xo-actions txtcenter">
<div class="spacer bold"><{$img.image_nicename}></div>
- <img id="loading_img<{$img.image_id}>" src="<{xoAppUrl media/xoops/images/spinner.gif}>" style="display:none;" alt="<{$smarty.const._AM_SYSTEM_LOADING}>" />
+ <img id="loading_img<{$img.image_id}>" src="<{xoAppUrl media/xoops/images/spinner.gif}>" style="display:none;" alt="<{translate key='LOADING'}>" />
<img class="cursorpointer xo-tooltip" id="img<{$img.image_id}>" onclick="Xoops.changeStatus('images.php', { op: 'display', image_id: <{$img.image_id}> }, 'img<{$img.image_id}>', 'images.php' )" src="<{if $img.image_display}><{xoAdminIcons success.png}><{else}><{xoAdminIcons cancel.png}><{/if}>" alt="<{$smarty.const._IMGDISPLAY}>" title="<{$smarty.const._IMGDISPLAY}>" />
<{if !$db_store}>
<a rel="external" class="lightbox xo-tooltip" href="<{$xoops_upload_url}>/<{$img.image_name}>" title="<{$img.image_nicename}>">
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/admin/permissions.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/admin/permissions.php 2013-02-02 21:05:43 UTC (rev 10967)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/admin/permissions.php 2013-02-02 21:45:44 UTC (rev 10968)
@@ -69,7 +69,7 @@
$groups_ids_view = $gperm_Handler->getGroupIds('page_view_item', $content_id, $module_id);
$groups_ids_view = array_values($groups_ids_view);
foreach (array_keys($group_list) as $j) {
- $perms .= '<img id="loading_display' . $content_id . '_' . $j .'" src="' . $xoops->url('media/xoops/images/spinner.gif') . '" style="display:none;" alt="' . _AM_SYSTEM_LOADING . '" />';
+ $perms .= '<img id="loading_display' . $content_id . '_' . $j .'" src="' . $xoops->url('media/xoops/images/spinner.gif') . '" style="display:none;" alt="' . XoopsLocale::LOADING . '" />';
if (in_array($j, $groups_ids_view)) {
$perms .= "<img class=\"cursorpointer\" id=\"display" . $content_id . "_" . $j . "\" onclick=\"Xoops.changeStatus( 'permissions.php', { op: 'update_view', content_id: " . $content_id . ", group: " . $j . ", status: 'no' }, 'display" . $content_id . "_" . $j ."', 'permissions.php' )\" src=\"" . $xoops->url('modules/system/images/icons/default/success.png') . "\" alt=\"" . XoopsLocale::A_DISABLE . "\" title=\"" . XoopsLocale::A_DISABLE . "\" />";
} else {
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/category.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/category.php 2013-02-02 21:05:43 UTC (rev 10967)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/category.php 2013-02-02 21:45:44 UTC (rev 10968)
@@ -65,7 +65,7 @@
$form = $xoops->getModuleForm($obj, 'category');
$xoops->tpl()->assign('form', $form->render());
} else {
- $xoops->redirect('category.php', 1, _AM_SYSTEM_DBERROR);
+ $xoops->redirect('category.php', 1, XoopsLocale::E_DATABASE_NOT_UPDATED);
}
break;
@@ -113,7 +113,7 @@
$xoops->confirm(array("ok" => 1, "id" => $id, "op" => "delete"), 'category.php', sprintf(_PROFILE_AM_RUSUREDEL, $obj->getVar('cat_title')) . '<br />');
}
} else {
- $xoops->redirect('category.php', 1, _AM_SYSTEM_DBERROR);
+ $xoops->redirect('category.php', 1, XoopsLocale::E_DATABASE_NOT_UPDATED);
}
break;
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/field.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/field.php 2013-02-02 21:05:43 UTC (rev 10967)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/field.php 2013-02-02 21:45:44 UTC (rev 10968)
@@ -113,7 +113,7 @@
$form = $xoops->getModuleForm($obj, 'field');
$xoops->tpl()->assign('form', $form->render());
} else {
- $xoops->redirect('field.php', 1, _AM_SYSTEM_DBERROR);
+ $xoops->redirect('field.php', 1, XoopsLocale::E_DATABASE_NOT_UPDATED);
}
break;
@@ -312,7 +312,7 @@
$xoops->confirm(array("ok" => 1, "id" => $id, "op" => "delete"), 'field.php', sprintf(_PROFILE_AM_RUSUREDEL, $obj->getVar('field_title')) . '<br />');
}
} else {
- $xoops->redirect('field.php', 1, _AM_SYSTEM_DBERROR);
+ $xoops->redirect('field.php', 1, XoopsLocale::E_DATABASE_NOT_UPDATED);
}
break;
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/step.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/step.php 2013-02-02 21:05:43 UTC (rev 10967)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/step.php 2013-02-02 21:45:44 UTC (rev 10968)
@@ -64,7 +64,7 @@
$form = $xoops->getModuleForm($obj, 'regstep');
$xoops->tpl()->assign('form', $form->render());
} else {
- $xoops->redirect('step.php', 1, _AM_SYSTEM_DBERROR);
+ $xoops->redirect('step.php', 1, XoopsLocale::E_DATABASE_NOT_UPDATED);
}
break;
@@ -113,7 +113,7 @@
$xoops->confirm(array("ok" => 1, "id" => $id, "op" => "delete"), 'step.php', sprintf(_PROFILE_AM_RUSUREDEL, $obj->getVar('step_name')) . '<br />');
}
} else {
- $xoops->redirect('step.php', 1, _AM_SYSTEM_DBERROR);
+ $xoops->redirect('step.php', 1, XoopsLocale::E_DATABASE_NOT_UPDATED);
}
break;
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/templates/admin/steplist.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/templates/admin/steplist.html 2013-02-02 21:05:43 UTC (rev 10967)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/templates/admin/steplist.html 2013-02-02 21:45:44 UTC (rev 10968)
@@ -24,7 +24,7 @@
<td class="txtleft"><{$step.step_desc}></td>
<td class="txtcenter width10"><{$step.step_order}></td>
<td class="xo-actions txtcenter width10">
- <img id="loading_sml<{$step.step_id}>" src="<{xoAppUrl media/xoops/images/spinner.gif}>" style="display:none;" alt="<{$smarty.const._AM_SYSTEM_LOADING}>" />
+ <img id="loading_sml<{$step.step_id}>" src="<{xoAppUrl media/xoops/images/spinner.gif}>" style="display:none;" alt="<{translate key='LOADING'}>" />
<img class="cursorpointer" id="sml<{$step.step_id}>"
onclick="Xoops.changeStatus( 'step.php', { op: 'step_update', id: <{$step.step_id}> }, 'sml<{$step.step_id}>', 'step.php' )"
src="<{if $step.step_save}><{xoAdminIcons success.png}><{else}><{xoAdminIcons cancel.png}><{/if}>"
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/templates/admin/smilies_smilies.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/templates/admin/smilies_smilies.html 2013-02-02 21:05:43 UTC (rev 10967)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/templates/admin/smilies_smilies.html 2013-02-02 21:45:44 UTC (rev 10968)
@@ -31,7 +31,7 @@
</td>
<td class="txtleft"><{$smiley.smiley_emotion}></td>
<td class="xo-actions txtcenter width5">
- <img id="loading_sml<{$smiley.smiley_id}>" src="<{xoAppUrl media/xoops/images/spinner.gif}>" style="display:none;" alt="<{$smarty.const._AM_SYSTEM_LOADING}>" />
+ <img id="loading_sml<{$smiley.smiley_id}>" src="<{xoAppUrl media/xoops/images/spinner.gif}>" style="display:none;" alt="<{translate key='LOADING'}>" />
<img class="cursorpointer" id="sml<{$smiley.smiley_id}>" onclick="Xoops.changeStatus( 'smilies.php', { op: 'smilies_update_display', smiley_id: <{$smiley.smiley_id}> }, 'sml<{$smiley.smiley_id}>', 'smilies.php' )" src="<{if $smiley.smiley_display}><{xoAdminIcons success.png}><{else}><{xoAdminIcons cancel.png}><{/if}>" alt="<{if $smiley.smiley_display}><{$smarty.const._AM_SMILIES_OFF}><{else}><{$smarty.const._AM_SMILIES_ON}><{/if}>" title="<{if $smiley.smiley_display}><{$smarty.const._AM_SMILIES_OFF}><{else}><{$smarty.const._AM_SMILIES_ON}><{/if}>" />
</td>
<td class="xo-actions txtcenter width10">
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/blocksadmin/main.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/blocksadmin/main.php 2013-02-02 21:05:43 UTC (rev 10967)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/blocksadmin/main.php 2013-02-02 21:45:44 UTC (rev 10968)
@@ -77,7 +77,7 @@
$xoops->theme()->addScript('modules/system/js/blocks.js');
// Define Breadcrumb and tips
$admin_page = new XoopsModuleAdmin();
- $admin_page->addBreadcrumbLink(_AM_SYSTEM_CPANEL, XOOPS_URL . '/admin.php', true);
+ $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, XOOPS_URL . '/admin.php', true);
$admin_page->addBreadcrumbLink(_AM_SYSTEM_BLOCKS_ADMIN, $system->adminVersion('blocksadmin', 'adminpath'));
$admin_page->addBreadcrumbLink(_AM_SYSTEM_BLOCKS_MANAGMENT);
$admin_page->renderBreadcrumb();
@@ -189,7 +189,7 @@
$xoops->theme()->addScript('modules/system/js/blocks.js');
// Define Breadcrumb and tips
$admin_page = new XoopsModuleAdmin();
- $admin_page->addBreadcrumbLink(_AM_SYSTEM_CPANEL, XOOPS_URL . '/admin.php', true);
+ $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, XOOPS_URL . '/admin.php', true);
$admin_page->addBreadcrumbLink(_AM_SYSTEM_BLOCKS_ADMIN, $system->adminVersion('blocksadmin', 'adminpath'));
$admin_page->addBreadcrumbLink(_AM_SYSTEM_BLOCKS_ADDBLOCK);
$admin_page->renderBreadcrumb();
@@ -370,7 +370,7 @@
$groupperm_handler->addRight("block_read", $newid, $groupid);
}
}
- $xoops->redirect('admin.php?fct=blocksadmin', 1, _AM_SYSTEM_BLOCKS_DBUPDATED);
+ $xoops->redirect('admin.php?fct=blocksadmin', 1, XoopsLocale::S_DATABASE_UPDATED);
break;
case 'edit':
@@ -390,7 +390,7 @@
$xoops->theme()->addScript('modules/system/js/admin.js');
// Define Breadcrumb and tips
$admin_page = new XoopsModuleAdmin();
- $admin_page->addBreadcrumbLink(_AM_SYSTEM_CPANEL, XOOPS_URL . '/admin.php', true);
+ $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, XOOPS_URL . '/admin.php', true);
$admin_page->addBreadcrumbLink(_AM_SYSTEM_BLOCKS_ADMIN, $system->adminVersion('blocksadmin', 'adminpath'));
$admin_page->addBreadcrumbLink(_AM_SYSTEM_BLOCKS_EDITBLOCK);
$admin_page->renderBreadcrumb();
@@ -402,7 +402,7 @@
// Call Footer
$xoops->footer();
} else {
- $xoops->redirect('admin.php?fct=blocksadmin', 1, _AM_SYSTEM_DBERROR);
+ $xoops->redirect('admin.php?fct=blocksadmin', 1, XoopsLocale::E_DATABASE_NOT_UPDATED);
}
break;
@@ -413,7 +413,7 @@
$xoops->theme()->addStylesheet('modules/system/css/admin.css');
// Define Breadcrumb and tips
$admin_page = new XoopsModuleAdmin();
- $admin_page->addBreadcrumbLink(_AM_SYSTEM_CPANEL, XOOPS_URL . '/admin.php', true);
+ $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, XOOPS_URL . '/admin.php', true);
$admin_page->addBreadcrumbLink(_AM_SYSTEM_BLOCKS_ADMIN, $system->adminVersion('blocksadmin', 'adminpath'));
$admin_page->addBreadcrumbLink(_AM_SYSTEM_BLOCKS_DELETEBLOCK);
$admin_page->renderBreadcrumb();
@@ -482,10 +482,10 @@
$tplfile_handler->deleteTpl($btemplate[0]);
}
}
- $xoops->redirect('admin.php?fct=blocksadmin', 1, _AM_SYSTEM_BLOCKS_DBUPDATED);
+ $xoops->redirect('admin.php?fct=blocksadmin', 1, XoopsLocale::S_DATABASE_UPDATED);
}
} else {
- $xoops->redirect('admin.php?fct=blocksadmin', 1, _AM_SYSTEM_DBERROR);
+ $xoops->redirect('admin.php?fct=blocksadmin', 1, XoopsLocale::E_DATABASE_NOT_UPDATED);
}
break;
@@ -513,7 +513,7 @@
// Call Footer
$xoops->footer();
} else {
- $xoops->redirect('admin.php?fct=blocksadmin', 1, _AM_SYSTEM_DBERROR);
+ $xoops->redirect('admin.php?fct=blocksadmin', 1, XoopsLocale::E_DATABASE_NOT_UPDATED);
}
break;
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/blocksadmin/xoops_version.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/blocksadmin/xoops_version.php 2013-02-02 21:05:43 UTC (rev 10967)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/blocksadmin/xoops_version.php 2013-02-02 21:45:44 UTC (rev 10968)
@@ -22,9 +22,9 @@
defined('XOOPS_ROOT_PATH') or die('Restricted access');
-$modversion['name'] = _AM_SYSTEM_BLOCKS;
+$modversion['name'] = XoopsLocale::BLOCKS;
$modversion['version'] = '1.0';
-$modversion['description'] = _AM_SYSTEM_BLOCKS_DESC;
+$modversion['description'] = SystemLocale::BLOCKS_DESC;
$modversion['author'] = '';
$modversion['credits'] = 'The XOOPS Project; The MPN SE Project; Andricq Nicolas (AKA MusS)';
$modversion['help'] = 'page=blocksadmin';
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/extensions/main.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/extensions/main.php 2013-02-02 21:05:43 UTC (rev 10967)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/extensions/main.php 2013-02-02 21:45:44 UTC (rev 10968)
@@ -61,7 +61,7 @@
$xoops->theme()->addScript('modules/system/js/module.js');
// Define Breadcrumb and tips
$admin_page = new XoopsModuleAdmin();
- $admin_page->addBreadcrumbLink(_AM_SYSTEM_CPANEL, XOOPS_URL . '/admin.php', true);
+ $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, XOOPS_URL . '/admin.php', true);
$admin_page->addBreadcrumbLink(_AM_SYSTEM_EXTENSIONS_ADMIN, $system->adminVersion('extensions', 'adminpath'));
$admin_page->addBreadcrumbLink(_AM_SYSTEM_EXTENSIONS_MAIN);
$admin_page->addTips(_AM_SYSTEM_EXTENSIONS_TIPS);
@@ -86,7 +86,7 @@
$xoops->theme()->addStylesheet('modules/system/css/admin.css');
// Define Breadcrumb and tips
$admin_page = new XoopsModuleAdmin();
- $admin_page->addBreadcrumbLink(_AM_SYSTEM_CPANEL, XOOPS_URL . '/admin.php', true);
+ $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, XOOPS_URL . '/admin.php', true);
$admin_page->addBreadcrumbLink(_AM_SYSTEM_EXTENSIONS_ADMIN, $system->adminVersion('extensions', 'adminpath'));
$admin_page->addBreadcrumbLink(_AM_SYSTEM_EXTENSIONS_INSTALL);
$admin_page->renderBreadcrumb();
@@ -121,7 +121,7 @@
$xoops->theme()->addStylesheet('modules/system/css/admin.css');
// Define Breadcrumb and tips
$admin_page = new XoopsModuleAdmin();
- $admin_page->addBreadcrumbLink(_AM_SYSTEM_CPANEL, XOOPS_URL . '/admin.php', true);
+ $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, XOOPS_URL . '/admin.php', true);
$admin_page->addBreadcrumbLink(_AM_SYSTEM_EXTENSIONS_ADMIN, $system->adminVersion('extensions', 'adminpath'));
$admin_page->addBreadcrumbLink(_AM_SYSTEM_EXTENSIONS_UNINSTALL);
$admin_page->renderBreadcrumb();
@@ -155,7 +155,7 @@
$xoops->theme()->addStylesheet('modules/system/css/admin.css');
// Define Breadcrumb and tips
$admin_page = new XoopsModuleAdmin();
- $admin_page->addBreadcrumbLink(_AM_SYSTEM_CPANEL, XOOPS_URL . '/admin.php', true);
+ $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, XOOPS_URL . '/admin.php', true);
$admin_page->addBreadcrumbLink(_AM_SYSTEM_EXTENSIONS_ADMIN, $system->adminVersion('extensions', 'adminpath'));
$admin_page->addBreadcrumbLink(_AM_SYSTEM_EXTENSIONS_UPDATE);
$admin_page->renderBreadcrumb();
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/extensions/xoops_version.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/extensions/xoops_version.php 2013-02-02 21:05:43 UTC (rev 10967)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/extensions/xoops_version.php 2013-02-02 21:45:44 UTC (rev 10968)
@@ -21,9 +21,9 @@
defined('XOOPS_ROOT_PATH') or die('Restricted access');
-$modversion['name'] = _AM_SYSTEM_EXTENSIONS;
+$modversion['name'] = XoopsLocale::EXTENSIONS;
$modversion['version'] = '1.0';
-$modversion['description'] = _AM_SYSTEM_EXTENSIONS_DESC;
+$modversion['description'] = SystemLocale::EXTENSIONS_DESC;
$modversion['author'] = '';
$modversion['credits'] = 'The XOOPS Project; Andricq Nicolas (AKA MusS)';
$modversion['help'] = 'page=extension';
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/groupperm.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/groupperm.php 2013-02-02 21:05:43 UTC (rev 10967)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/groupperm.php 2013-02-02 21:45:44 UTC (rev 10968)
@@ -42,10 +42,10 @@
$gperm_handler = $xoops->getHandlerGroupperm();
foreach ($_POST['perms'] as $perm_name => $perm_data) {
if (false == $gperm_handler->deleteByModule($modid, $perm_name)) {
- $msg[] = sprintf(_MD_AM_PERMRESETNG, $module->getVar('name') . '(' . $perm_name . ')');
+ $msg[] = sprintf(SystemLocale::EF_COULD_NOT_RESET_GROUP_PERMISSION_FOR_MODULE, $module->getVar('name') . '(' . $perm_name . ')');
}
if (!array_key_exists('groups', $perm_data)){
- $msg[] = sprintf(_MD_AM_PERMADDOK, $module->getVar('name'), $perm_name, ' /');
+ $msg[] = sprintf(SystemLocale::SF_ADDED_PERMISSION_FOR_GROUP, $module->getVar('name'), $perm_name, ' /');
}else{
foreach ($perm_data['groups'] as $group_id => $item_ids) {
foreach ($item_ids as $item_id => $selected) {
@@ -56,7 +56,7 @@
foreach ($parent_ids as $pid) {
if ($pid != 0 && !in_array($pid, array_keys($item_ids))) {
// one of the parent items were not selected, so skip this item
- $msg[] = sprintf(_MD_AM_PERMADDNG, '<strong>' . $perm_name . '</strong>', '<strong>' . $perm_data['itemname'][$item_id] . '</strong>', '<strong>' . $group_list[$group_id] . '</strong>') . ' (' . _MD_AM_PERMADDNGP . ')';
+ $msg[] = sprintf(SystemLocale::EF_COULD_NOT_ADD_PERMISSION_FOR_GROUP, '<strong>' . $perm_name . '</strong>', '<strong>' . $perm_data['itemname'][$item_id] . '</strong>', '<strong>' . $group_list[$group_id] . '</strong>') . ' (' . XoopsLocale::E_ALL_PARENT_ITEMS_MUST_BE_SELECTED . ')';
continue 2;
}
}
@@ -67,9 +67,9 @@
$gperm->setVar('gperm_modid', $modid);
$gperm->setVar('gperm_itemid', $item_id);
if (!$gperm_handler->insert($gperm)) {
- $msg[] = sprintf(_MD_AM_PERMADDNG, '<strong>' . $perm_name . '</strong>', '<strong>' . $perm_data['itemname'][$item_id] . '</strong>', '<strong>' . $group_list[$group_id] . '</strong>');
+ $msg[] = sprintf(SystemLocale::EF_COULD_NOT_ADD_PERMISSION_FOR_GROUP, '<strong>' . $perm_name . '</strong>', '<strong>' . $perm_data['itemname'][$item_id] . '</strong>', '<strong>' . $group_list[$group_id] . '</strong>');
} else {
- $msg[] = sprintf(_MD_AM_PERMADDOK, '<strong>' . $perm_name . '</strong>', '<strong>' . $perm_data['itemname'][$item_id] . '</strong>', '<strong>' . $group_list[$group_id] . '</strong>');
+ $msg[] = sprintf(SystemLocale::SF_ADDED_PERMISSION_FOR_GROUP, '<strong>' . $perm_name . '</strong>', '<strong>' . $perm_data['itemname'][$item_id] . '</strong>', '<strong>' . $group_list[$group_id] . '</strong>');
}
unset($gperm);
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/groups/main.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/groups/main.php 2013-02-02 21:05:43 UTC (rev 10967)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/groups/main.php 2013-02-02 21:45:44 UTC (rev 10968)
@@ -53,7 +53,7 @@
$xoops->theme()->addScript('modules/system/js/admin.js');
// Define Breadcrumb and tips
$admin_page = new XoopsModuleAdmin();
- $admin_page->addBreadcrumbLink(_AM_SYSTEM_CPANEL, XOOPS_URL . '/admin.php', true);
+ $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, XOOPS_URL . '/admin.php', true);
$admin_page->addBreadcrumbLink(_AM_SYSTEM_GROUPS_NAV_MANAGER, $system->adminVersion('groups', 'adminpath'));
$admin_page->addBreadcrumbLink(_AM_SYSTEM_GROUPS_MAIN);
$admin_page->addItemButton(_AM_SYSTEM_GROUPS_ADD, 'admin.php?fct=groups&op=groups_add', 'add');
@@ -115,7 +115,7 @@
$xoops->theme()->addStylesheet('modules/system/css/admin.css');
// Define Breadcrumb and tips
$admin_page = new XoopsModuleAdmin();
- $admin_page->addBreadcrumbLink(_AM_SYSTEM_CPANEL, XOOPS_URL . '/admin.php', true);
+ $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, XOOPS_URL . '/admin.php', true);
$admin_page->addBreadcrumbLink(_AM_SYSTEM_GROUPS_NAV_MANAGER, $system->adminVersion('groups', 'adminpath'));
$admin_page->addBreadcrumbLink(_AM_SYSTEM_GROUPS_NAV_ADD);
$admin_page->addTips(_AM_SYSTEM_GROUPS_NAV_TIPS_2);
@@ -134,7 +134,7 @@
$xoops->theme()->addStylesheet('modules/system/css/admin.css');
// Define Breadcrumb and tips
$admin_page = new XoopsModuleAdmin();
- $admin_page->addBreadcrumbLink(_AM_SYSTEM_CPANEL, XOOPS_URL . '/admin.php', true);
+ $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, XOOPS_URL . '/admin.php', true);
$admin_page->addBreadcrumbLink(_AM_SYSTEM_GROUPS_NAV_MANAGER, $system->adminVersion('groups', 'adminpath'));
$admin_page->addBreadcrumbLink(_AM_SYSTEM_GROUPS_NAV_EDIT);
$admin_page->addTips(_AM_SYSTEM_GROUPS_NAV_TIPS_2);
@@ -148,7 +148,7 @@
// Assign form
$xoops->tpl()->assign('form', $form->render());
} else {
- $xoops->redirect('admin.php?fct=groups', 1, _AM_SYSTEM_DBERROR);
+ $xoops->redirect('admin.php?fct=groups', 1, XoopsLocale::E_DATABASE_NOT_UPDATED);
}
break;
@@ -212,7 +212,7 @@
$blockperm->setVar('gperm_modid', 1);
$gperm_handler->insert($blockperm);
}
- $xoops->redirect('admin.php?fct=groups', 1, _AM_SYSTEM_GROUPS_DBUPDATED);
+ $xoops->redirect('admin.php?fct=groups', 1, XoopsLocale::S_DATABASE_UPDATED);
}
break;
@@ -292,10 +292,10 @@
$blockperm->setVar('gperm_modid', 1);
$gperm_handler->insert($blockperm);
}
- $xoops->redirect("admin.php?fct=groups", 1, _AM_SYSTEM_GROUPS_DBUPDATED);
+ $xoops->redirect("admin.php?fct=groups", 1, XoopsLocale::S_DATABASE_UPDATED);
}
} else {
- $xoops->redirect('admin.php?fct=groups', 1, _AM_SYSTEM_DBERROR);
+ $xoops->redirect('admin.php?fct=groups', 1, XoopsLocale::E_DATABASE_NOT_UPDATED);
}
break;
@@ -303,7 +303,7 @@
case 'groups_delete':
// Define Breadcrumb and tips
$admin_page = new XoopsModuleAdmin();
- $admin_page->addBreadcrumbLink(_AM_SYSTEM_CPANEL, XOOPS_URL . '/admin.php', true);
+ $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, XOOPS_URL . '/admin.php', true);
$admin_page->addBreadcrumbLink(_AM_SYSTEM_GROUPS_NAV_MANAGER, $system->adminVersion('groups', 'adminpath'));
$admin_page->addBreadcrumbLink(_AM_SYSTEM_GROUPS_NAV_DELETE);
$admin_page->renderBreadcrumb();
@@ -322,7 +322,7 @@
$member_handler->deleteGroup($group);
$gperm_handler = $xoops->getHandlerGroupperm();
$gperm_handler->deleteByGroup($groups_id);
- $xoops->redirect('admin.php?fct=groups', 1, _AM_SYSTEM_GROUPS_DBUPDATED);
+ $xoops->redirect('admin.php?fct=groups', 1, XoopsLocale::S_DATABASE_UPDATED);
} else {
$xoops->redirect('admin.php?fct=groups', 2, _AM_SYSTEM_GROUPS_ERROR_DELETE);
}
@@ -340,7 +340,7 @@
), 'admin.php?fct=groups', sprintf(_AM_SYSTEM_GROUPS_SUREDEL) . '<br />' . $obj->getVar("name") . '<br />');
}
} else {
- $xoops->redirect('admin.php?fct=groups', 1, _AM_SYSTEM_DBERROR);
+ $xoops->redirect('admin.php?fct=groups', 1, XoopsLocale::E_DATABASE_NOT_UPDATED);
}
break;
@@ -360,7 +360,7 @@
}
}
//if ($error == true)
- $xoops->redirect("admin.php?fct=users", 1, _AM_SYSTEM_GROUPS_DBUPDATED);
+ $xoops->redirect("admin.php?fct=users", 1, XoopsLocale::S_DATABASE_UPDATED);
}
break;
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/groups/xoops_version.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/groups/xoops_version.php 2013-02-02 21:05:43 UTC (rev 10967)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/groups/xoops_version.php 2013-02-02 21:45:44 UTC (rev 10968)
@@ -21,9 +21,9 @@
defined('XOOPS_ROOT_PATH') or die('Restricted access');
-$modversion['name'] = _AM_SYSTEM_ADGS;
+$modversion['name'] = XoopsLocale::GROUPS;
$modversion['version'] = '1.0';
-$modversion['description'] = _AM_SYSTEM_ADGS_DESC;
+$modversion['description'] = SystemLocale::GROUPS_DESC;
$modversion['author'] = '';
$modversion['credits'] = 'The XOOPS Project; Cointin Maxime (AKA Kraven30)';
$modversion['help'] = 'page=groups';
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/modulesadmin/main.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/modulesadmin/main.php 2013-02-02 21:05:43 UTC (rev 10967)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/modulesadmin/main.php 2013-02-02 21:45:44 UTC (rev 10968)
@@ -60,7 +60,7 @@
$xoops->theme()->addScript('modules/system/js/module.js');
// Define Breadcrumb and tips
$admin_page = new XoopsModuleAdmin();
- $admin_page->addBreadcrumbLink(_AM_SYSTEM_CPANEL, XOOPS_URL . '/admin.php', true);
+ $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, XOOPS_URL . '/admin.php', true);
$admin_page->addBreadcrumbLink(_AM_SYSTEM_MODULES_ADMIN, $system->adminVersion('modulesadmin', 'adminpath'));
$admin_page->addBreadcrumbLink(_AM_SYSTEM_MODULES_MAIN);
$admin_page->addTips(_AM_SYSTEM_MODULES_TIPS);
@@ -177,7 +177,7 @@
$xoops->theme()->addStylesheet('modules/system/css/admin.css');
// Define Breadcrumb and tips
$admin_page = new XoopsModuleAdmin();
- $admin_page->addBreadcrumbLink(_AM_SYSTEM_CPANEL, XOOPS_URL . '/admin.php', true);
+ $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, XOOPS_URL . '/admin.php', true);
$admin_page->addBreadcrumbLink(_AM_SYSTEM_MODULES_ADMIN, $system->adminVersion('modulesadmin', 'adminpath'));
$admin_page->addBreadcrumbLink(_AM_SYSTEM_MODULES_INSTALL);
$admin_page->renderBreadcrumb();
@@ -212,7 +212,7 @@
$xoops->theme()->addStylesheet('modules/system/css/admin.css');
// Define Breadcrumb and tips
$admin_page = new XoopsModuleAdmin();
- $admin_page->addBreadcrumbLink(_AM_SYSTEM_CPANEL, XOOPS_URL . '/admin.php', true);
+ $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, XOOPS_URL . '/admin.php', true);
$admin_page->addBreadcrumbLink(_AM_SYSTEM_MODULES_ADMIN, $system->adminVersion('modulesadmin', 'adminpath'));
$admin_page->addBreadcrumbLink(_AM_SYSTEM_MODULES_UNINSTALL);
$admin_page->renderBreadcrumb();
@@ -246,7 +246,7 @@
$xoops->theme()->addStylesheet('modules/system/css/admin.css');
// Define Breadcrumb and tips
$admin_page = new XoopsModuleAdmin();
- $admin_page->addBreadcrumbLink(_AM_SYSTEM_CPANEL, XOOPS_URL . '/admin.php', true);
+ $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, XOOPS_URL . '/admin.php', true);
$admin_page->addBreadcrumbLink(_AM_SYSTEM_MODULES_ADMIN, $system->adminVersion('modulesadmin', 'adminpath'));
$admin_page->addBreadcrumbLink(_AM_SYSTEM_MODULES_UPDATE);
$admin_page->renderBreadcrumb();
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/modulesadmin/xoops_version.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/modulesadmin/xoops_version.php 2013-02-02 21:05:43 UTC (rev 10967)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/modulesadmin/xoops_version.php 2013-02-02 21:45:44 UTC (rev 10968)
@@ -21,9 +21,9 @@
defined('XOOPS_ROOT_PATH') or die('Restricted access');
-$modversion['name'] = _AM_SYSTEM_MODULES;
+$modversion['name'] = XoopsLocale::MODULES;
$modversion['version'] = '1.0';
-$modversion['description'] = _AM_SYSTEM_MODULES_DESC;
+$modversion['description'] = SystemLocale::MODULES_DESC;
$modversion['author'] = '';
$modversion['credits'] = 'The XOOPS Project; Kazumi Ono; Andricq Nicolas (AKA MusS)';
$modversion['help'] = 'page=modulesadmin';
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/preferences/main.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/preferences/main.php 2013-02-02 21:05:43 UTC (rev 10967)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/preferences/main.php 2013-02-02 21:45:44 UTC (rev 10968)
@@ -77,7 +77,7 @@
// Define Breadcrumb and tips
$admin_page = new XoopsModuleAdmin();
- $admin_page->addBreadcrumbLink(_AM_SYSTEM_CPANEL, XOOPS_URL . '/admin.php', true);
+ $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, XOOPS_URL . '/admin.php', true);
$admin_page->addBreadcrumbLink(XoopsLocale::PREFERENCES, $system->adminVersion('extensions', 'adminpath'));
$admin_page->addBreadcrumbLink($module->getVar('name'));
$admin_page->renderBreadcrumb();
@@ -150,9 +150,9 @@
register_shutdown_function(array(&$system, 'CleanCache'), $options);
$xoops->preload()->triggerEvent('system.preferences.save');
if (isset($redirect) && $redirect != '') {
- $xoops->redirect($redirect, 2, _AM_SYSTEM_DBUPDATED);
+ $xoops->redirect($redirect, 2, XoopsLocale::S_DATABASE_UPDATED);
} else {
- $xoops->redirect("admin.php?fct=preferences", 2, _AM_SYSTEM_DBUPDATED);
+ $xoops->redirect("admin.php?fct=preferences", 2, XoopsLocale::S_DATABASE_UPDATED);
}
break;
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/preferences/xoops_version.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/preferences/xoops_version.php 2013-02-02 21:05:43 UTC (rev 10967)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/preferences/xoops_version.php 2013-02-02 21:45:44 UTC (rev 10968)
@@ -22,9 +22,9 @@
defined('XOOPS_ROOT_PATH') or die('Restricted access');
-$modversion['name'] = _AM_SYSTEM_PREF;
+$modversion['name'] = XoopsLocale::PREFERENCES;
$modversion['version'] = '1.0';
-$modversion['description'] = _AM_SYSTEM_PREF_DESC;
+$modversion['description'] = SystemLocale::PREFERENCES_DESC;
$modversion['author'] = '';
$modversion['credits'] = 'The XOOPS Project; Maxime Cointin (AKA Kraven30), Gregory Mage (AKA Mage)';
$modversion['help'] = 'page=preferences';
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/tplsets/main.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/tplsets/main.php 2013-02-02 21:05:43 UTC (rev 10967)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/tplsets/main.php 2013-02-02 21:45:44 UTC (rev 10968)
@@ -56,7 +56,7 @@
// Define Breadcrumb and tips
$admin_page = new XoopsModuleAdmin();
- $admin_page->addBreadcrumbLink(_AM_SYSTEM_CPANEL, XOOPS_URL . '/admin.php', true);
+ $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, XOOPS_URL . '/admin.php', true);
$admin_page->addBreadcrumbLink(_AM_SYSTEM_TEMPLATES_NAV_MANAGER, $system->adminVersion('tplsets', 'adminpath'));
$admin_page->renderBreadcrumb();
$admin_page->addTips(_AM_SYSTEM_TEMPLATES_NAV_TIPS);
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/sy...
[truncated message content] |
