From 7e3e03b86927abe152bef0daa5e4d84a4ef7231a Mon Sep 17 00:00:00 2001 From: lLefevre Date: Tue, 17 Apr 2012 09:51:55 +0000 Subject: [PATCH] [-] BO : fix #PSFV-870 : translations modules git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14677 b9a71923-0436-4b27-9f14-aed3839534dd --- .../translations/helpers/view/translation_modules.tpl | 4 ++-- controllers/admin/AdminTranslationsController.php | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/admin-dev/themes/default/template/controllers/translations/helpers/view/translation_modules.tpl b/admin-dev/themes/default/template/controllers/translations/helpers/view/translation_modules.tpl index 9612532c4..4d0614b91 100644 --- a/admin-dev/themes/default/template/controllers/translations/helpers/view/translation_modules.tpl +++ b/admin-dev/themes/default/template/controllers/translations/helpers/view/translation_modules.tpl @@ -57,11 +57,11 @@

{l s='List of Themes - Click to access theme translation:'}

{/if} - + {foreach $modules_translations as $theme_name => $theme}

>{l s='Theme:'} {if $theme_name === $default_theme_name}{l s='default'}{else}{$theme_name}{/if}

{foreach $theme as $module_name => $module} diff --git a/controllers/admin/AdminTranslationsController.php b/controllers/admin/AdminTranslationsController.php index e4f5e4985..2dd930be2 100644 --- a/controllers/admin/AdminTranslationsController.php +++ b/controllers/admin/AdminTranslationsController.php @@ -1910,12 +1910,13 @@ class AdminTranslationsControllerCore extends AdminController $arr_files = $this->getAllModuleFiles($modules, _PS_MODULE_DIR_, $lang, true); $arr_find_and_fill = array_merge($arr_find_and_fill, $arr_files); - if (file_exists(_PS_THEME_DIR_.'/modules/')) + if (file_exists(_PS_THEME_DIR_.'modules/')) { - $modules = scandir(_PS_THEME_DIR_.'/modules/'); + $modules = scandir(_PS_THEME_DIR_.'modules/'); $arr_files = $this->getAllModuleFiles($modules, _PS_THEME_DIR_.'modules/', $lang); $arr_find_and_fill = array_merge($arr_find_and_fill, $arr_files); } + foreach ($arr_find_and_fill as $value) $this->findAndFillTranslations($value['files'], $value['theme'], $value['module'], $value['dir'], $lang);