diff --git a/addons/mail/static/src/components/discuss/tests/discuss_moderation_tests.js b/addons/mail/static/src/components/discuss/tests/discuss_moderation_tests.js index 2a0f5679349..c9d954ca895 100644 --- a/addons/mail/static/src/components/discuss/tests/discuss_moderation_tests.js +++ b/addons/mail/static/src/components/discuss/tests/discuss_moderation_tests.js @@ -536,9 +536,7 @@ QUnit.test('reject pending moderation message (reject with explanation)', async ); assert.strictEqual( dialog.querySelector('.modal-title').textContent, - // TODO FIXME, this should be a proper title "Send explanation to author" - // see https://github.com/odoo/owl/issues/670 - "[object Object]", + "Send explanation to author", "dialog should have correct title" ); @@ -694,14 +692,12 @@ QUnit.test('discard pending moderation message (reject without explanation)', as ); assert.strictEqual( dialog.querySelector('.modal-title').textContent, - // TODO FIXME, this should be a proper title "Confirmation" - // see https://github.com/odoo/owl/issues/670 - "[object Object]", + "Confirmation", "dialog should have correct title" ); assert.strictEqual( dialog.textContent, - "[object Object]×You are going to discard 1 message.Do you confirm the action?DiscardCancel", + "Confirmation×You are going to discard 1 message.Do you confirm the action?DiscardCancel", "should warn the user on discard action" ); diff --git a/addons/mail/static/src/components/moderation_ban_dialog/moderation_ban_dialog.js b/addons/mail/static/src/components/moderation_ban_dialog/moderation_ban_dialog.js index ec260829cf4..2880c1747bb 100644 --- a/addons/mail/static/src/components/moderation_ban_dialog/moderation_ban_dialog.js +++ b/addons/mail/static/src/components/moderation_ban_dialog/moderation_ban_dialog.js @@ -42,6 +42,13 @@ class ModerationBanDialog extends Component { return this.props.messageLocalIds.map(localId => this.env.models['mail.message'].get(localId)); } + /** + * @returns {string} + */ + get CONFIRMATION() { + return this.env._t("Confirmation"); + } + //-------------------------------------------------------------------------- // Handlers //-------------------------------------------------------------------------- diff --git a/addons/mail/static/src/components/moderation_ban_dialog/moderation_ban_dialog.xml b/addons/mail/static/src/components/moderation_ban_dialog/moderation_ban_dialog.xml index d0bc59c19a6..5b8f540aa9d 100644 --- a/addons/mail/static/src/components/moderation_ban_dialog/moderation_ban_dialog.xml +++ b/addons/mail/static/src/components/moderation_ban_dialog/moderation_ban_dialog.xml @@ -2,8 +2,7 @@
- Confirmation - +

You are going to ban the following user:

diff --git a/addons/mail/static/src/components/moderation_discard_dialog/moderation_discard_dialog.js b/addons/mail/static/src/components/moderation_discard_dialog/moderation_discard_dialog.js index 597d2ac3262..5f6a906df46 100644 --- a/addons/mail/static/src/components/moderation_discard_dialog/moderation_discard_dialog.js +++ b/addons/mail/static/src/components/moderation_discard_dialog/moderation_discard_dialog.js @@ -57,6 +57,13 @@ class ModerationDiscardDialog extends Component { ); } + /** + * @returns {string} + */ + get CONFIRMATION() { + return this.env._t("Confirmation"); + } + //-------------------------------------------------------------------------- // Handlers //-------------------------------------------------------------------------- diff --git a/addons/mail/static/src/components/moderation_discard_dialog/moderation_discard_dialog.xml b/addons/mail/static/src/components/moderation_discard_dialog/moderation_discard_dialog.xml index 13cafb0f047..32458c6db58 100644 --- a/addons/mail/static/src/components/moderation_discard_dialog/moderation_discard_dialog.xml +++ b/addons/mail/static/src/components/moderation_discard_dialog/moderation_discard_dialog.xml @@ -2,8 +2,7 @@
- Confirmation - +

Do you confirm the action?

diff --git a/addons/mail/static/src/components/moderation_reject_dialog/moderation_reject_dialog.js b/addons/mail/static/src/components/moderation_reject_dialog/moderation_reject_dialog.js index 95f90e42c7d..675e3e48d8e 100644 --- a/addons/mail/static/src/components/moderation_reject_dialog/moderation_reject_dialog.js +++ b/addons/mail/static/src/components/moderation_reject_dialog/moderation_reject_dialog.js @@ -48,6 +48,13 @@ class ModerationRejectDialog extends Component { ); } + /** + * @returns {string} + */ + get SEND_EXPLANATION_TO_AUTHOR() { + return this.env._t("Send explanation to author"); + } + //-------------------------------------------------------------------------- // Handlers //-------------------------------------------------------------------------- diff --git a/addons/mail/static/src/components/moderation_reject_dialog/moderation_reject_dialog.xml b/addons/mail/static/src/components/moderation_reject_dialog/moderation_reject_dialog.xml index a908265d33b..2b174a881fb 100644 --- a/addons/mail/static/src/components/moderation_reject_dialog/moderation_reject_dialog.xml +++ b/addons/mail/static/src/components/moderation_reject_dialog/moderation_reject_dialog.xml @@ -2,8 +2,7 @@
- Send explanation to author - +