From 8c1f6a7cc6aea43aa9ef99b7b7ae70f5abbe3d92 Mon Sep 17 00:00:00 2001 From: Rohan Patel Date: Fri, 30 Jun 2017 12:41:09 +0530 Subject: [IMP] mail,*: replace emojis by unicode in chat messages *im_livechat,rating. Emojis are now encoded in unicode characters in messages. This allows to copy/paste messages including emojis, ensures that emojis are properly displayed in mail interfaces (at least those that support unicode, e.g. GMAIL, counter-example: outlook), and allows the user to directly use emojis of its smartphone in mobile. This commit also adds several new emojis. PR #11095 --- addons/mail/data/mail_shortcode_data.xml | 273 ++++++++++++++++++------------- 1 file changed, 161 insertions(+), 112 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 2fa9d940466..64f1aa7129f 100644 --- a/addons/mail/data/mail_shortcode_data.xml +++ b/addons/mail/data/mail_shortcode_data.xml @@ -3,179 +3,228 @@ - + :) - <img src='/mail/static/src/img/smiley/smile.png'/> - Emoji Smile + 😊 + <img src='/mail/static/src/img/smiley/normal_smile.png' alt='😊'/> + Smile image - - - :( - <img src='/mail/static/src/img/smiley/sad.png'/> - Emoji Sad + + :D + 😄 + <img src='/mail/static/src/img/smiley/smile.png' alt='😄'/> + Smile with open mouth image - - :D - <img src='/mail/static/src/img/smiley/laugh.png'/> - Emoji Laugh + xD + 😆 + <img src='/mail/static/src/img/smiley/laugh.png' alt='😆'/> + Laugh + image + + + :-) + 😂 + <img src='/mail/static/src/img/smiley/tears_of_joy.png' alt='😂'/> + Tears of joy image - ;) - <img src='/mail/static/src/img/smiley/wink.png'/> - Emoji Wink + 😉 + <img src='/mail/static/src/img/smiley/wink.png' alt='😉'/> + Wink + image + + + B) + 😎 + <img src='/mail/static/src/img/smiley/sunglass.png' alt='😎'/> + Face with sunglass image - - O_0 - <img src='/mail/static/src/img/smiley/stuck_out_tongue.png'/> - Emoji Stuck Out Tongue Winking Eye + ;p + 😜 + <img src='/mail/static/src/img/smiley/stuck_out_tongue.png' alt='😜'/> + Stuck Out Tongue Winking Eye image - - - :@ - <img src='/mail/static/src/img/smiley/scream.png'/> - Emoji Scream + + :p + 😋 + <img src='/mail/static/src/img/smiley/yum.png' alt='😋'/> + Cheeky image - - - :| - <img src='/mail/static/src/img/smiley/neutral.png'/> - Emoji Speechless/Neutral face + + o_o + 😳 + <img src='/mail/static/src/img/smiley/flushed.png' alt='😳'/> + Flushed face image - - - :p - <img src='/mail/static/src/img/smiley/yum.png'/> - Emoji Cheeky + + :| + 😐 + <img src='/mail/static/src/img/smiley/neutral.png' alt='😐'/> + Speechless/Neutral face image - :/ - <img src='/mail/static/src/img/smiley/confused.png'/> - Emoji Confused + 😕 + <img src='/mail/static/src/img/smiley/confused.png' alt='😕'/> + Confused + image + + + :( + 😞 + <img src='/mail/static/src/img/smiley/sad.png' alt='😞'/> + Sad + image + + + :@ + 😱 + <img src='/mail/static/src/img/smiley/scream.png' alt='😱'/> + Scream image - :O - <img src='/mail/static/src/img/smiley/open_mouth.png'/> - Emoji Open Mouth + 😮 + <img src='/mail/static/src/img/smiley/open_mouth.png' alt='😮'/> + Open Mouth image - - - <3 - <img src='/mail/static/src/img/smiley/heart.png'/> - Emoji Heart + + 3:( + 😈 + <img src='/mail/static/src/img/smiley/angry.png' alt='😈'/> + Angry image - - - - :+1 - <img src='/mail/static/src/img/smiley/thumbsup.png'/> - Emoji Thumbs Up + + 3:) + 😈 + <img src='/mail/static/src/img/smiley/evil.png' alt='😈'/> + Face with evil image - - - :-1 - <img src='/mail/static/src/img/smiley/thumbsdown.png'/> - Emoji Thumbs Down + + :no_see + 🙈 + <img src='/mail/static/src/img/smiley/monkey_eye.png' alt='🙈'/> + No see image - - - :kitten - <img src='/mail/static/src/img/smiley/cat.png'/> - Emoji Kitten + + :no_hear + 🙉 + <img src='/mail/static/src/img/smiley/monkey_hear.png' alt='🙉'/> + No hear image - - - :pinky - <img src='/mail/static/src/img/smiley/pinky.png'/> - Emoji Pinky + + :no_speak + 🙊 + <img src='/mail/static/src/img/smiley/monkey_speak.png' alt='🙊'/> + No speak image - - - :musti - <img src='/mail/static/src/img/smiley/musti.png'/> - Emoji Musti + + :bug + 🐞 + <img src='/mail/static/src/img/smiley/bug.png' alt='🐞'/> + Bug image - - - :turban - <img src='/mail/static/src/img/smiley/man_with_turban.png'/> - Emoji Man With Turban + + :kitten + 😸 + <img src='/mail/static/src/img/smiley/cat.png' alt='😸'/> + Kitten image - - - :troll - <img src='/mail/static/src/img/smiley/trollface.png'/> - Emoji Troll Face + + <3 + ❤ + <img src='/mail/static/src/img/smiley/heart.png' alt='❤'/> + Heart image - - - :boar - <img src='/mail/static/src/img/smiley/boar.png'/> - Emoji Boar + + :+1 + 👍 + <img src='/mail/static/src/img/smiley/thumbsup.png' alt='👍'/> + Thumbs Up + image + + + :-1 + 👎 + <img src='/mail/static/src/img/smiley/thumbsdown.png' alt='👎'/> + Thumbs Down image - :poop - <img src='/mail/static/src/img/smiley/poop.png'/> - Emoji Poop + 💩 + <img src='/mail/static/src/img/smiley/poop.png' alt='💩'/> + Poop + image + + + :ghost + 👻 + <img src='/mail/static/src/img/smiley/ghost.png' alt='👻'/> + Ghost image - :cookie - <img src='/mail/static/src/img/smiley/cookie.png'/> - Emoji Cookie + 🍪 + <img src='/mail/static/src/img/smiley/cookie.png' alt='🍪'/> + Cookie image - - - :postal_horn - <img src='/mail/static/src/img/smiley/postal_horn.png'/> - Emoji Postal Horn + + :beer + 🍺 + <img src='/mail/static/src/img/smiley/beer.png' alt='🍺'/> + Beer image - - - :ghost - <img src='/mail/static/src/img/smiley/ghost.png'/> - Emoji Ghost + + :coffee + ☕ + <img src='/mail/static/src/img/smiley/coffee.png' alt='☕'/> + Coffee image - - - :beer - <img src='/mail/static/src/img/smiley/beer.png'/> - Emoji Beer + + :cake + 🎂 + <img src='/mail/static/src/img/smiley/cake.png' alt='🎂'/> + Cake image - - - :man - <img src='/mail/static/src/img/smiley/man.png'/> - Emoji Man + + :party + 🎉 + <img src='/mail/static/src/img/smiley/party.png' alt='🎉'/> + Party + image + + + :trophy + 🏆 + <img src='/mail/static/src/img/smiley/trophy.png' alt='🏆'/> + Trophy image -- cgit v1.2.3