diff --git a/api/js/etemplate/Et2Select/Et2Select.ts b/api/js/etemplate/Et2Select/Et2Select.ts index 27be048674..dd420080a8 100644 --- a/api/js/etemplate/Et2Select/Et2Select.ts +++ b/api/js/etemplate/Et2Select/Et2Select.ts @@ -332,7 +332,7 @@ export class Et2Select extends Et2WithSearchMixin(Et2WidgetWithSelect) return html``; } return html` - ${this.emptyLabel}`; + ${this.egw().lang(this.emptyLabel)}`; } /** @@ -355,9 +355,9 @@ export class Et2Select extends Et2WithSearchMixin(Et2WidgetWithSelect) // Tag used must match this.optionTag, but you can't use the variable directly. // Pass option along so SearchMixin can grab it if needed return html` - + ${icon} - ${option.label} + ${this.noLang ? option.label : this.egw().lang(option.label)} `; } diff --git a/api/js/etemplate/Et2Select/Et2WidgetWithSelectMixin.ts b/api/js/etemplate/Et2Select/Et2WidgetWithSelectMixin.ts index bdc3c39c81..5f4ef994f9 100644 --- a/api/js/etemplate/Et2Select/Et2WidgetWithSelectMixin.ts +++ b/api/js/etemplate/Et2Select/Et2WidgetWithSelectMixin.ts @@ -195,7 +195,7 @@ export const Et2widgetWithSelectMixin = >(supe */ _emptyLabelTemplate() : TemplateResult { - return html`${this.emptyLabel}`; + return html`${this.emptyLabel ? this.egw().lang(this.emptyLabel) : ''}`; } /** diff --git a/api/js/etemplate/Et2Widget/Et2Widget.ts b/api/js/etemplate/Et2Widget/Et2Widget.ts index a05041e2ff..7e9f4aa311 100644 --- a/api/js/etemplate/Et2Widget/Et2Widget.ts +++ b/api/js/etemplate/Et2Widget/Et2Widget.ts @@ -227,7 +227,7 @@ const Et2WidgetMixin = (superClass : T) => if(this.statustext) { - this.egw().tooltipBind(this, this.statustext); + this.egw().tooltipBind(this, this.egw().lang(this.statustext)); } }