pleroma-fe

commit: eb93034a4090bc101adb79776726ae3bf69bb3d1
parent: 3f72b611c1e4bc4c579d29a5e1ecb352d62a8743
Author: kaniini <nenolod@gmail.com>
Date:   Sun,  9 Sep 2018 11:55:49 +0000

Merge branch 'simplify-sensitivity-label' into 'develop'

Simplified image sensitivity label

See merge request pleroma/pleroma-fe!334
Diffstat:
M
src/components/post_status_form/post_status_form.vue
3
+--
M
src/i18n/messages.js
3
+--

2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
@@ -90,8 +90,7 @@
       </div>
       <div class="upload_settings" v-if="newStatus.files.length > 0">
         <input type="checkbox" id="filesSensitive" v-model="newStatus.nsfw">
-        <label for="filesSensitive" v-if="newStatus.nsfw">{{$t('post_status.attachments_sensitive')}}</label>
-        <label for="filesSensitive" v-else v-html="$t('post_status.attachments_not_sensitive')"></label>
+        <label for="filesSensitive">{{$t('post_status.attachments_sensitive')}}</label>
       </div>
     </form>
   </div>
diff --git a/src/i18n/messages.js b/src/i18n/messages.js
@@ -393,8 +393,7 @@ const en = {
     account_not_locked_warning: 'Your account is not {0}. Anyone can follow you to view your follower-only posts.',
     account_not_locked_warning_link: 'locked',
     direct_warning: 'This post will only be visible to all the mentioned users.',
-    attachments_sensitive: 'Attachments marked sensitive',
-    attachments_not_sensitive: 'Attachments <strong>not</strong> marked sensitive',
+    attachments_sensitive: 'Mark attachments as sensitive',
     scope: {
       public: 'Public - Post to public timelines',
       unlisted: 'Unlisted - Do not post to public timelines',