Merge pull request #4926 from jjaffeux/fixes-mouse-three

Uses computer_mouse as base name

app/assets/javascripts/discourse/lib/emoji/groups.js.es6

@@ -1465,7 +1465,6 @@ const groups = [
       "studio_microphone",
       "medal_military",
       "computer_mouse",
-      "mouse_three_button",
       "newspaper_roll",
       "spiral_notepad",
       "oil_drum",

lib/emoji/db.json

@@ -6346,8 +6346,9 @@
     "artificial_satellite": [
       "satellite_orbital"
     ],
-    "three_button_mouse": [
+    "computer_mouse": [
-      "mouse_three_button"
+      "mouse_three_button",
+      "three_button_mouse"
     ],
     "hocho": [
       "knife"

lib/tasks/emoji.rake

@@ -173,7 +173,7 @@ EMOJI_ALIASES ||= {
   "honeybee" => [ "bee" ],
   "lion" => [ "lion_face" ],
   "artificial_satellite" => [ "satellite_orbital" ],
-  "three_button_mouse" => [ "mouse_three_button" ],
+  "computer_mouse" => [ "mouse_three_button", "three_button_mouse" ],
   "hocho" => [ "knife" ],
   "swimming_man" => [ "swimmer" ],
   "wind_face" => [ "wind_blowing_face" ],
@@ -1676,7 +1676,6 @@ EMOJI_GROUPS ||= [
       "studio_microphone",
       "medal_military",
       "computer_mouse",
-      "mouse_three_button",
       "newspaper_roll",
       "spiral_notepad",
       "oil_drum",