diff options
| author | Thibault Delavallée <tde@openerp.com> | 2014-05-12 16:39:45 +0200 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2014-05-12 16:39:45 +0200 |
| commit | 46235aa78c04240f7abcf0e62ff92aad997700a2 (patch) | |
| tree | 25d0fe6a3eac3d822f56b63878ff9552406fafd9 /addons/website_mail/static | |
| parent | cce820565d9b85786d528b17670031bb112f1e64 (diff) | |
| parent | 9d9cfd585f56bf64126e7316ea60ea5131a02059 (diff) | |
[MERGE] Sync with turnk
Diffstat (limited to 'addons/website_mail/static')
| -rw-r--r-- | addons/website_mail/static/src/img/blocks/button_group_subscribe.png | bin | 0 -> 2726 bytes | |||
| -rw-r--r-- | addons/website_mail/static/src/js/website_mail.editor.js | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/addons/website_mail/static/src/img/blocks/button_group_subscribe.png b/addons/website_mail/static/src/img/blocks/button_group_subscribe.png Binary files differnew file mode 100644 index 00000000000..204239a8e0c --- /dev/null +++ b/addons/website_mail/static/src/img/blocks/button_group_subscribe.png diff --git a/addons/website_mail/static/src/js/website_mail.editor.js b/addons/website_mail/static/src/js/website_mail.editor.js index 7a26920682b..fdfb948121f 100644 --- a/addons/website_mail/static/src/js/website_mail.editor.js +++ b/addons/website_mail/static/src/js/website_mail.editor.js @@ -10,7 +10,7 @@ return website.prompt({ id: "editor_new_subscribe_button", window_title: _t("Add a Subscribe Button"), - select: _t("Mailing List"), + select: _t("Discussion List"), init: function (field) { return website.session.model('mail.group') .call('name_search', ['', [['public','=','public']]], { context: website.get_context() }); |
