From e0b576e822b16c80d75412b4bfe4b78feb5abd6a Mon Sep 17 00:00:00 2001 From: Nathan Gray Date: Tue, 25 Jun 2013 14:37:24 +0000 Subject: [PATCH] Fix read-only selectboxes not being translated --- etemplate/js/et2_widget_selectbox.js | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/etemplate/js/et2_widget_selectbox.js b/etemplate/js/et2_widget_selectbox.js index ccf09a3e56..b07724c7de 100644 --- a/etemplate/js/et2_widget_selectbox.js +++ b/etemplate/js/et2_widget_selectbox.js @@ -719,6 +719,19 @@ var et2_selectbox_ro = et2_selectbox.extend([et2_IDetachedDOM], set_select_options: function(_options) { for (var key in _options) { + // Translate the options + if(!this.options.no_lang) + { + if (typeof _options[key] === 'object') + { + if(_options[key]["label"]) _options[key]["label"] = this.egw().lang(_options[key]["label"]); + if(_options[key]["title"]) _options[key]["title"] = this.egw().lang(_options[key]["title"]); + } + else + { + _options[key] = this.egw().lang(_options[key]); + } + } this.optionValues[key] = _options[key]; } }, @@ -730,7 +743,7 @@ var et2_selectbox_ro = et2_selectbox.extend([et2_IDetachedDOM], } this.value = _value; if(typeof _value == "object") - { + { this.span.empty(); if(_value) { @@ -750,7 +763,7 @@ var et2_selectbox_ro = et2_selectbox.extend([et2_IDetachedDOM], } } return; - } + } var option = this.optionValues[_value]; if (typeof option === 'object' && option != null) {