// fixed bug about translations when using form.tpl in admin, thanks to Samy Rabbih for the report,

// added missing slashes attributes in admin header for javascript

admin-dev/themes/default/template/header.tpl

@@ -40,31 +40,31 @@
 				var roundMode = {$round_mode};
 				{if isset($shop_context)}
 					{if $shop_context == 'all'}
-						var youEditFieldFor = "{l s='A modification of this field will be applied for all shops'}";
+						var youEditFieldFor = "{l s='A modification of this field will be applied for all shops' slashes=1 }";
 					{elseif $shop_context == 'group'}
-						var youEditFieldFor = "{l s='A modification of this field will be applied for all shops of group '}<b>{$shop_name}</b>";
+						var youEditFieldFor = "{l s='A modification of this field will be applied for all shops of group ' slashes=1 }<b>{$shop_name}</b>";
 					{else}
-						var youEditFieldFor = "{l s='A modification of this field will be applied for the shop '}<b>{$shop_name}</b>";
+						var youEditFieldFor = "{l s='A modification of this field will be applied for the shop ' slashes=1 }<b>{$shop_name}</b>";
 					{/if}
 				{else}
 					var youEditFieldFor = '';
 				{/if}
 				{* Notifications vars *}
 				var autorefresh_notifications = '{$autorefresh_notifications}';
-				var new_order_msg = '{l s='A new order has been made on your shop.'}';
+				var new_order_msg = '{l s='A new order has been made on your shop.' slashes=1 }';
-				var order_number_msg = '{l s='Order number : '}';
+				var order_number_msg = '{l s='Order number : ' slashes=1 }';
-				var total_msg = '{l s='Total : '}';
+				var total_msg = '{l s='Total : ' slashes=1 }';
-				var from_msg = '{l s='From : '}';
+				var from_msg = '{l s='From : ' slashes=1 }';
-				var see_order_msg = '{l s='Click here to see that order'}';
+				var see_order_msg = '{l s='Click here to see that order' slashes=1 }';
-				var new_customer_msg = '{l s='A new customer registered on your shop.'}';
+				var new_customer_msg = '{l s='A new customer registered on your shop.' slashes=1}';
-				var customer_name_msg = '{l s='Customer name : '}';
+				var customer_name_msg = '{l s='Customer name : ' slashes=1 }';
-				var see_customer_msg = '{l s='Click here to see that customer'}';
+				var see_customer_msg = '{l s='Click here to see that customer' slashes=1 }';
-				var new_msg = '{l s='A new message posted on your shop.'}';
+				var new_msg = '{l s='A new message posted on your shop.' slashes=1 }';
-				var excerpt_msg = '{l s='Excerpt : '}';
+				var excerpt_msg = '{l s='Excerpt : ' slashes=1 }';
-				var see_msg = '{l s='Click here to see that message'}';
+				var see_msg = '{l s='Click here to see that message' slashes=1 }';
-				var token_admin_orders = '{getAdminToken tab='AdminOrders'}';
+				var token_admin_orders = '{getAdminToken tab='AdminOrders' slashes=1 }';
-				var token_admin_customers = '{getAdminToken tab='AdminCustomers'}';
+				var token_admin_customers = '{getAdminToken tab='AdminCustomers' slashes=1 }';
-				var token_admin_customer_threads = '{getAdminToken tab='AdminCustomerThreads'}';
+				var token_admin_customer_threads = '{getAdminToken tab='AdminCustomerThreads' slashes=1 }';
 			</script>
 		{/if}
 

admin-dev/themes/default/template/helper/form/form.tpl

@@ -63,7 +63,7 @@
 						{/if}
 						{block name="label"}
 							{if isset($input.label)}
-								<label>{$input.label|escape:'htmlall'} </label>
+								<label>{$input.label} </label>
 							{/if}
 						{/block}
 						{if $input.type == 'hidden'}