Merge pull request #4931 from jjaffeux/fixes-woman-shrugging-conversion

Fixes woman_shrugging name conversion
This commit is contained in:
Guo Xiang Tan 2017-06-15 15:52:28 +09:00 committed by GitHub
commit 8f48c20598
14 changed files with 3 additions and 1 deletions

View File

@ -829,7 +829,7 @@
"name": "woman_facepalming"
},
{
"code": "1f937",
"code": "1f937-200d-2640-fe0f",
"name": "woman_shrugging"
},
{

View File

@ -1753,6 +1753,7 @@ EMOJI_KEYWORDS_PATCH ||= {
"walking_woman" => { "fitzpatrick_scale" => true },
"woman_facepalming" => { "fitzpatrick_scale" => true },
"bowing_woman" => { "fitzpatrick_scale" => true },
"woman_shrugging" => { "char" => "🤷‍♀️" },
"man_shrugging" => { "fitzpatrick_scale" => true },
"tipping_hand_man" => { "fitzpatrick_scale" => true },
"no_good_man" => { "fitzpatrick_scale" => true },

Binary file not shown.

Before

Width:  |  Height:  |  Size: 919 B

After

Width:  |  Height:  |  Size: 917 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 918 B

After

Width:  |  Height:  |  Size: 916 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 919 B

After

Width:  |  Height:  |  Size: 918 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 923 B

After

Width:  |  Height:  |  Size: 924 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 943 B

After

Width:  |  Height:  |  Size: 944 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 822 B

After

Width:  |  Height:  |  Size: 826 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 827 B

After

Width:  |  Height:  |  Size: 903 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 881 B

After

Width:  |  Height:  |  Size: 816 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 816 B

After

Width:  |  Height:  |  Size: 865 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 768 B

After

Width:  |  Height:  |  Size: 778 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 738 B

After

Width:  |  Height:  |  Size: 752 B

View File

@ -458,6 +458,7 @@ HTML
expect(PrettyText.cook("hello 👱🏿‍♀️")).to eq("<p>hello <img src=\"/images/emoji/emoji_one/blonde_woman/6.png?v=5\" title=\":blonde_woman:t6:\" class=\"emoji\" alt=\":blonde_woman:t6:\"></p>")
expect(PrettyText.cook("hello 👩‍🎤")).to eq("<p>hello <img src=\"/images/emoji/emoji_one/woman_singer.png?v=5\" title=\":woman_singer:\" class=\"emoji\" alt=\":woman_singer:\"></p>")
expect(PrettyText.cook("hello 👩🏾‍🎓")).to eq("<p>hello <img src=\"/images/emoji/emoji_one/woman_student/5.png?v=5\" title=\":woman_student:t5:\" class=\"emoji\" alt=\":woman_student:t5:\"></p>")
expect(PrettyText.cook("hello 🤷‍♀️")).to eq("<p>hello <img src=\"/images/emoji/emoji_one/woman_shrugging.png?v=5\" title=\":woman_shrugging:\" class=\"emoji\" alt=\":woman_shrugging:\"></p>")
end
end