commit: bdb994d45097da540b588d0176861690a33aeefe
parent 99e12091b7207656966836f418588a65ea2f5a35
Author: Shpuld Shpludson <shp@cock.li>
Date: Sat, 12 Dec 2020 14:39:46 +0000
Merge branch 'file-limit-info' into 'develop'
Display the upload limit on the Features panel
Closes #785
See merge request pleroma/pleroma-fe!1308
Diffstat:
4 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Mouseover titles for emojis in reaction picker
- Support to input emoji into the search box in reaction picker
- Added some missing unicode emoji
+- Added the upload limit to the Features panel in the About page
### Fixed
- Fixed the occasional bug where screen would scroll 1px when typing into a reply form
diff --git a/src/components/features_panel/features_panel.js b/src/components/features_panel/features_panel.js
@@ -1,3 +1,5 @@
+import fileSizeFormatService from '../../services/file_size_format/file_size_format.js'
+
const FeaturesPanel = {
computed: {
chat: function () { return this.$store.state.instance.chatAvailable },
@@ -6,7 +8,8 @@ const FeaturesPanel = {
whoToFollow: function () { return this.$store.state.instance.suggestionsEnabled },
mediaProxy: function () { return this.$store.state.instance.mediaProxyAvailable },
minimalScopesMode: function () { return this.$store.state.instance.minimalScopesMode },
- textlimit: function () { return this.$store.state.instance.textlimit }
+ textlimit: function () { return this.$store.state.instance.textlimit },
+ uploadlimit: function () { return fileSizeFormatService.fileSizeFormat(this.$store.state.instance.uploadlimit) }
}
}
diff --git a/src/components/features_panel/features_panel.vue b/src/components/features_panel/features_panel.vue
@@ -25,6 +25,7 @@
</li>
<li>{{ $t('features_panel.scope_options') }}</li>
<li>{{ $t('features_panel.text_limit') }} = {{ textlimit }}</li>
+ <li>{{ $t('features_panel.upload_limit') }} = {{ uploadlimit.num }} {{ $t('upload.file_size_units.' + uploadlimit.unit) }}</li>
</ul>
</div>
</div>
diff --git a/src/i18n/en.json b/src/i18n/en.json
@@ -50,7 +50,8 @@
"scope_options": "Scope options",
"text_limit": "Text limit",
"title": "Features",
- "who_to_follow": "Who to follow"
+ "who_to_follow": "Who to follow",
+ "upload_limit": "Upload limit"
},
"finder": {
"error_fetching_user": "Error fetching user",