// Merge -> revision 9385

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9386 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-17 09:55:33 +00:00
parent a7bc16dadd
commit 336fb68ef4
15 changed files with 51 additions and 17 deletions
@@ -1488,6 +1488,7 @@ class AdminTranslations extends AdminTab
 			_PS_ROOT_DIR_.'/controllers',
 			_PS_ROOT_DIR_.'/classes',
 		_PS_ADMIN_DIR_.'/tabs',
+			PS_ADMIN_DIR,
 		);
 		$arr_files_to_parse = array_merge($arr_files_to_parse, $modules_has_mails);
 		foreach ($arr_files_to_parse as $path) {
@@ -1612,7 +1613,7 @@ class AdminTranslations extends AdminTab
 							if ($tab2 && isset($tab2[1]))
 							{
 								$tab2[1] = trim(str_replace('\'', '', $tab2[1]));
-								if (preg_match('/Mail::l\(\''._PS_TRANS_PATTERN_.'\'/s', $tab2[2], $tab3))
+								if (preg_match('/Mail::l\(\''._PS_TRANS_PATTERN_.'\'(\)|,)/s', $tab2[2], $tab3))
 									$tab2[2] = $tab3[1];
 								$subject_mail[$tab2[1]] = $tab2[2];
 							}