Merge pull request #250 from chriswmartin/fav-confirm-modal

add favourite confirmation modal
2017-12-10 23:10:19 -05:00
parent 01a3461bef 0466aa8d08
commit 08b0861b96
18 changed files with 152 additions and 18 deletions
--- a/app/javascript/mastodon/locales/defaultMessages.json
+++ b/app/javascript/mastodon/locales/defaultMessages.json
@ -1293,6 +1293,19 @@
    ],
    "path": "app/javascript/mastodon/features/ui/components/boost_modal.json"
  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Favourite",
+        "id": "status.favourite"
+      },
+      {
+        "defaultMessage": "You can press {combo} to skip this next time",
+        "id": "favourite_modal.combo"
+      }
+    ],
+    "path": "app/javascript/mastodon/features/ui/components/favourite_modal.json"
+  },
  {
    "descriptors": [
      {
@ -1601,4 +1614,4 @@
    ],
    "path": "app/javascript/mastodon/features/video/index.json"
  }
-]
+]