dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// changed English strings, especially focusing on colons harmonization

Browse Source
This commit is contained in:
fram
2013-03-12 19:39:30 +01:00
parent f7c76f60fb
commit ed947bc123
590 changed files with 6160 additions and 7064 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminModulesPositionsController.php
+20 -20
View File
@@ -48,10 +48,10 @@ class AdminModulesPositionsControllerCore extends AdminController
Tools::redirectAdmin(self::$currentIndex.($this->display_key ? '&show_modules='.$this->display_key : '').'&token='.$this->token);
}
else
$this->errors[] = Tools::displayError('module cannot be loaded');
$this->errors[] = Tools::displayError('This module cannot be loaded');
}
else
$this->errors[] = Tools::displayError('You do not have permission to edit here.');
$this->errors[] = Tools::displayError('You do not have permission to edit this.');
}
// Add new module in hook
@@ -66,18 +66,18 @@ class AdminModulesPositionsControllerCore extends AdminController
$hook = new Hook($id_hook);
if (!$id_module || !Validate::isLoadedObject($module))
$this->errors[] = Tools::displayError('module cannot be loaded');
$this->errors[] = Tools::displayError('This module cannot be loaded');
elseif (!$id_hook || !Validate::isLoadedObject($hook))
$this->errors[] = Tools::displayError('Hook cannot be loaded.');
elseif (Hook::getModulesFromHook($id_hook, $id_module))
$this->errors[] = Tools::displayError('This module is already transplanted to this hook');
$this->errors[] = Tools::displayError('This module has already been transplanted to this hook');
elseif (!$module->isHookableOn($hook->name))
$this->errors[] = Tools::displayError('This module cannot be transplanted to this hook.');
// Adding vars...
else
{
if (!$module->registerHook($hook->name, Shop::getContextListShopID()))
$this->errors[] = Tools::displayError('An error occurred while transplanting module to hook.');
$this->errors[] = Tools::displayError('An error occurred while transplanting the module to its hook.');
else
{
$exceptions = Tools::getValue('exceptions');
@@ -89,17 +89,17 @@ class AdminModulesPositionsControllerCore extends AdminController
if (empty($except))
unset($exceptions[$key]);
else if (!Validate::isFileName($except))
$this->errors[] = Tools::displayError('No valid value for field exceptions');
$this->errors[] = Tools::displayError('No valid value for field exceptions has been defined.');
}
if (!$this->errors && !$module->registerExceptions($id_hook, $exceptions, Shop::getContextListShopID()))
$this->errors[] = Tools::displayError('An error occurred while transplanting module to hook.');
$this->errors[] = Tools::displayError('An error occurred while transplanting the module to its hook.');
}
if (!$this->errors)
Tools::redirectAdmin(self::$currentIndex.'&conf=16'.($this->display_key ? '&show_modules='.$this->display_key : '').'&token='.$this->token);
}
}
else
$this->errors[] = Tools::displayError('You do not have permission to add here.');
$this->errors[] = Tools::displayError('You do not have permission to add this.');
}
// Edit module from hook
@@ -114,7 +114,7 @@ class AdminModulesPositionsControllerCore extends AdminController
$hook = new Hook($id_hook);
if (!$id_module || !Validate::isLoadedObject($module))
$this->errors[] = Tools::displayError('module cannot be loaded');
$this->errors[] = Tools::displayError('This module cannot be loaded');
elseif (!$id_hook || !Validate::isLoadedObject($hook))
$this->errors[] = Tools::displayError('Hook cannot be loaded.');
else
@@ -129,14 +129,14 @@ class AdminModulesPositionsControllerCore extends AdminController
// Check files name
foreach ($exception as $except)
if (!Validate::isFileName($except))
$this->errors[] = Tools::displayError('No valid value for field exceptions');
$this->errors[] = Tools::displayError('No valid value for field exceptions has been defined.');
$exceptions[$id] = $exception;
}
// Add files exceptions
if (!$module->editExceptions($id_hook, $exceptions))
$this->errors[] = Tools::displayError('An error occurred while transplanting module to hook.');
$this->errors[] = Tools::displayError('An error occurred while transplanting the module to its hook.');
if (!$this->errors)
Tools::redirectAdmin(self::$currentIndex.'&conf=16'.($this->display_key ? '&show_modules='.$this->display_key : '').'&token='.$this->token);
@@ -148,18 +148,18 @@ class AdminModulesPositionsControllerCore extends AdminController
// Check files name
foreach ($exceptions as $except)
if (!Validate::isFileName($except))
$this->errors[] = Tools::displayError('No valid value for field exceptions');
$this->errors[] = Tools::displayError('No valid value for field exceptions has been defined.');
// Add files exceptions
if (!$module->editExceptions($id_hook, $exceptions, Shop::getContextListShopID()))
$this->errors[] = Tools::displayError('An error occurred while transplanting module to hook.');
$this->errors[] = Tools::displayError('An error occurred while transplanting the module to its hook.');
else
Tools::redirectAdmin(self::$currentIndex.'&conf=16'.($this->display_key ? '&show_modules='.$this->display_key : '').'&token='.$this->token);
}
}
}
else
$this->errors[] = Tools::displayError('You do not have permission to add here.');
$this->errors[] = Tools::displayError('You do not have permission to add this.');
}
// Delete module from hook
@@ -172,25 +172,25 @@ class AdminModulesPositionsControllerCore extends AdminController
$id_hook = (int)Tools::getValue('id_hook');
$hook = new Hook($id_hook);
if (!Validate::isLoadedObject($module))
$this->errors[] = Tools::displayError('module cannot be loaded');
$this->errors[] = Tools::displayError('This module cannot be loaded');
elseif (!$id_hook || !Validate::isLoadedObject($hook))
$this->errors[] = Tools::displayError('Hook cannot be loaded.');
else
{
if (!$module->unregisterHook($id_hook, Shop::getContextListShopID())
|| !$module->unregisterExceptions($id_hook, Shop::getContextListShopID()))
$this->errors[] = Tools::displayError('An error occurred while deleting module from hook.');
$this->errors[] = Tools::displayError('An error occurred while deleting the module from its hook.');
else
Tools::redirectAdmin(self::$currentIndex.'&conf=17'.($this->display_key ? '&show_modules='.$this->display_key : '').'&token='.$this->token);
}
}
else
$this->errors[] = Tools::displayError('You do not have permission to delete here.');
$this->errors[] = Tools::displayError('You do not have permission to delete this.');
}
elseif (Tools::isSubmit('unhookform'))
{
if (!($unhooks = Tools::getValue('unhooks')) || !is_array($unhooks))
$this->errors[] = Tools::displayError('Select a module to unhook.');
$this->errors[] = Tools::displayError('Please select a module to unhook.');
else
{
foreach ($unhooks as $unhook)
@@ -201,13 +201,13 @@ class AdminModulesPositionsControllerCore extends AdminController
$module = Module::getInstanceById((int)$id_module);
$hook = new Hook((int)$id_hook);
if (!Validate::isLoadedObject($module))
$this->errors[] = Tools::displayError('module cannot be loaded');
$this->errors[] = Tools::displayError('This module cannot be loaded');
elseif (!$id_hook || !Validate::isLoadedObject($hook))
$this->errors[] = Tools::displayError('Hook cannot be loaded.');
else
{
if (!$module->unregisterHook((int)$id_hook) || !$module->unregisterExceptions((int)$id_hook))
$this->errors[] = Tools::displayError('An error occurred while deleting module from hook.');
$this->errors[] = Tools::displayError('An error occurred while deleting the module from its hook.');
}
}
if (!count($this->errors))