diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-03-09 16:25:58 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-03-09 16:25:58 +0100 |
| commit | 0f57bdba72b592ca097d4cd3da99a75883d8c623 (patch) | |
| tree | 94eef0c9aaf885c7f717bab5e468ca72b59a219d /addons/mail/data/mail_shortcode_data.xml | |
| parent | 35f0797002e44ce5673e9fab63710d2764329694 (diff) | |
| parent | 42659dc70c2b9b124e7e4fdc0449f660c3de5c76 (diff) | |
[MERGE] forward port branch saas-11.2 up to 42659dc70c2
Diffstat (limited to 'addons/mail/data/mail_shortcode_data.xml')
| -rw-r--r-- | addons/mail/data/mail_shortcode_data.xml | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/addons/mail/data/mail_shortcode_data.xml b/addons/mail/data/mail_shortcode_data.xml index afd0cf91146..ac648e3c738 100644 --- a/addons/mail/data/mail_shortcode_data.xml +++ b/addons/mail/data/mail_shortcode_data.xml @@ -5,18 +5,25 @@ <!-- Smileys --> <record id="mail_smiley_normal_smile" model="mail.shortcode"> <field name="source">:)</field> - <field name="unicode_source">😊</field> - <field name="substitution"><img src='/mail/static/src/img/smiley/normal_smile.png' alt='😊'/></field> + <field name="unicode_source">🙂</field> + <field name="substitution"><img src='/mail/static/src/img/smiley/smile.png' alt='🙂'/></field> <field name="description">Smile</field> <field name="shortcode_type">image</field> </record> <record id="mail_smiley_smile" model="mail.shortcode"> <field name="source">:D</field> - <field name="unicode_source">😄</field> - <field name="substitution"><img src='/mail/static/src/img/smiley/smile.png' alt='😄'/></field> + <field name="unicode_source">😀</field> + <field name="substitution"><img src='/mail/static/src/img/smiley/smile_open_mouth.png' alt='😀'/></field> <field name="description">Smile with open mouth</field> <field name="shortcode_type">image</field> </record> + <record id="mail_smiley_smile_eyes" model="mail.shortcode"> + <field name="source">^^</field> + <field name="unicode_source">😊</field> + <field name="substitution"><img src='/mail/static/src/img/smiley/normal_smile.png' alt='😊'/></field> + <field name="description">Smile with with smiling eyes</field> + <field name="shortcode_type">image</field> + </record> <record id="mail_smiley_laugh" model="mail.shortcode"> <field name="source">xD</field> <field name="unicode_source">😆</field> @@ -25,7 +32,7 @@ <field name="shortcode_type">image</field> </record> <record id="mail_smiley_tears_of_joy" model="mail.shortcode"> - <field name="source">:-)</field> + <field name="source">:joy</field> <field name="unicode_source">😂</field> <field name="substitution"><img src='/mail/static/src/img/smiley/tears_of_joy.png' alt='😂'/></field> <field name="description">Tears of joy</field> |