diff options
| author | Odoo's Mergebot <robodoo@odoo.com> | 2021-02-26 11:39:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-26 11:39:16 +0100 |
| commit | 5dc3e4e18d97df7128b3c3741f8110dac9f2d09b (patch) | |
| tree | f11009e870f28135db003ffbbaeec8ff5bf2abef /addons/web/static | |
| parent | 9d8c808e9910886968b3a1dc9d17a88ceca2389a (diff) | |
| parent | 5caa0f0cc2c9025bef8c9a7fbb0ed8d5d8511057 (diff) | |
[FIX] *: various localisation issues
Cf commit messages, courtesy of Erwin van der Ploeg
closes odoo/odoo#66790
Signed-off-by: Martin Trigaux (mat) <mat@odoo.com>
Diffstat (limited to 'addons/web/static')
| -rw-r--r-- | addons/web/static/src/js/control_panel/control_panel.js | 2 | ||||
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 5 | ||||
| -rw-r--r-- | addons/web/static/src/xml/colorpicker.xml | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/addons/web/static/src/js/control_panel/control_panel.js b/addons/web/static/src/js/control_panel/control_panel.js index aca28bc0eb2..3841541e3fc 100644 --- a/addons/web/static/src/js/control_panel/control_panel.js +++ b/addons/web/static/src/js/control_panel/control_panel.js @@ -124,6 +124,8 @@ odoo.define('web.ControlPanel', function (require) { }; this.fields = this._formatFields(this.props.fields); + + this.sprintf = _.str.sprintf; } mounted() { diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index c52c7e0ac60..949c6926ebf 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -631,12 +631,13 @@ </t> <t t-name="web.ViewSwitcherButton" owl="1"> + <t t-set="buttonLabel">View %s</t> <button type="button" t-att-accesskey="view.accessKey" t-attf-class="btn btn-secondary fa fa-lg o_switch_view o_{{ view.type }} {{ view.icon }}" t-att-class="{ active: env.view.type === view.type }" - t-attf-aria-label="View {{ view.type }}" - t-attf-title="View {{ view.type }}" + t-att-aria-label="sprintf(buttonLabel.toString(), view.type)" + t-att-title="sprintf(buttonLabel.toString(), view.type)" data-toggle="tooltip" tabindex="-1" t-on-click="trigger('switch-view', { view_type: view.type })" diff --git a/addons/web/static/src/xml/colorpicker.xml b/addons/web/static/src/xml/colorpicker.xml index 09d39f30f58..1aaf6718249 100644 --- a/addons/web/static/src/xml/colorpicker.xml +++ b/addons/web/static/src/xml/colorpicker.xml @@ -16,7 +16,7 @@ </div> <div t-if="widget.options.colorPreview" class="o_color_preview mb-1 w-100 p-2"/> <div class="o_color_picker_inputs d-flex justify-content-between mb-2"> - <t t-set="input_classes">p-0 text-center text-monospace bg-transparent text-white</t> + <t t-set="input_classes" t-value="'p-0 text-center text-monospace bg-transparent text-white'" /> <div class="o_hex_div bg-black-50 px-1 d-flex align-items-baseline"> <input type="text" t-attf-class="o_hex_input {{input_classes}}" data-color-method="hex" size="1"/> |