openrat-cms

commit 389e8a99ac5a208014d95d24461f7f875fede0cd
parent b150b25d50c6e94d795b14559fe75638fd754eb3
Author: Jan Dankert <develop@jandankert.de>
Date:   Sat, 25 Jun 2022 01:08:48 +0200

Fix: Translate option values in SelectboxComponent.

Diffstat:
M
modules/cms/ui/themes/default/html/views/element/prop.php
 | 
2
+-
M
modules/cms/ui/themes/default/html/views/template/addel.php
 | 
2
+-
M
modules/template_engine/components/html/component_selectbox/SelectboxComponent.class.php
 | 
4
+++-

3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/modules/cms/ui/themes/default/html/views/element/prop.php b/modules/cms/ui/themes/default/html/views/element/prop.php
@@ -37,7 +37,7 @@
             <div class="<?php echo O::escapeHtml('or-fieldset-value') ?>"><?php echo O::escapeHtml('') ?>
               <select name="<?php echo O::escapeHtml('typeid') ?>" size="<?php echo O::escapeHtml('1') ?>" class="<?php echo O::escapeHtml('or-input') ?>"><?php echo O::escapeHtml('') ?>
                 <?php foreach($types as $_key=>$_value) {  ?>
-                  <option value="<?php echo O::escapeHtml(''.@$_key.'') ?>" <?php if($_key==$typeid){ ?>selected="<?php echo O::escapeHtml('selected') ?>"<?php } ?>><?php echo O::escapeHtml(''.@$_value.'') ?></option>
+                  <option value="<?php echo O::escapeHtml(''.@$_key.'') ?>" <?php if($_key==$typeid){ ?>selected="<?php echo O::escapeHtml('selected') ?>"<?php } ?>><?php echo O::escapeHtml(''.@O::lang(''.@$_value.'').'') ?></option>
                  <?php } ?>
               </select>
             </div>
diff --git a/modules/cms/ui/themes/default/html/views/template/addel.php b/modules/cms/ui/themes/default/html/views/template/addel.php
@@ -19,7 +19,7 @@
            <?php } ?>
           <select name="<?php echo O::escapeHtml('typeid') ?>" size="<?php echo O::escapeHtml('1') ?>" class="<?php echo O::escapeHtml('or-input') ?>"><?php echo O::escapeHtml('') ?>
             <?php foreach($types as $_key=>$_value) {  ?>
-              <option value="<?php echo O::escapeHtml(''.@$_key.'') ?>" <?php if($_key==$typeid){ ?>selected="<?php echo O::escapeHtml('selected') ?>"<?php } ?>><?php echo O::escapeHtml(''.@$_value.'') ?></option>
+              <option value="<?php echo O::escapeHtml(''.@$_key.'') ?>" <?php if($_key==$typeid){ ?>selected="<?php echo O::escapeHtml('selected') ?>"<?php } ?>><?php echo O::escapeHtml(''.@O::lang(''.@$_value.'').'') ?></option>
              <?php } ?>
           </select>
         </div>
diff --git a/modules/template_engine/components/html/component_selectbox/SelectboxComponent.class.php b/modules/template_engine/components/html/component_selectbox/SelectboxComponent.class.php
@@ -93,7 +93,9 @@ class SelectboxComponent extends Component
 		$optionLoop->beforeBlock = 'foreach($'.$this->list.' as $_key=>$_value)';
 		$option = (new CMSElement('option'))
 			->addAttribute('value',Value::createExpression( ValueExpression::TYPE_DATA_VAR,'_key'))
-			->content(Value::createExpression( ValueExpression::TYPE_DATA_VAR,'_value'))
+			->content( $this->lang
+				? Value::createExpression( ValueExpression::TYPE_MESSAGE, Value::createExpression( ValueExpression::TYPE_DATA_VAR,'_value')) // Translate the option value
+				: Value::createExpression( ValueExpression::TYPE_DATA_VAR,'_value') )
 			->addConditionalAttribute('selected','$_key=='.$value,'selected');
 
 		$optionLoop->addChild($option);