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

//default language fix in carrier wizard

Browse Source
This commit is contained in:
Vincent Augagneur
2013-08-06 16:05:36 +02:00
parent c8564fa6b2
commit bcaa625f4c
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
controllers/admin/AdminCarrierWizardController.php
View File

@@ -52,6 +52,7 @@ class AdminCarrierWizardControllerCore extends AdminController
{
parent::setMedia();
$this->addJqueryPlugin('smartWizard');
$this->addJqueryPlugin('typewatch');
$this->addJs(_PS_JS_DIR_.'admin_carrier_wizard.js');
}
@@ -503,7 +504,8 @@ class AdminCarrierWizardControllerCore extends AdminController
$helper = new HelperForm();
$helper->show_toolbar = false;
$helper->table = $this->table;
$helper->default_form_language = $this->context->language->id;
$lang = new Language((int)Configuration::get('PS_LANG_DEFAULT'));
$helper->default_form_language = $lang->id;
$helper->allow_employee_form_lang = Configuration::get('PS_BO_ALLOW_EMPLOYEE_FORM_LANG') ? Configuration::get('PS_BO_ALLOW_EMPLOYEE_FORM_LANG') : 0;
$this->fields_form = array();
$helper->id = (int)Tools::getValue('id_carrier');