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

[-] BO : PSTEST-1216 : Fix translations lost

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14811 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
lLefevre
2012-04-23 13:07:32 +00:00
parent 0be8cc5693
commit 6b387a1e43
2 changed files with 65 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminTranslationsController.php
+5 -5
View File
@@ -1392,10 +1392,10 @@ class AdminTranslationsControllerCore extends AdminController
// Get all types of file (PHP, TPL...) and a list of files to parse by folder
$files_per_directory = $this->getFileToParseByTypeTranslation();
foreach ($files_per_directory['php'] as $dir)
foreach ($dir as $file)
foreach ($files_per_directory['php'] as $dir => $files)
foreach ($files as $file)
// Check if is a PHP file and if the override file exists
if (preg_match('/^(.*)\.php$/', $file) && Tools::file_exists_cache($file_path = _PS_ADMIN_CONTROLLER_DIR_.$file) && !in_array($file, $this->ignore_folder))
if (preg_match('/^(.*)\.php$/', $file) && Tools::file_exists_cache($file_path = $dir.$file) && !in_array($file, $this->ignore_folder))
{
$prefix_key = basename($file);
// -4 becomes -14 to remove the ending "Controller.php" from the filename
@@ -1436,8 +1436,8 @@ class AdminTranslationsControllerCore extends AdminController
}
}
foreach ($files_per_directory['specific'] as $dir => $array_file)
foreach ($array_file as $file)
foreach ($files_per_directory['specific'] as $dir => $files)
foreach ($files as $file)
if (Tools::file_exists_cache($file_path = $dir.$file) && !in_array($file, $this->ignore_folder))
{
$prefix_key = 'index';