Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

emoji: Change emoticon mapping for `:)`, `(:` and `:(`. 

See discussion on CZO:
https://chat.zulip.org/#narrow/stream/101-design/subject/emoji.20picker/near/617811
This commit is contained in:
Harshit Bansal 2018-07-26 17:35:28 +00:00 committed by Tim Abbott
parent 7ddc6e8d10
commit cf5b2b4815
6 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend_tests/node_tests/emoji.js
View File

@ -78,7 +78,7 @@ run_test('get_canonical_name', () => {
run_test('translate_emoticons_to_names', () => { run_test('translate_emoticons_to_names', () => {
// Simple test // Simple test
var test_text = 'Testing :)'; var test_text = 'Testing :)';
var expected = 'Testing :smiley:'; var expected = 'Testing :slight_smile:';
var result = emoji.translate_emoticons_to_names(test_text); var result = emoji.translate_emoticons_to_names(test_text);
assert.equal(expected, result); assert.equal(expected, result);

2
frontend_tests/node_tests/markdown.js
View File

@ -321,7 +321,7 @@ run_test('marked', () => {
{input: ':)', {input: ':)',
expected: '<p>:)</p>'}, expected: '<p>:)</p>'},
{input: ':)', {input: ':)',
expected: '<p><span class="emoji emoji-1f603" title="smiley">:smiley:</span></p>', expected: '<p><span class="emoji emoji-1f642" title="slight smile">:slight_smile:</span></p>',
translate_emoticons: true}, translate_emoticons: true},
// Test HTML Escape in Custom Zulip Rules // Test HTML Escape in Custom Zulip Rules
{input: '@**<h1>The Rogue One</h1>**', {input: '@**<h1>The Rogue One</h1>**',

26
templates/zerver/help/enable-emoticon-translations.md
View File

@ -3,14 +3,14 @@
If you use emoticons like `:)` or `:/`, you can have them translated into If you use emoticons like `:)` or `:/`, you can have them translated into
emoji equivalents like emoji equivalents like
<img <img
src="/static/generated/emoji/images/emoji/smile.png" src="/static/generated/emoji/images-google-64/1f642.png"
alt="smiley" alt="slight_smile"
style="width: 3%;" style="width: 3%;"
/> />
or or
<img <img
src="/static/generated/emoji/images/emoji/slightly_frowning_face.png" src="/static/generated/emoji/images-google-64/1f641.png"
alt="slightly_frowning_face" alt="slight_frown"
style="width: 3%;" style="width: 3%;"
/> />
automatically by Zulip. automatically by Zulip.
@ -34,8 +34,8 @@ automatically by Zulip.
<td align="center"><code>:)</code></td> <td align="center"><code>:)</code></td>
<td align="center"> <td align="center">
<img <img
src="/static/generated/emoji/images/emoji/smiley.png" src="/static/generated/emoji/images-google-64/1f642.png"
alt="smiley" alt="slight_smile"
style="width: 30%;"> style="width: 30%;">
</td> </td>
</tr> </tr>
@ -43,8 +43,8 @@ automatically by Zulip.
<td align="center"><code>(:</code></td> <td align="center"><code>(:</code></td>
<td align="center"> <td align="center">
<img <img
src="/static/generated/emoji/images/emoji/smiley.png" src="/static/generated/emoji/images-google-64/1f642.png"
alt="smiley" alt="slight_smile"
style="width: 30%;"> style="width: 30%;">
</td> </td>
</tr> </tr>
@ -52,8 +52,8 @@ automatically by Zulip.
<td align="center"><code>:(</code></td> <td align="center"><code>:(</code></td>
<td align="center"> <td align="center">
<img <img
src="/static/generated/emoji/images/emoji/slightly_frowning_face.png" src="/static/generated/emoji/images-google-64/1f641.png"
alt="slightly_frowning_face" alt="frown"
style="width: 30%;"> style="width: 30%;">
</td> </td>
</tr> </tr>
@ -61,7 +61,7 @@ automatically by Zulip.
<td align="center"><code>&lt;3</code></td> <td align="center"><code>&lt;3</code></td>
<td align="center"> <td align="center">
<img <img
src="/static/generated/emoji/images/emoji/heart.png" src="/static/generated/emoji/images-google-64/2764-fe0f.png"
alt="heart" alt="heart"
style="width: 30%;"> style="width: 30%;">
</td> </td>
@ -70,7 +70,7 @@ automatically by Zulip.
<td align="center"><code>:|</code></td> <td align="center"><code>:|</code></td>
<td align="center"> <td align="center">
<img <img
src="/static/generated/emoji/images/emoji/expressionless.png" src="/static/generated/emoji/images-google-64/1f611.png"
alt="expressionless" alt="expressionless"
style="width: 30%;"> style="width: 30%;">
</td> </td>
@ -79,7 +79,7 @@ automatically by Zulip.
<td align="center"><code>:/</code></td> <td align="center"><code>:/</code></td>
<td align="center"> <td align="center">
<img <img
src="/static/generated/emoji/images/emoji/confused.png" src="/static/generated/emoji/images-google-64/1f615.png"
alt="confused" alt="confused"
style="width: 30%;"> style="width: 30%;">
</td> </td>

6
tools/setup/emoji/emoji_setup_utils.py
View File

@ -38,9 +38,9 @@ remapped_emojis = {
# Emoticons and which emoji they should become. Duplicate emoji are allowed. # Emoticons and which emoji they should become. Duplicate emoji are allowed.
# Changes here should be mimicked in `templates/zerver/help/enable-emoticon-translations.md`. # Changes here should be mimicked in `templates/zerver/help/enable-emoticon-translations.md`.
EMOTICON_CONVERSIONS = { EMOTICON_CONVERSIONS = {
':)': ':smiley:', ':)': ':slight_smile:',
'(:': ':smiley:', '(:': ':slight_smile:',
':(': ':slight_frown:', ':(': ':frown:',
'<3': ':heart:', '<3': ':heart:',
':|': ':expressionless:', ':|': ':expressionless:',
':/': ':confused:', ':/': ':confused:',

2
version.py
View File

@ -8,4 +8,4 @@ ZULIP_VERSION = "1.8.1+git"
# Typically, adding a dependency only requires a minor version bump, and # Typically, adding a dependency only requires a minor version bump, and
# removing a dependency requires a major version bump. # removing a dependency requires a major version bump.
PROVISION_VERSION = '24.2' PROVISION_VERSION = '25.0'

22
zerver/tests/fixtures/markdown_test_cases.json vendored
View File

@ -360,15 +360,15 @@
{ {
"name": "translate_emoticons_enabled", "name": "translate_emoticons_enabled",
"input": ":)", "input": ":)",
"expected_output": "<p><span class=\"emoji emoji-1f603\" title=\"smiley\">:smiley:</span></p>", "expected_output": "<p><span class=\"emoji emoji-1f642\" title=\"slight smile\">:slight_smile:</span></p>",
"text_content": "\ud83d\ude03", "text_content": "\ud83d\ude42",
"translate_emoticons": true "translate_emoticons": true
}, },
{ {
"name": "translate_emoticons", "name": "translate_emoticons",
"input": ":) foo :( bar <3 with space : ) real emoji :smiley:", "input": ":) foo :( bar <3 with space : ) real emoji :slight_smile:",
"expected_output": "<p><span class=\"emoji emoji-1f603\" title=\"smiley\">:smiley:</span> foo <span class=\"emoji emoji-1f641\" title=\"slight frown\">:slight_frown:</span> bar <span class=\"emoji emoji-2764\" title=\"heart\">:heart:</span> with space : ) real emoji <span class=\"emoji emoji-1f603\" title=\"smiley\">:smiley:</span></p>", "expected_output": "<p><span class=\"emoji emoji-1f642\" title=\"slight smile\">:slight_smile:</span> foo <span class=\"emoji emoji-1f641\" title=\"frown\">:frown:</span> bar <span class=\"emoji emoji-2764\" title=\"heart\">:heart:</span> with space : ) real emoji <span class=\"emoji emoji-1f642\" title=\"slight smile\">:slight_smile:</span></p>",
"text_content": "\ud83d\ude03 foo \ud83d\ude41 bar \u2764 with space : ) real emoji \ud83d\ude03", "text_content": "\ud83d\ude42 foo \ud83d\ude41 bar \u2764 with space : ) real emoji \ud83d\ude42",
"translate_emoticons": true "translate_emoticons": true
}, },
{ {
@ -381,8 +381,8 @@
{ {
"name": "translate_emoticons_newline", "name": "translate_emoticons_newline",
"input": ":) test\n:) test", "input": ":) test\n:) test",
"expected_output": "<p><span class=\"emoji emoji-1f603\" title=\"smiley\">:smiley:</span> test<br>\n<span class=\"emoji emoji-1f603\" title=\"smiley\">:smiley:</span> test</p>", "expected_output": "<p><span class=\"emoji emoji-1f642\" title=\"slight smile\">:slight_smile:</span> test<br>\n<span class=\"emoji emoji-1f642\" title=\"slight smile\">:slight_smile:</span> test</p>",
"text_content": "\ud83d\ude03 test\n\ud83d\ude03 test", "text_content": "\ud83d\ude42 test\n\ud83d\ude42 test",
"translate_emoticons": true "translate_emoticons": true
}, },
{ {
@ -395,16 +395,16 @@
{ {
"name": "translate_emoticons_at_sentence_end", "name": "translate_emoticons_at_sentence_end",
"input": "Translate this :).", "input": "Translate this :).",
"expected_output": "<p>Translate this <span class=\"emoji emoji-1f603\" title=\"smiley\">:smiley:</span>.</p>", "expected_output": "<p>Translate this <span class=\"emoji emoji-1f642\" title=\"slight smile\">:slight_smile:</span>.</p>",
"text_content": "Translate this \ud83d\ude03.", "text_content": "Translate this \ud83d\ude42.",
"translate_emoticons": true "translate_emoticons": true
}, },
{ {
"name": "translate_emoticons_between_symbols", "name": "translate_emoticons_between_symbols",
"input": "Translate this !:)?", "input": "Translate this !:)?",
"expected_output": "<p>Translate this !<span class=\"emoji emoji-1f603\" title=\"smiley\">:smiley:</span>?</p>", "expected_output": "<p>Translate this !<span class=\"emoji emoji-1f642\" title=\"slight smile\">:slight_smile:</span>?</p>",
"marked_expected_output": "<p>Translate this !:)?</p>", "marked_expected_output": "<p>Translate this !:)?</p>",
"text_content": "Translate this !\ud83d\ude03?", "text_content": "Translate this !\ud83d\ude42?",
"translate_emoticons": true "translate_emoticons": true
}, },
{ {