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

// Fix to translations

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11470 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
tDidierjean
2011-12-21 11:05:55 +00:00
parent 16de8f7129
commit 3f3f99bded
9 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminEmployeesController.php
+2 -2
View File
@@ -57,11 +57,11 @@ class AdminEmployeesControllerCore extends AdminController
$this->fieldsDisplay = array(
'id_employee' => array('title' => $this->l('ID'), 'align' => 'center', 'width' => 25),
'lastname' => array('title' => $this->l('Last name'), 'width' => 130),
'lastname' => array('title' => $this->l('Last name'), 'width' => 'auto'),
'firstname' => array('title' => $this->l('First name'), 'width' => 130),
'email' => array('title' => $this->l('E-mail address'), 'width' => 180),
'profile' => array('title' => $this->l('Profile'), 'width' => 90, 'type' => 'select', 'list' => $this->profiles_array, 'filter_key' => 'pl!name'),
'active' => array('title' => $this->l('Can log in'), 'align' => 'center', 'active' => 'status', 'type' => 'bool'),
'active' => array('title' => $this->l('Can log in'), 'align' => 'center', 'active' => 'status', 'type' => 'bool', 'width' => 30),
);
$this->options = array(
controllers/admin/AdminLoginController.php
+1 -1
View File
@@ -52,7 +52,7 @@ class AdminLoginControllerCore extends AdminController
{
if ((empty($_SERVER['HTTPS']) OR strtolower($_SERVER['HTTPS']) == 'off') AND Configuration::get('PS_SSL_ENABLED'))
{
// You can uncomment theses lines if you want to force https even from localhost and automatically redirect
// You can uncomment these lines if you want to force https even from localhost and automatically redirect
// header('HTTP/1.1 301 Moved Permanently');
// header('Location: '.Tools::getShopDomainSsl(true).$_SERVER['REQUEST_URI']);
// exit();
controllers/admin/AdminTranslationsController.php
+1 -1
View File
@@ -1047,7 +1047,7 @@ class AdminTranslationsControllerCore extends AdminController
);
// Add js variables needed for autotranslate
$this->tpl_view_vars = array_merge($this->tpl_view_vars, $this->initAutoTranslate());
//$this->tpl_view_vars = array_merge($this->tpl_view_vars, $this->initAutoTranslate());
$this->initToolbar();
$this->base_tpl_view = 'translation_form.tpl';