diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-01-27 12:17:12 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-01-27 12:17:12 +0100 |
| commit | 6f923cbdcdc9a78d1999999b3bbd917eb8b4e921 (patch) | |
| tree | e33942eb0be8605f6219853a66b66df54f94f329 /addons/mail/static/src/xml | |
| parent | e5e7c4c1217c04d93820cf6007fd8ceed30d0cfa (diff) | |
| parent | 4bbddc7476ff26098207ed80e89ce881f6dd161a (diff) | |
[MERGE] forward port of branch 9.0 up to 4bbddc7
Diffstat (limited to 'addons/mail/static/src/xml')
| -rw-r--r-- | addons/mail/static/src/xml/chat_window.xml | 2 | ||||
| -rw-r--r-- | addons/mail/static/src/xml/client_action.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/addons/mail/static/src/xml/chat_window.xml b/addons/mail/static/src/xml/chat_window.xml index f5c7273d832..eb003cd59cd 100644 --- a/addons/mail/static/src/xml/chat_window.xml +++ b/addons/mail/static/src/xml/chat_window.xml @@ -12,7 +12,7 @@ <div class="o_chat_content"> </div> <div class="o_chat_input"> - <input t-att-placeholder="widget.placeholder"/> + <input t-att-placeholder="widget.options.placeholder"/> </div> </div> </t> diff --git a/addons/mail/static/src/xml/client_action.xml b/addons/mail/static/src/xml/client_action.xml index 04d45eb9bdc..1e38fe3d6dd 100644 --- a/addons/mail/static/src/xml/client_action.xml +++ b/addons/mail/static/src/xml/client_action.xml @@ -124,7 +124,7 @@ <button type="button" class="btn btn-primary btn-sm o_mail_chat_button_detach hidden-xs" title="Detach the conversation">Detach</button> <button type="button" class="btn btn-primary btn-sm o_mail_chat_button_mark_read" title="Mark all as read">Mark all read</button> <button type="button" class="btn btn-primary btn-sm o_mail_chat_button_unstar_all" title="Unstar all messages">Unstar all</button> - <button type="button" class="btn btn-default btn-sm o_mail_chat_button_new_message" title="Compose a new message">New message</button> + <button type="button" class="btn btn-default btn-sm o_mail_chat_button_new_message" title="Compose a new message">Send mail</button> <button type="button" class="btn btn-default btn-sm o_mail_chat_button_unsubscribe" title="Unsubscribe from channel">Unsubscribe</button> <button type="button" class="btn btn-default btn-sm o_mail_chat_button_settings" title="Open channel settings">Settings</button> </div> |