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

[-] BO : #PSTEST-102: Texte d'une fenêtre de message en anglais

Browse Source
This commit is contained in:
lLefevre
2011-12-22 13:29:00 +00:00
parent cb0b535d3e
commit a58fcbc497
2 changed files with 340 additions and 338 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminTranslationsController.php
+5 -3
View File
@@ -733,7 +733,7 @@ class AdminTranslationsControllerCore extends AdminController
{
if ($group == 'core_mail' || $group == 'module_mail')
$array_subjects['core_and_modules']['translations'] = array_merge($array_subjects['core_and_modules']['translations'], $subject_translation);
else if ( isset($array_subjects['themes_and_modules']) && ($group == 'theme_mail' || $group == 'theme_module_mail')) {
elseif ( isset($array_subjects['themes_and_modules']) && ($group == 'theme_mail' || $group == 'theme_module_mail')) {
$array_subjects['themes_and_modules']['translations'] = array_merge($array_subjects['themes_and_modules']['translations'], $subject_translation);
}
}
@@ -911,11 +911,11 @@ class AdminTranslationsControllerCore extends AdminController
$tabs = scandir(_PS_ADMIN_CONTROLLER_DIR_);
$tabs = array_merge($tabs, Tools::scandir(_PS_ADMIN_CONTROLLER_DIR_, 'php', '../../classes/helper'));
$tabs[] = '../../classes/AdminController.php';
$files = array();
$i=0;
foreach ($tabs as $tab)
if (preg_match('/^(.*)\.php$/', $tab) AND file_exists($tpl = _PS_ADMIN_CONTROLLER_DIR_.$tab))
if (preg_match('/^(.*)\.php$/', $tab) && file_exists($tpl = _PS_ADMIN_CONTROLLER_DIR_.$tab))
{
// -4 becomes -14 to remove the ending "Controller.php" from the filename
$prefix_key = basename(substr($tab, 0, -14));
@@ -923,6 +923,8 @@ class AdminTranslationsControllerCore extends AdminController
// @todo this is retrocompatible, but we should not leave this
if ( $prefix_key == 'Admin')
$prefix_key = 'AdminController';
elseif ($prefix_key == 'helper' || $prefix_key == 'Hel')
$prefix_key = 'Helper';
$fd = fopen($tpl, 'r');
$content = fread($fd, filesize($tpl));
fclose($fd);