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

// missing files

Browse Source
This commit is contained in:
fBrignoli
2012-04-11 08:30:02 +00:00
parent 0ea2a33bc4
commit fd6d92d5c4
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/defines_uri.inc.php
+2 -2
View File
@@ -32,14 +32,14 @@ define('_THEME_DIR_', _THEMES_DIR_._THEME_NAME_.'/');
define('_THEME_IMG_DIR_', _THEME_DIR_.'img/'); define('_THEME_IMG_DIR_', _THEME_DIR_.'img/');
define('_THEME_CSS_DIR_', _THEME_DIR_.'css/'); define('_THEME_CSS_DIR_', _THEME_DIR_.'css/');
define('_THEME_JS_DIR_', _THEME_DIR_.'js/'); define('_THEME_JS_DIR_', _THEME_DIR_.'js/');
define('_THEME_OVERRIDE_DIR_', _PS_THEME_DIR_.'override/'); define('_PS_THEME_OVERRIDE_DIR_', _PS_THEME_DIR_.'override/');
/* For mobile devices */ /* For mobile devices */
if (file_exists(_PS_THEME_DIR_.'mobile/')) if (file_exists(_PS_THEME_DIR_.'mobile/'))
{ {
define('_PS_THEME_MOBILE_DIR_', _PS_THEME_DIR_.'mobile/'); define('_PS_THEME_MOBILE_DIR_', _PS_THEME_DIR_.'mobile/');
define('_THEME_MOBILE_DIR_', _THEMES_DIR_._THEME_NAME_.'/mobile/'); define('_THEME_MOBILE_DIR_', _THEMES_DIR_._THEME_NAME_.'/mobile/');
define('_THEME_MOBILE_OVERRIDE_DIR_', _PS_THEME_MOBILE_DIR_.'override/'); define('_PS_THEME_MOBILE_OVERRIDE_DIR_', _PS_THEME_MOBILE_DIR_.'override/');
} }
else else
{ {
config/smartyfront.config.inc.php
+6 -1
View File
@@ -37,11 +37,15 @@ function smartyTranslate($params, &$smarty)
$string = str_replace('\'', '\\\'', $params['s']); $string = str_replace('\'', '\\\'', $params['s']);
$filename = ((!isset($smarty->compiler_object) || !is_object($smarty->compiler_object->template)) ? $smarty->template_resource : $smarty->compiler_object->template->getTemplateFilepath()); $filename = ((!isset($smarty->compiler_object) || !is_object($smarty->compiler_object->template)) ? $smarty->template_resource : $smarty->compiler_object->template->getTemplateFilepath());
$key = Tools::substr(basename($filename), 0, -4).'_'.md5($string); $key = Tools::substr(basename($filename), 0, -4).'_'.md5($string);
if (isset($smarty->source) && preg_match('#/override/#', $smarty->source->filepath))
$key = 'override_'.$key;
$lang_array = $_LANG; $lang_array = $_LANG;
if ($params['mod']) if ($params['mod'])
return Translate::getModuleTranslation($params['mod'], $params['s'], Tools::substr(basename($filename), 0, -4)); return Translate::getModuleTranslation($params['mod'], $params['s'], Tools::substr(basename($filename), 0, -4));
else if ($params['pdf']) else if ($params['pdf'])
return Translate::getPdfTranslation($params['s']); return Translate::getPdfTranslation($params['s']);
if ($lang_array != null && isset($lang_array[$key])) if ($lang_array != null && isset($lang_array[$key]))
@@ -56,3 +60,4 @@ function smartyTranslate($params, &$smarty)
return $params['js'] ? $msg : Tools::htmlentitiesUTF8($msg); return $params['js'] ? $msg : Tools::htmlentitiesUTF8($msg);
} }
controllers/admin/AdminTranslationsController.php
+1 -1
View File
@@ -941,7 +941,7 @@ class AdminTranslationsControllerCore extends AdminController
foreach ($templates_per_directory as $template_dir => $templates) foreach ($templates_per_directory as $template_dir => $templates)
{ {
$prefix = ''; $prefix = '';
if ($template_dir == _THEME_OVERRIDE_DIR_) if ($template_dir == _PS_THEME_OVERRIDE_DIR_)
$prefix = 'override_'; $prefix = 'override_';
foreach ($templates as $template) foreach ($templates as $template)