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} - {$parseValue.translated_label|escape:"htmlall"} + {if isset($labels[$parseValue.label])} + {$labels[$parseValue.label]|escape:"htmlall"} {else} {$parseValue.label|escape:"htmlall"} {$unrecognizedLabelTxt|escape:"htmlall"} {/if}