about summary refs log tree commit diff
diff options
context:
space:
mode:
authorM Somerville <dracos@users.noreply.github.com>2018-08-25 23:18:40 +0100
committerEugen Rochko <eugen@zeonfederated.com>2018-08-26 00:18:40 +0200
commitdf06f53f9b3cf75744dc776b755e223d4c3631df (patch)
tree0cbb0b17b58727feff8b95cb3e427bf3da508e86
parent33054840280186789aa286fbfdf3aa76f09bdb36 (diff)
Specify allowed media in upload button tooltip. (#8443)
-rw-r--r--app/javascript/mastodon/features/compose/components/upload_button.js2
-rw-r--r--app/javascript/mastodon/locales/en.json2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/javascript/mastodon/features/compose/components/upload_button.js b/app/javascript/mastodon/features/compose/components/upload_button.js
index 70b28a2ba..2f38f5148 100644
--- a/app/javascript/mastodon/features/compose/components/upload_button.js
+++ b/app/javascript/mastodon/features/compose/components/upload_button.js
@@ -7,7 +7,7 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 
 const messages = defineMessages({
-  upload: { id: 'upload_button.label', defaultMessage: 'Add media' },
+  upload: { id: 'upload_button.label', defaultMessage: 'Add media (JPEG, PNG, GIF, WebM, MP4)' },
 });
 
 const makeMapStateToProps = () => {
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 432c4f0b0..3d8fdc0d7 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -297,7 +297,7 @@
   "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} talking",
   "ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
   "upload_area.title": "Drag & drop to upload",
-  "upload_button.label": "Add media",
+  "upload_button.label": "Add media (JPEG, PNG, GIF, WebM, MP4)",
   "upload_form.description": "Describe for the visually impaired",
   "upload_form.focus": "Crop",
   "upload_form.undo": "Delete",