summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfja-odoo <fja@odoo.com>2020-03-05 13:28:09 +0000
committerfja-odoo <fja@odoo.com>2020-03-05 17:10:50 +0000
commitc730da7197da76cd72745de52bbebb6ea906aa44 (patch)
treef2069a882388e388db53b1f511bdd60565bc1af3
parent94b39d3ea3600e560d0f8aa0bac294908d6122c4 (diff)
[FIX] website, *: fix placeholder translate
* = web_editor InputUserValueWidget's data-placeholder where not translatable. task-2210358 closes odoo/odoo#47029 X-original-commit: dfaf497de5eb95f1ba65e927631cc48d97ca6127 Signed-off-by: Quentin Smetz (qsm) <qsm@odoo.com>
-rw-r--r--addons/web_editor/static/src/js/editor/snippets.options.js8
-rw-r--r--addons/website/views/snippets/snippets.xml4
2 files changed, 9 insertions, 3 deletions
diff --git a/addons/web_editor/static/src/js/editor/snippets.options.js b/addons/web_editor/static/src/js/editor/snippets.options.js
index 19f6a129f12..060347f00e1 100644
--- a/addons/web_editor/static/src/js/editor/snippets.options.js
+++ b/addons/web_editor/static/src/js/editor/snippets.options.js
@@ -18,6 +18,8 @@ var _t = core._t;
* @param {string} [title]
* @param {Object} [options]
* @param {string[]} [options.classes]
+ * @param {string} [options.tooltip]
+ * @param {string} [options.placeholder]
* @param {Object} [options.dataAttributes]
* @returns {HTMLElement} - the original 'el' argument
*/
@@ -35,6 +37,9 @@ function _addTitleAndAllowedAttributes(el, title, options) {
if (options && options.tooltip) {
tooltipEl.title = options.tooltip;
}
+ if (options && options.placeholder) {
+ el.setAttribute('placeholder', options.placeholder);
+ }
if (options && options.dataAttributes) {
for (const key in options.dataAttributes) {
el.dataset[key] = options.dataAttributes[key];
@@ -750,7 +755,7 @@ const InputUserValueWidget = UserValueWidget.extend({
this.inputEl = document.createElement('input');
this.inputEl.setAttribute('type', 'text');
- this.inputEl.setAttribute('placeholder', this.el.dataset.placeholder || '');
+ this.inputEl.setAttribute('placeholder', this.el.getAttribute('placeholder') || '');
this.inputEl.classList.toggle('text-left', !unit);
this.inputEl.classList.toggle('text-right', !!unit);
this.containerEl.appendChild(this.inputEl);
@@ -1898,6 +1903,7 @@ const SnippetOptionWidget = Widget.extend({
classes: el.classList,
dataAttributes: el.dataset,
tooltip: el.title,
+ placeholder: el.getAttribute('placeholder'),
childNodes: [...el.childNodes],
},
};
diff --git a/addons/website/views/snippets/snippets.xml b/addons/website/views/snippets/snippets.xml
index d7ba379c240..e8b08fe5588 100644
--- a/addons/website/views/snippets/snippets.xml
+++ b/addons/website/views/snippets/snippets.xml
@@ -281,8 +281,8 @@
data-background-position-overlay="true" data-no-preview="true"/>
</we-row>
<we-multi data-css-property="background-size" data-dependencies="background_repeat_opt">
- <we-input string="Width" data-select-style="auto" data-placeholder="auto" data-unit="px"/>
- <we-input string="Height" data-select-style="auto" data-placeholder="auto" data-unit="px"/>
+ <we-input string="Width" data-select-style="auto" placeholder="auto" data-unit="px"/>
+ <we-input string="Height" data-select-style="auto" placeholder="auto" data-unit="px"/>
</we-multi>
</div>