Fixes automobile being an alias now

2017-06-14 07:50:36 +02:00 · 2017-06-14 07:50:36 +02:00 · 03f3612884
parent 13f89a53a3
commit 03f3612884
13 changed files with 4 additions and 5 deletions
--- 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",
--- 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"
--- 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",
--- a/public/images/emoji/apple/automobile.png
+++ b/public/images/emoji/apple/automobile.png
--- a/public/images/emoji/apple/car.png
+++ b/public/images/emoji/apple/car.png
--- a/public/images/emoji/emoji_one/automobile.png
+++ b/public/images/emoji/emoji_one/automobile.png
--- a/public/images/emoji/emoji_one/car.png
+++ b/public/images/emoji/emoji_one/car.png
--- a/public/images/emoji/google/automobile.png
+++ b/public/images/emoji/google/automobile.png
--- a/public/images/emoji/google/car.png
+++ b/public/images/emoji/google/car.png
--- a/public/images/emoji/twitter/automobile.png
+++ b/public/images/emoji/twitter/automobile.png
--- a/public/images/emoji/twitter/car.png
+++ b/public/images/emoji/twitter/car.png
--- a/public/images/emoji/win10/automobile.png
+++ b/public/images/emoji/win10/automobile.png
--- a/public/images/emoji/win10/car.png
+++ b/public/images/emoji/win10/car.png