Merge branch 'flash-support' into 'develop'

Flash support See merge request pleroma/pleroma-fe!1380
2021-05-31 11:00:53 +00:00 · 2021-05-31 11:00:53 +00:00 · dc611dffdb
commit dc611dffdb
parent 0741d1d93d 245addb530
11 changed files with 819 additions and 202 deletions
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@ -79,7 +79,10 @@
    "role": {
      "admin": "Admin",
      "moderator": "Moderator"
-    }
+    },
+    "flash_content": "Click to show Flash content using Ruffle (Experimental, may not work).",
+    "flash_security": "Note that this can be potentially dangerous since Flash content is still arbitrary code.",
+    "flash_fail": "Failed to load flash content, see console for details."
  },
  "image_cropper": {
    "crop_picture": "Crop picture",