Merge branch 'file-limit-info' into 'develop'

Display the upload limit on the Features panel

Closes #785

See merge request pleroma/pleroma-fe!1308
This commit is contained in:
Shpuld Shpludson 2020-12-12 14:39:46 +00:00
commit bdb994d450
4 changed files with 8 additions and 2 deletions

View File

@ -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 - Mouseover titles for emojis in reaction picker
- Support to input emoji into the search box in reaction picker - Support to input emoji into the search box in reaction picker
- Added some missing unicode emoji - Added some missing unicode emoji
- Added the upload limit to the Features panel in the About page
### Fixed ### Fixed
- Fixed the occasional bug where screen would scroll 1px when typing into a reply form - Fixed the occasional bug where screen would scroll 1px when typing into a reply form

View File

@ -1,3 +1,5 @@
import fileSizeFormatService from '../../services/file_size_format/file_size_format.js'
const FeaturesPanel = { const FeaturesPanel = {
computed: { computed: {
chat: function () { return this.$store.state.instance.chatAvailable }, chat: function () { return this.$store.state.instance.chatAvailable },
@ -6,7 +8,8 @@ const FeaturesPanel = {
whoToFollow: function () { return this.$store.state.instance.suggestionsEnabled }, whoToFollow: function () { return this.$store.state.instance.suggestionsEnabled },
mediaProxy: function () { return this.$store.state.instance.mediaProxyAvailable }, mediaProxy: function () { return this.$store.state.instance.mediaProxyAvailable },
minimalScopesMode: function () { return this.$store.state.instance.minimalScopesMode }, 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) }
} }
} }

View File

@ -25,6 +25,7 @@
</li> </li>
<li>{{ $t('features_panel.scope_options') }}</li> <li>{{ $t('features_panel.scope_options') }}</li>
<li>{{ $t('features_panel.text_limit') }} = {{ textlimit }}</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> </ul>
</div> </div>
</div> </div>

View File

@ -50,7 +50,8 @@
"scope_options": "Scope options", "scope_options": "Scope options",
"text_limit": "Text limit", "text_limit": "Text limit",
"title": "Features", "title": "Features",
"who_to_follow": "Who to follow" "who_to_follow": "Who to follow",
"upload_limit": "Upload limit"
}, },
"finder": { "finder": {
"error_fetching_user": "Error fetching user", "error_fetching_user": "Error fetching user",