aboutsummaryrefslogtreecommitdiff
path: root/src/components/features_panel/features_panel.vue
diff options
context:
space:
mode:
authorShpuld Shpludson <shp@cock.li>2020-12-12 14:39:46 +0000
committerShpuld Shpludson <shp@cock.li>2020-12-12 14:39:46 +0000
commitbdb994d45097da540b588d0176861690a33aeefe (patch)
tree5970df217568a568ed766744e72ed38ee81434c6 /src/components/features_panel/features_panel.vue
parent99e12091b7207656966836f418588a65ea2f5a35 (diff)
parent51e6f5e255f908de14a2fcfcca7b7298643017d1 (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/components/features_panel/features_panel.vue')
-rw-r--r--src/components/features_panel/features_panel.vue1
1 files changed, 1 insertions, 0 deletions
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>