From a546b34f5213821c556c6f5730c08b7b8af7a0d7 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@odoo.com>
Date: Thu, 22 Feb 2018 16:49:04 +0100
Subject: [FIX] mail: use correct emoji for shortcode
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

:) is not the shortcode for 😊
:-) is not the shotcode for 😂
source https://emojipedia.org
---
 addons/mail/data/mail_shortcode_data.xml | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'addons/mail/data/mail_shortcode_data.xml')

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">&lt;img src='/mail/static/src/img/smiley/normal_smile.png' alt='😊'/&gt;</field>
+            <field name="unicode_source">🙂</field>
+            <field name="substitution">&lt;img src='/mail/static/src/img/smiley/smile.png' alt='🙂'/&gt;</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">&lt;img src='/mail/static/src/img/smiley/smile.png' alt='😄'/&gt;</field>
+            <field name="unicode_source">😀</field>
+            <field name="substitution">&lt;img src='/mail/static/src/img/smiley/smile_open_mouth.png' alt='😀'/&gt;</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">&lt;img src='/mail/static/src/img/smiley/normal_smile.png' alt='😊'/&gt;</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">&lt;img src='/mail/static/src/img/smiley/tears_of_joy.png' alt='😂'/&gt;</field>
             <field name="description">Tears of joy</field>
-- 
cgit v1.2.3