From bcaa625f4cde6622ad35c0dec78b3ef60c8a873b Mon Sep 17 00:00:00 2001
From: Vincent Augagneur <vincent.augagneur@prestashop.com>
Date: Tue, 6 Aug 2013 16:05:36 +0200
Subject: [PATCH] //default language fix in carrier wizard

---
 controllers/admin/AdminCarrierWizardController.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/controllers/admin/AdminCarrierWizardController.php b/controllers/admin/AdminCarrierWizardController.php
index 392572662..a3a72a2b3 100644
--- a/controllers/admin/AdminCarrierWizardController.php
+++ b/controllers/admin/AdminCarrierWizardController.php
@@ -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');