diff options
| author | jared <jaredrmain@gmail.com> | 2019-04-05 14:08:13 -0400 |
|---|---|---|
| committer | jared <jaredrmain@gmail.com> | 2019-04-05 14:08:13 -0400 |
| commit | 093f0b23f749fefc5e8fd514e708731d1e1d3e94 (patch) | |
| tree | 8498de942b5f7805a04a0cdd869570d784e36e60 /src/components/post_status_form | |
| parent | 3b78c9c755563823adc7716a964505853b579561 (diff) | |
| parent | 8c7f765dff8b66ff27aeeab5bc09cd715ab328a9 (diff) | |
#101 - merge develop
Diffstat (limited to 'src/components/post_status_form')
| -rw-r--r-- | src/components/post_status_form/post_status_form.js | 3 | ||||
| -rw-r--r-- | src/components/post_status_form/post_status_form.vue | 7 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js index 40e2610e..c65c27e2 100644 --- a/src/components/post_status_form/post_status_form.js +++ b/src/components/post_status_form/post_status_form.js @@ -179,6 +179,9 @@ const PostStatusForm = { }, postFormats () { return this.$store.state.instance.postFormats || [] + }, + safeDMEnabled () { + return this.$store.state.instance.safeDM } }, methods: { diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue index 3d3a1082..1ce2b647 100644 --- a/src/components/post_status_form/post_status_form.vue +++ b/src/components/post_status_form/post_status_form.vue @@ -3,13 +3,16 @@ <form @submit.prevent="postStatus(newStatus)"> <div class="form-group" > <i18n - v-if="!this.$store.state.users.currentUser.locked && this.newStatus.visibility == 'private'" + v-if="!$store.state.users.currentUser.locked && newStatus.visibility == 'private'" path="post_status.account_not_locked_warning" tag="p" class="visibility-notice"> <router-link :to="{ name: 'user-settings' }">{{ $t('post_status.account_not_locked_warning_link') }}</router-link> </i18n> - <p v-if="this.newStatus.visibility == 'direct'" class="visibility-notice">{{ $t('post_status.direct_warning') }}</p> + <p v-if="newStatus.visibility === 'direct'" class="visibility-notice"> + <span v-if="safeDMEnabled">{{ $t('post_status.direct_warning_to_first_only') }}</span> + <span v-else>{{ $t('post_status.direct_warning_to_all') }}</span> + </p> <EmojiInput v-if="newStatus.spoilerText || alwaysShowSubject" type="text" |