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

[*] MO : change calls method Tools::displayError() by $name_module->l() && Translations

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15094 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
lLefevre
2012-05-09 10:06:23 +00:00
parent 8947a4be80
commit eccb5b7da2
60 changed files with 336 additions and 278 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/shopimporter/ajax.php
+17 -16
View File
@@ -29,8 +29,8 @@ $apikey = Tools::getValue('apikey');
if (Tools::isSubmit('checkAndSaveConfig'))
{
//cleans the database if an import has already been done
$shopImporter = new shopImporter();
foreach($shopImporter->supportedImports as $key => $import)
$shop_importer = new shopImporter();
foreach($shop_importer->supportedImports as $key => $import)
if (array_key_exists('alterTable', $import))
$columns = Db::getInstance()->executeS('SHOW COLUMNS FROM `'._DB_PREFIX_.bqSQL($import['table']).'`');
foreach ($columns as $column)
@@ -39,7 +39,7 @@ if (Tools::isSubmit('checkAndSaveConfig'))
if ($link = @mysql_connect(Tools::getValue('server'), Tools::getValue('user'), Tools::getValue('password')))
{
if (!@mysql_select_db(Tools::getValue('database'), $link))
die('{"hasError" : true, "error" : ["'.Tools::displayError('The database selection cannot be made.').'"]}');
die('{"hasError" : true, "error" : ["'.$shop_importer->l('The database selection cannot be made.', 'ajax').'"]}');
else
{
@mysql_close($link);
@@ -47,7 +47,7 @@ if (Tools::isSubmit('checkAndSaveConfig'))
}
}
else
die('{"hasError" : true, "error" : ["'.Tools::displayError('Link to database cannot be established.').'"]}');
die('{"hasError" : true, "error" : ["'.$shop_importer->l('Link to database cannot be established.', 'ajax').'"]}');
}
@@ -70,8 +70,8 @@ if (Tools::isSubmit('getData') || Tools::isSubmit('syncLang') || Tools::isSubmit
else
{
$return = call_user_func_array(array($importModule, $getMethod), array($limit, $nbr_import));
$shopImporter = new shopImporter();
$shopImporter->genericImport($className, $return, (bool)$save);
$shop_importer = new shopImporter();
$shop_importer->genericImport($className, $return, (bool)$save);
}
}
}
@@ -94,8 +94,8 @@ if (Tools::isSubmit('getDataWS') || Tools::isSubmit('syncLangWS') || Tools::isSu
else
{
$return = call_user_func_array(array($importModule, $getMethod), array($limit, $nbr_import));
$shopImporter = new shopImporter();
$shopImporter->genericImport($className, $return, (bool)$save);
$shop_importer = new shopImporter();
$shop_importer->genericImport($className, $return, (bool)$save);
}
die('{"hasError" : false, "error" : []}');
} catch (Exception $e)
@@ -107,8 +107,8 @@ if (Tools::isSubmit('getDataWS') || Tools::isSubmit('syncLangWS') || Tools::isSu
if (Tools::isSubmit('truncatTable'))
{
$shopImporter = new shopImporter();
if ($shopImporter->truncateTable($className))
$shop_importer = new shopImporter();
if ($shop_importer->truncateTable($className))
die('{"hasError" : false, "error" : []}');
else
die('{"hasError" : true, "error" : ["'.$className.'"]}');
@@ -116,9 +116,9 @@ if (Tools::isSubmit('truncatTable'))
}
if (Tools::isSubmit('alterTable'))
{
$shopImporter = new shopImporter();
if ($shopImporter->alterTable($className))
{
$shop_importer = new shopImporter();
if ($shop_importer->alterTable($className))
die('{"hasError" : false, "error" : []}');
else
die('{"hasError" : true, "error" : ["'.$className.'"]}');
@@ -126,9 +126,10 @@ if (Tools::isSubmit('alterTable'))
}
if (Tools::isSubmit('displaySpecificOptions'))
{
{
if (file_exists('../../modules/'.$moduleName.'/'.$moduleName.'.php'))
{
$shop_importer = new shopImporter();
require_once('../../modules/'.$moduleName.'/'.$moduleName.'.php');
$importModule = new $moduleName();
$importModule->server = $server;
@@ -139,14 +140,14 @@ if (Tools::isSubmit('displaySpecificOptions'))
if ($link = @mysql_connect(Tools::getValue('server'), Tools::getValue('user'), Tools::getValue('password')))
{
if(!@mysql_select_db(Tools::getValue('database'), $link))
die(Tools::displayError('The database selection cannot be made.'));
die($shop_importer->l('The database selection cannot be made.', 'ajax'));
elseif (method_exists($importModule, 'displaySpecificOptions'))
die($importModule->displaySpecificOptions());
else
die('not_exist');
}
else
die(Tools::displayError('Link to database cannot be established.'));
die($shop_importer->l('Link to database cannot be established.', 'ajax'));
}
}
elseif (Tools::isSubmit('displaySpecificOptionsWsdl'))
modules/shopimporter/shopimporter.php
+6 -6
View File
@@ -1187,7 +1187,7 @@ class shopimporter extends ImportModule
if ($gz->extract(_PS_TRANSLATIONS_DIR_.'../', false))
{
if (!Language::checkAndAddLanguage($iso))
$errors[] = Tools::displayError('Archive cannot be extracted.');
$errors[] = $this->l('Archive cannot be extracted.');
else
{
$newId = Language::getIdByIso($iso);
@@ -1196,19 +1196,19 @@ class shopimporter extends ImportModule
WHERE `id_lang` = '.(int)$newId);
}
}
$errors[] = Tools::displayError('Archive cannot be extracted.');
$errors[] = $this->l('Archive cannot be extracted.');
}
else
$errors[] = Tools::displayError('Server does not have permissions for writing.');
$errors[] = $this->l('Server does not have permissions for writing.');
}
else
$errors[] = Tools::displayError('Language not found');
$errors[] = $this->l('Language not found');
}
else
$errors[] = Tools::displayError('archive cannot be downloaded from prestashop.com.');
$errors[] = $this->l('archive cannot be downloaded from prestashop.com.');
}
else
$errors[] = Tools::displayError('archive cannot be downloaded from prestashop.com.');
$errors[] = $this->l('archive cannot be downloaded from prestashop.com.');
}
}
else
modules/shopimporter/translations/de.php
+6
View File
@@ -2,6 +2,8 @@
global $_MODULE;
$_MODULE = array();
$_MODULE['<{shopimporter}prestashop>ajax_10f237be40b3205ba97da9b89d290c30'] = 'Kann keine Datenbank auswählen.';
$_MODULE['<{shopimporter}prestashop>ajax_49bd922182bd3518641589e3077eacd3'] = 'Kann keine Verbindung zur Datenbank herstellen.';
$_MODULE['<{shopimporter}prestashop>shopimporter_d714c742b360a8ecbb124c15e9a391a1'] = 'Shop Importeur';
$_MODULE['<{shopimporter}prestashop>shopimporter_8c0fe18034f47d7d3dd3e58098e3ffdb'] = 'Dieses Modul ermöglicht es Ihnen, Ihren Shop aus einem anderen System zu prestashop zu importieren ';
$_MODULE['<{shopimporter}prestashop>shopimporter_4994a8ffeba4ac3140beb89e8d41f174'] = 'Sprache';
@@ -86,3 +88,7 @@ $_MODULE['<{shopimporter}prestashop>shopimporter_f755e8b92cb8f02c24f6f539180d45b
$_MODULE['<{shopimporter}prestashop>shopimporter_70f4b635847038d056e33959821a7a66'] = 'max. Warenkörbe';
$_MODULE['<{shopimporter}prestashop>shopimporter_998b344cff693ad388a14ba89b1523c7'] = 'ist ungültig';
$_MODULE['<{shopimporter}prestashop>shopimporter_7e47a344b06d82a8836cbee2748a79e6'] = 'ist mindestens erforderlich in';
$_MODULE['<{shopimporter}prestashop>shopimporter_44205a67121fcca5ffa925d1ed77b65e'] = 'Das Archiv kann nicht extrahiert werden';
$_MODULE['<{shopimporter}prestashop>shopimporter_edeb9e20655b946e4bee4ac44a6c0a7f'] = 'Der Server verfügt nicht über die Schreibberechtigungen';
$_MODULE['<{shopimporter}prestashop>shopimporter_6cf73576720519e739771a4fa489410b'] = 'Sprache nicht gefunden';
$_MODULE['<{shopimporter}prestashop>shopimporter_179bdae10ca983dd1cf9cd1a4bf4f20a'] = 'Das Archiv kann nicht von Prestashop.com heruntergeladen werden';
modules/shopimporter/translations/es.php
+6
View File
@@ -2,6 +2,8 @@
global $_MODULE;
$_MODULE = array();
$_MODULE['<{shopimporter}prestashop>ajax_10f237be40b3205ba97da9b89d290c30'] = 'La selección de la base de datos no se puede realizar.';
$_MODULE['<{shopimporter}prestashop>ajax_49bd922182bd3518641589e3077eacd3'] = 'El enlace con la base de datos no se puede establecer';
$_MODULE['<{shopimporter}prestashop>shopimporter_d714c742b360a8ecbb124c15e9a391a1'] = 'Import de tienda';
$_MODULE['<{shopimporter}prestashop>shopimporter_8c0fe18034f47d7d3dd3e58098e3ffdb'] = 'Este módulo le permite importar su tienda a partir de otro sistema.';
$_MODULE['<{shopimporter}prestashop>shopimporter_4994a8ffeba4ac3140beb89e8d41f174'] = 'Idiomas';
@@ -85,3 +87,7 @@ $_MODULE['<{shopimporter}prestashop>shopimporter_f755e8b92cb8f02c24f6f539180d45b
$_MODULE['<{shopimporter}prestashop>shopimporter_70f4b635847038d056e33959821a7a66'] = 'caracteres máximos';
$_MODULE['<{shopimporter}prestashop>shopimporter_998b344cff693ad388a14ba89b1523c7'] = 'no es válido';
$_MODULE['<{shopimporter}prestashop>shopimporter_7e47a344b06d82a8836cbee2748a79e6'] = 'es necesario en';
$_MODULE['<{shopimporter}prestashop>shopimporter_44205a67121fcca5ffa925d1ed77b65e'] = 'El archivo no puede extraerse';
$_MODULE['<{shopimporter}prestashop>shopimporter_edeb9e20655b946e4bee4ac44a6c0a7f'] = 'El servidor no dispone de permisos para la escritura';
$_MODULE['<{shopimporter}prestashop>shopimporter_6cf73576720519e739771a4fa489410b'] = 'no se encuentra el idioma';
$_MODULE['<{shopimporter}prestashop>shopimporter_179bdae10ca983dd1cf9cd1a4bf4f20a'] = 'El archivo no se puede descargar a partir de PrestaShop.com';
modules/shopimporter/translations/fr.php
+5
View File
@@ -2,6 +2,8 @@
global $_MODULE;
$_MODULE = array();
$_MODULE['<{shopimporter}prestashop>ajax_10f237be40b3205ba97da9b89d290c30'] = 'Impossible de sélectionner la base de données.';
$_MODULE['<{shopimporter}prestashop>ajax_49bd922182bd3518641589e3077eacd3'] = 'Impossible de se connecter à la base de données.';
$_MODULE['<{shopimporter}prestashop>shopimporter_d714c742b360a8ecbb124c15e9a391a1'] = 'Import de boutique';
$_MODULE['<{shopimporter}prestashop>shopimporter_8c0fe18034f47d7d3dd3e58098e3ffdb'] = 'Ce module vous permet d\'importer votre boutique depuis autre système.';
$_MODULE['<{shopimporter}prestashop>shopimporter_4994a8ffeba4ac3140beb89e8d41f174'] = 'Langues';
@@ -86,3 +88,6 @@ $_MODULE['<{shopimporter}prestashop>shopimporter_f755e8b92cb8f02c24f6f539180d45b
$_MODULE['<{shopimporter}prestashop>shopimporter_70f4b635847038d056e33959821a7a66'] = 'caractères max.';
$_MODULE['<{shopimporter}prestashop>shopimporter_998b344cff693ad388a14ba89b1523c7'] = 'n\'est pas valable';
$_MODULE['<{shopimporter}prestashop>shopimporter_7e47a344b06d82a8836cbee2748a79e6'] = 'est nécessaire au moins dans ';
$_MODULE['<{shopimporter}prestashop>shopimporter_44205a67121fcca5ffa925d1ed77b65e'] = 'L\'archive ne peut être extraite.';
$_MODULE['<{shopimporter}prestashop>shopimporter_edeb9e20655b946e4bee4ac44a6c0a7f'] = 'Le serveur ne dispose pas des permissions pour l\'écriture.';
$_MODULE['<{shopimporter}prestashop>shopimporter_6cf73576720519e739771a4fa489410b'] = 'Langue introuvable';
modules/shopimporter/translations/it.php
+6
View File
@@ -2,6 +2,8 @@
global $_MODULE;
$_MODULE = array();
$_MODULE['<{shopimporter}prestashop>ajax_10f237be40b3205ba97da9b89d290c30'] = 'Impossibile selezionare il database.';
$_MODULE['<{shopimporter}prestashop>ajax_49bd922182bd3518641589e3077eacd3'] = 'Impossibile connettersi al database.';
$_MODULE['<{shopimporter}prestashop>shopimporter_d714c742b360a8ecbb124c15e9a391a1'] = 'Importatore negozio';
$_MODULE['<{shopimporter}prestashop>shopimporter_8c0fe18034f47d7d3dd3e58098e3ffdb'] = 'Questo modulo ti consente di importare il tuo negozio da un altro sistema in PrestaShop';
$_MODULE['<{shopimporter}prestashop>shopimporter_4994a8ffeba4ac3140beb89e8d41f174'] = 'Lingua';
@@ -86,3 +88,7 @@ $_MODULE['<{shopimporter}prestashop>shopimporter_f755e8b92cb8f02c24f6f539180d45b
$_MODULE['<{shopimporter}prestashop>shopimporter_70f4b635847038d056e33959821a7a66'] = 'caratteri max';
$_MODULE['<{shopimporter}prestashop>shopimporter_998b344cff693ad388a14ba89b1523c7'] = 'non è valido';
$_MODULE['<{shopimporter}prestashop>shopimporter_7e47a344b06d82a8836cbee2748a79e6'] = 'è richiesto almeno in';
$_MODULE['<{shopimporter}prestashop>shopimporter_44205a67121fcca5ffa925d1ed77b65e'] = 'L\'archivio non può essere estratto';
$_MODULE['<{shopimporter}prestashop>shopimporter_edeb9e20655b946e4bee4ac44a6c0a7f'] = 'Il server non dispone di permessi per la scrittura';
$_MODULE['<{shopimporter}prestashop>shopimporter_6cf73576720519e739771a4fa489410b'] = 'lingua introvabile';
$_MODULE['<{shopimporter}prestashop>shopimporter_179bdae10ca983dd1cf9cd1a4bf4f20a'] = 'L\'archivio non può essere caricato da Prestashop.com';