diff --git a/bricks/bricks.js b/bricks/bricks.js index 28e553b..1ff6ee7 100644 --- a/bricks/bricks.js +++ b/bricks/bricks.js @@ -706,17 +706,8 @@ bricks.App = class extends bricks.Layout { get_session(){ return this.session_id; } - async setup_i18n(){ - let params = {'lang':this.lang}; - var jc = new bricks.HttpJson(); - d = await jc.httpcall(desc.url, { - "method":desc.method||'GET', - params:params - } - ); - this.i18n.setup_dict(d); - } async build(){ + await this.i18n.change_lang(this.lang) var opts = bricks.extend({}, this.opts.widget); var w = await bricks.widgetBuild(opts, bricks.Body); if (!w){ diff --git a/bricks/widget.js b/bricks/widget.js index af37877..1d8704c 100644 --- a/bricks/widget.js +++ b/bricks/widget.js @@ -392,10 +392,9 @@ bricks.TextBase = class extends bricks.JsWidget { if (this.opts.hasOwnProperty('i18n')){ this.i18n = this.opts.i18n; } - this._i18n = new bricks.I18n(); this.set_style('flexShrink', '0'); if (this.i18n && this.otext) { - this.text = this._i18n._(this.otext); + this.text = bricks.app.i18n._(this.otext); } this.dom_element.innerHTML = this.text; } @@ -403,7 +402,7 @@ bricks.TextBase = class extends bricks.JsWidget { var text; this.otext = otxt; if (this.i18n) { - text = this._i18n._(this.otext); + text = bricks.app.i18n._(this.otext); } else { text = this.otext; }