From 03f3612884ce3e3b6d4984a976b24f61042bd25c Mon Sep 17 00:00:00 2001 From: Joffrey JAFFEUX Date: Wed, 14 Jun 2017 07:50:36 +0200 Subject: [PATCH] Fixes automobile being an alias now --- .../discourse/lib/emoji/groups.js.es6 | 1 - lib/emoji/db.json | 5 +++-- lib/tasks/emoji.rake | 3 +-- public/images/emoji/apple/automobile.png | Bin 0 -> 2322 bytes public/images/emoji/apple/car.png | Bin 0 -> 2322 bytes public/images/emoji/emoji_one/automobile.png | Bin 0 -> 1366 bytes public/images/emoji/emoji_one/car.png | Bin 0 -> 1366 bytes public/images/emoji/google/automobile.png | Bin 0 -> 1084 bytes public/images/emoji/google/car.png | Bin 0 -> 1084 bytes public/images/emoji/twitter/automobile.png | Bin 0 -> 791 bytes public/images/emoji/twitter/car.png | Bin 0 -> 791 bytes public/images/emoji/win10/automobile.png | Bin 0 -> 568 bytes public/images/emoji/win10/car.png | Bin 0 -> 568 bytes 13 files changed, 4 insertions(+), 5 deletions(-) create mode 100644 public/images/emoji/apple/automobile.png create mode 100644 public/images/emoji/apple/car.png create mode 100644 public/images/emoji/emoji_one/automobile.png create mode 100644 public/images/emoji/emoji_one/car.png create mode 100644 public/images/emoji/google/automobile.png create mode 100644 public/images/emoji/google/car.png create mode 100644 public/images/emoji/twitter/automobile.png create mode 100644 public/images/emoji/twitter/car.png create mode 100644 public/images/emoji/win10/automobile.png create mode 100644 public/images/emoji/win10/car.png diff --git a/app/assets/javascripts/discourse/lib/emoji/groups.js.es6 b/app/assets/javascripts/discourse/lib/emoji/groups.js.es6 index 627513d1cf6..deb93d2414b 100644 --- a/app/assets/javascripts/discourse/lib/emoji/groups.js.es6 +++ b/app/assets/javascripts/discourse/lib/emoji/groups.js.es6 @@ -701,7 +701,6 @@ const groups = [ "rotating_light", "taxi", "oncoming_taxi", - "automobile", "oncoming_automobile", "blue_car", "truck", diff --git a/lib/emoji/db.json b/lib/emoji/db.json index d5619dc4964..c94c60e5bbc 100644 --- a/lib/emoji/db.json +++ b/lib/emoji/db.json @@ -6450,8 +6450,9 @@ "new_moon": [ "moon" ], - "automobile": [ - "car" + "oncoming_automobile": [ + "car", + "automobile" ], "fleur_de_lis": [ "fleur-de-lis" diff --git a/lib/tasks/emoji.rake b/lib/tasks/emoji.rake index 104c096b31c..9c3e1fa3117 100644 --- a/lib/tasks/emoji.rake +++ b/lib/tasks/emoji.rake @@ -208,7 +208,7 @@ EMOJI_ALIASES ||= { "tipping_hand_woman" => [ "information_desk_person" ], "rowing_man" => [ "rowboat" ], "new_moon" => [ "moon" ], - "automobile" => [ "car" ], + "oncoming_automobile" => [ "car", "automobile" ], "fleur_de_lis" => [ "fleur-de-lis" ], } @@ -912,7 +912,6 @@ EMOJI_GROUPS ||= [ "rotating_light", "taxi", "oncoming_taxi", - "automobile", "oncoming_automobile", "blue_car", "truck", diff --git a/public/images/emoji/apple/automobile.png b/public/images/emoji/apple/automobile.png new file mode 100644 index 0000000000000000000000000000000000000000..80e24f234bcafff197874c5ab26532eb16f3e809 GIT binary patch literal 2322 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 YAAC?RFf2R&|Nqb=B*+{b!W0wMD=XzhLX-^= zxDW~W`1#lE_32envv(wcuCDd108b(=>yrWT zp`pRR#o#tJjEJPkLrS4XSq*@>Xisp0p}?PTg$R2ESWSWQB>3_D?Q&@qJ6mW0=000_vQchC2r&6JnM`4or;9|}1OaK4__(?=TRCr$OlG$#9Fcd`lfGvuQkn%I*jdjVM zw*UV%bud>BO$edSIS+8Ltiz1#kALyz%^S`(Ld1@A;5rGhVSJ5)ZQ>-u3|SIy*h@)7 zf<+R+7c~(GbV^T99SB6vReVgN3Yq7}?>mlpE(AP<8;~IS&I6OZWx!E{q8vIQghuhpl}jXSLLCuJU6DY@)$SO#>tAA zZVbTL3<9@x!~{`A^nNtwnR63B=Xcfz=cAG6gNX8WfOsHE0PRI(5LGwLh>~UvB=;T; zz=mHErZ%P?9$|^nSpfV|GhC|I7^N5d?Z!l$Mu4hTqJSuk1*1|aJbJB2!;^Blh#tFE zWHCS&lLA3o`?CUTH7L>`62HyY*;e8(7{GCbGRo;34=U~9s?9Lo6aYQ=YZOb_Vw_i1wM~pf=@3MTVUjHj=NPwA#uE=A6=^5W zvOITEF?9CU$@Q$3B85VTCm6%WP_{7=AGnl~8)uVYsH!kd_$P?Utb_1D>IOE+Zu9{g zD64QLX#g#efbVjE3?)s;mr0XhuwHSH0xeI_9YO@2wsKHpB}M32L|G?sPzC!y5V{MY zQo;G>nRfPuAp(7oAV%7o!5mIsm1htVT<+i7_OOr4-7W!$)3airN~%DL_J_88-%Bn~ z2;CzcBV2K%6epUAo3(4V-R{<|Ce{=&V=%~&?mmS2rA_Bx+(}J}&gw&NZ+)t69Q2`~ zrv8F?dldonf{=KHPx_^4ecWw7cE>vPN|;{ua)NFE5CRPq$7mqC?8ZZ>AZO75w`Alj zk%mwydnrO$iNXYFWRN YAAC?Rxw*5m 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