From 00e1b7c0ebcf3dd8fc5db8e792e20ec5a81ee732 Mon Sep 17 00:00:00 2001
From: Jerome Nadaud <jerome.nadaud@prestashop.com>
Date: Tue, 20 Aug 2013 09:36:00 +0200
Subject: [PATCH] [-] BO : FixBug language in label for

---
 admin-dev/themes/default/template/helpers/form/form.tpl | 8 ++++----
 classes/helper/HelperForm.php                           | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/admin-dev/themes/default/template/helpers/form/form.tpl b/admin-dev/themes/default/template/helpers/form/form.tpl
index 9590bed8f..aced831df 100644
--- a/admin-dev/themes/default/template/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/helpers/form/form.tpl
@@ -48,7 +48,6 @@
 					<div class="alert alert-info">{$field}</div>
 				{elseif $key == 'input'}
 					{foreach $field as $input}
-
 						<div class="row {if $input.type == 'hidden'}hide{/if}">
 						{if $input.type == 'hidden'}
 							<input type="hidden" name="{$input.name}" id="{$input.name}" value="{$fields_value[$input.name]|escape:'htmlall':'UTF-8'}" />
@@ -58,7 +57,7 @@
 							{/if}
 							{block name="label"}
 								{if isset($input.label)}
-									<label for="{if isset($input.id)}{$input.id}{if isset($input.lang) AND $input.lang}_{$language.id_lang}{/if}{else}{$input.name}{if isset($input.lang) AND $input.lang}_{$language.id_lang}{/if}{/if}" class="control-label col-lg-3 {if isset($input.required) && $input.required && $input.type != 'radio'}required{/if}">
+									<label for="{if isset($input.id)}{$input.id}{if isset($input.lang) AND $input.lang}_{$current_id_lang}{/if}{else}{$input.name}{if isset($input.lang) AND $input.lang}_{$current_id_lang}{/if}{/if}" class="control-label col-lg-3 {if isset($input.required) && $input.required && $input.type != 'radio'}required{/if}">
 										{if isset($input.hint)}
 										<span class="label-tooltip" data-toggle="tooltip"
 											title="
@@ -75,11 +74,12 @@
 												{/if}
 											">
 										{/if}
-											{$input.label}
+										{$input.label}
 										{if isset($input.hint)}
 										</span>
 										{/if}
-									</label>{/if}
+									</label>
+								{/if}
 							{/block}
 
 							{block name="field"}
diff --git a/classes/helper/HelperForm.php b/classes/helper/HelperForm.php
index ff9810baf..ce47c7d52 100644
--- a/classes/helper/HelperForm.php
+++ b/classes/helper/HelperForm.php
@@ -157,6 +157,7 @@ class HelperFormCore extends Helper
 			'identifier' => $this->identifier,
 			'name_controller' => $this->name_controller,
 			'languages' => $this->languages,
+			'current_id_lang' => $this->context->language->id,
 			'defaultFormLanguage' => $this->default_form_language,
 			'allowEmployeeFormLang' => $this->allow_employee_form_lang,
 			'form_id' => $this->id,