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

// Fix helper translations

Browse Source
This commit is contained in:
tDidierjean
2011-11-23 15:28:05 +00:00
parent 2d3403f8e4
commit a2c22b15a8
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/AdminController.php
+2
View File
@@ -1554,6 +1554,8 @@ class AdminControllerCore extends Controller
// @todo : change AdminTab to Helper
if ( isset($_LANGADM[$class.$key]))
$str = $_LANGADM[$class.$key];
elseif ( isset($_LANGADM['helper'.$key]))
$str = $_LANGADM['helper'.$key];
elseif ( isset($_LANGADM['admintab'.$key]))
$str = $_LANGADM['admintab'.$key];
else
controllers/admin/AdminTranslationsController.php
+3 -1
View File
@@ -916,7 +916,7 @@ class AdminTranslationsControllerCore extends AdminController
// -4 becomes -14 to remove the ending "Controller.php" from the filename
$prefix_key = basename(substr($tab, 0, -14));
// @todo this is retrcompatible, but we should not leave this
// @todo this is retrocompatible, but we should not leave this
if ( $prefix_key == 'Admin')
$prefix_key = 'AdminController';
$fd = fopen($tpl, 'r');
@@ -978,6 +978,8 @@ class AdminTranslationsControllerCore extends AdminController
// get controller name instead of file name
$prefix_key = Tools::toCamelCase(str_replace(_PS_ADMIN_DIR_.DIRECTORY_SEPARATOR.'themes'.DIRECTORY_SEPARATOR.'template'.DIRECTORY_SEPARATOR, '', $tpl), true);
$prefix_key = 'Admin'.substr($prefix_key, 0, strpos($prefix_key, DIRECTORY_SEPARATOR));
if ($prefix_key == 'AdminHelper')
$prefix_key = 'Helper';
// @todo retrompatibility : we assume here than files directly in template/
// use the prefix "AdminController" (like old php files 'header', 'footer.inc', 'index', 'login', 'password', 'functions'