From 2abc369c737bb8ac5f703ac1a07ae9e8f94f8de7 Mon Sep 17 00:00:00 2001
From: Benjamin Renard <brenard@easter-eggs.com>
Date: Thu, 10 Dec 2020 17:21:21 +0100
Subject: [PATCH] LSformElement::labeledValue: fix label translation on freeze
 view

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

diff --git a/src/includes/class/class.LSformElement_labeledValue.php b/src/includes/class/class.LSformElement_labeledValue.php
index 0ebed417..88506e20 100644
--- a/src/includes/class/class.LSformElement_labeledValue.php
+++ b/src/includes/class/class.LSformElement_labeledValue.php
@@ -96,9 +96,6 @@ class LSformElement_labeledValue extends LSformElement {
     $ret=array('raw_value' => $value);
     if (preg_match('/^\[([^\]]*)\](.*)$/',$value,$m)) {
       $ret['label'] = $m[1];
-      $label = $this -> getParam('html_options.labels.'.$ret['label']);
-      if ($label)
-	      $ret['translated_label'] = $label;
       $ret['value'] = $m[2];
     }
     return $ret;
diff --git a/src/templates/default/LSformElement_labeledValue_field.tpl b/src/templates/default/LSformElement_labeledValue_field.tpl
index f1614fc5..681e659a 100644
--- a/src/templates/default/LSformElement_labeledValue_field.tpl
+++ b/src/templates/default/LSformElement_labeledValue_field.tpl
@@ -1,8 +1,8 @@
 {if $freeze}
   {if isset($parseValue)}
     {if $parseValue.label}
-      {if $parseValue.translated_label}
-        <span title='[{$parseValue.label|escape:'htmlall'}]'>{$parseValue.translated_label|escape:"htmlall"}</span>
+      {if isset($labels[$parseValue.label])}
+        <span title='[{$parseValue.label|escape:'htmlall'}]'>{$labels[$parseValue.label]|escape:"htmlall"}</span>
       {else}
         <span>{$parseValue.label|escape:"htmlall"} {$unrecognizedLabelTxt|escape:"htmlall"}</span>
       {/if}