diff options
| author | Shpuld Shpludson <shp@cock.li> | 2020-12-12 14:39:46 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2020-12-12 14:39:46 +0000 |
| commit | bdb994d45097da540b588d0176861690a33aeefe (patch) | |
| tree | 5970df217568a568ed766744e72ed38ee81434c6 /src | |
| parent | 99e12091b7207656966836f418588a65ea2f5a35 (diff) | |
| parent | 51e6f5e255f908de14a2fcfcca7b7298643017d1 (diff) | |
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 (limited to 'src')
| -rw-r--r-- | src/components/features_panel/features_panel.js | 5 | ||||
| -rw-r--r-- | src/components/features_panel/features_panel.vue | 1 | ||||
| -rw-r--r-- | src/i18n/en.json | 3 |
3 files changed, 7 insertions, 2 deletions
diff --git a/src/components/features_panel/features_panel.js b/src/components/features_panel/features_panel.js index 620a85ea..8b142d08 100644 --- 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 index 608b11c8..9605d09d 100644 --- 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 index ef23efd6..c42126fc 100644 --- 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", |