From b8c00a8708d0c2d2a54219acf41eceec46cab9c8 Mon Sep 17 00:00:00 2001
From: Benjamin Renard <brenard@easter-eggs.com>
Date: Thu, 10 Sep 2020 15:52:29 +0200
Subject: [PATCH] LSattr_html::select_box: fix double translation of labels on
 unfreeze field

---
 src/includes/class/class.LSformElement_select_box.php | 1 -
 src/templates/default/LSformElement_select_box.tpl    | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/includes/class/class.LSformElement_select_box.php b/src/includes/class/class.LSformElement_select_box.php
index e3b039e2..05eee031 100644
--- a/src/includes/class/class.LSformElement_select_box.php
+++ b/src/includes/class/class.LSformElement_select_box.php
@@ -47,7 +47,6 @@ class LSformElement_select_box extends LSformElement_select {
     if (!$this -> isFreeze()) {
       LStemplate :: addCssFile('LSformElement_select_box.css');
     }
-    $this -> fetchVariables['translate_labels'] = $this -> getParam('translate_labels', true);
     return parent :: getDisplay();
   }
 
diff --git a/src/templates/default/LSformElement_select_box.tpl b/src/templates/default/LSformElement_select_box.tpl
index d6ad896b..a2ea5efe 100644
--- a/src/templates/default/LSformElement_select_box.tpl
+++ b/src/templates/default/LSformElement_select_box.tpl
@@ -19,7 +19,7 @@
           <ul class='LSformElement_selectbox_sub_values'>
             {foreach from=$label.possible_values item=l key=v name=LSformElement_selectbox_sub_values}
               <li>
-                <input type='{if $multiple}checkbox{else}radio{/if}' name='{$attr_name|escape:"htmlall"}[]' class='LSformElement_selectbox' id='LSformElement_selectbox_{$attr_name|escape:"htmlall"}_{$smarty.foreach.LSformElement_selectbox.index}_{$smarty.foreach.LSformElement_selectbox_sub_values.index}' value='{$v|escape:"htmlall"}' {if in_array($v,$values)}checked{/if}/> <label for='LSformElement_selectbox_{$attr_name|escape:"htmlall"}_{$smarty.foreach.LSformElement_selectbox.index}_{$smarty.foreach.LSformElement_selectbox_sub_values.index}'>{if $translate_labels}{tr msg=$l}{else}{$l}{/if}</label>
+                <input type='{if $multiple}checkbox{else}radio{/if}' name='{$attr_name|escape:"htmlall"}[]' class='LSformElement_selectbox' id='LSformElement_selectbox_{$attr_name|escape:"htmlall"}_{$smarty.foreach.LSformElement_selectbox.index}_{$smarty.foreach.LSformElement_selectbox_sub_values.index}' value='{$v|escape:"htmlall"}' {if in_array($v,$values)}checked{/if}/> <label for='LSformElement_selectbox_{$attr_name|escape:"htmlall"}_{$smarty.foreach.LSformElement_selectbox.index}_{$smarty.foreach.LSformElement_selectbox_sub_values.index}'>{$l}</label>
               </li>
             {/foreach}
           </ul>
@@ -27,7 +27,7 @@
         {/if}
       {else}
         <li>
-          <input type='{if $multiple}checkbox{else}radio{/if}' name='{$attr_name|escape:"htmlall"}[]' class='LSformElement_selectbox' id='LSformElement_selectbox_{$attr_name|escape:"htmlall"}_{$smarty.foreach.LSformElement_selectbox.index}' value='{$value|escape:"htmlall"}' {if in_array($value,$values)}checked{/if}/> <label for='LSformElement_selectbox_{$attr_name|escape:"htmlall"}_{$smarty.foreach.LSformElement_selectbox.index}'>{tr msg=$label}</label>
+          <input type='{if $multiple}checkbox{else}radio{/if}' name='{$attr_name|escape:"htmlall"}[]' class='LSformElement_selectbox' id='LSformElement_selectbox_{$attr_name|escape:"htmlall"}_{$smarty.foreach.LSformElement_selectbox.index}' value='{$value|escape:"htmlall"}' {if in_array($value,$values)}checked{/if}/> <label for='LSformElement_selectbox_{$attr_name|escape:"htmlall"}_{$smarty.foreach.LSformElement_selectbox.index}'>{$label}</label>
         </li>
       {/if}
     {/foreach}