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

// Small fix translations

Browse Source
This commit is contained in:
Damien Metzger committed 2013-04-24 15:29:00 +02:00
1 parent 3948903884
commit 64684fe6c9
1 file changed
+3 -3
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminTranslationsController.php
+3 -3
View File
@@ -806,10 +806,10 @@ class AdminTranslationsControllerCore extends AdminController
foreach ($files as $file) foreach ($files as $file)
{ {
if (preg_match('/^(.*).(tpl|php)$/', $file) && Tools::file_exists_cache($file_path = $dir.$file) && !in_array($file, self::$ignore_folder)) if (preg_match('/^(.*).(tpl|php)$/', $file) && Tools::file_exists_cache($dir.$file) && !in_array($file, self::$ignore_folder))
{ {
// Get content for this file // Get content for this file
$content = file_get_contents($file_path); $content = file_get_contents($dir.$file);
// Get file type // Get file type
$type_file = substr($file, -4) == '.tpl' ? 'tpl' : 'php'; $type_file = substr($file, -4) == '.tpl' ? 'tpl' : 'php';
@@ -2546,7 +2546,7 @@ class AdminTranslationsControllerCore extends AdminController
} }
// Then we load the overriden translation file // Then we load the overriden translation file
if (isset($this->translations_informations[$this->type_selected]['override'])) if ($this->theme_selected && isset($this->translations_informations[$this->type_selected]['override']))
{ {
$i18n_dir = $this->translations_informations[$this->type_selected]['override']['dir']; $i18n_dir = $this->translations_informations[$this->type_selected]['override']['dir'];
if (is_dir($i18n_dir.$module)) if (is_dir($i18n_dir.$module))