From e8c0195ee93391588ff82d85973c7f2e74c421b2 Mon Sep 17 00:00:00 2001
From: Damien Metzger <damien.metzger@prestashop.com>
Date: Mon, 4 Nov 2013 17:04:09 +0100
Subject: [PATCH 1/2] // small fix merge

---
 .../themes/default/template/controllers/products/features.tpl   | 2 +-
 .../default/template/controllers/products/helpers/form/form.tpl | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/admin-dev/themes/default/template/controllers/products/features.tpl b/admin-dev/themes/default/template/controllers/products/features.tpl
index 264b53808..18a396189 100644
--- a/admin-dev/themes/default/template/controllers/products/features.tpl
+++ b/admin-dev/themes/default/template/controllers/products/features.tpl
@@ -113,6 +113,6 @@
 </div>
 {/if}
 <script type="text/javascript">
-	hideOtherLanguage({$default_language});
+	hideOtherLanguage(default_language);
 	$(".textarea-autosize").autosize();
 </script>
\ No newline at end of file
diff --git a/admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl
index 8bf2c6716..bc11b0a9f 100644
--- a/admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl
@@ -101,6 +101,8 @@
 				var display_multishop_checkboxes = false;
 			{/if}
 
+			var default_language = '{$default_language|addslashes}';
+			
 			$(document).ready(function()
 			{
 				hideOtherLanguage(default_language);

From ac1f142f234ccd4e2be4148ff5fcf1b911b85cf1 Mon Sep 17 00:00:00 2001
From: Damien Metzger <damien.metzger@prestashop.com>
Date: Mon, 4 Nov 2013 17:08:17 +0100
Subject: [PATCH 2/2] // Moved default_language

---
 .../default/template/controllers/products/helpers/form/form.tpl | 2 --
 admin-dev/themes/default/template/header.tpl                    | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl
index bc11b0a9f..8bf2c6716 100644
--- a/admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl
@@ -101,8 +101,6 @@
 				var display_multishop_checkboxes = false;
 			{/if}
 
-			var default_language = '{$default_language|addslashes}';
-			
 			$(document).ready(function()
 			{
 				hideOtherLanguage(default_language);
diff --git a/admin-dev/themes/default/template/header.tpl b/admin-dev/themes/default/template/header.tpl
index b89855d1f..df67e525d 100644
--- a/admin-dev/themes/default/template/header.tpl
+++ b/admin-dev/themes/default/template/header.tpl
@@ -71,6 +71,7 @@
 		var token_admin_customer_threads = '{getAdminToken tab='AdminCustomerThreads'}';
 		var currentIndex = '{$currentIndex|@addcslashes:'\''}';
 		var choose_language_translate = '{l s='Choose language' js=1}';
+		var default_language = '{$default_language|addslashes}';
 	</script>
 {/if}
 {if isset($css_files)}