diff options
| author | scarlett <nia@netbsd.org> | 2018-10-16 14:09:29 +0100 |
|---|---|---|
| committer | scarlett <nia@netbsd.org> | 2018-10-16 14:09:29 +0100 |
| commit | 4cc1ed6171b7fc0e8dc793fbb80e0a63cf83ec40 (patch) | |
| tree | a740845efd742f1a9f1b1a1f0543d996fcb923c2 /src/components/settings/settings.vue | |
| parent | 145929207ef9204066b03ab104284168a054b5f0 (diff) | |
| parent | f554edc054fcb6e0508ed5da7dc9edf1a85d2305 (diff) | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into hide-statistics
Diffstat (limited to 'src/components/settings/settings.vue')
| -rw-r--r-- | src/components/settings/settings.vue | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/src/components/settings/settings.vue b/src/components/settings/settings.vue index 18e8e244..652bdcc1 100644 --- a/src/components/settings/settings.vue +++ b/src/components/settings/settings.vue @@ -1,7 +1,21 @@ <template> <div class="settings panel panel-default"> <div class="panel-heading"> - {{$t('settings.settings')}} + <div class="title"> + {{$t('settings.settings')}} + </div> + + <transition name="fade"> + <template v-if="currentSaveStateNotice"> + <div @click.prevent class="alert error" v-if="currentSaveStateNotice.error"> + {{ $t('settings.saving_err') }} + </div> + + <div @click.prevent class="alert transparent" v-if="!currentSaveStateNotice.error"> + {{ $t('settings.saving_ok') }} + </div> + </template> + </transition> </div> <div class="panel-body"> <tab-switcher> @@ -15,7 +29,9 @@ <ul class="setting-list"> <li> <input type="checkbox" id="collapseMessageWithSubject" v-model="collapseMessageWithSubjectLocal"> - <label for="collapseMessageWithSubject">{{$t('settings.collapse_subject')}}</label> + <label for="collapseMessageWithSubject"> + {{$t('settings.collapse_subject')}} {{$t('settings.instance_default', { value: collapseMessageWithSubjectDefault })}} + </label> </li> <li> <input type="checkbox" id="streaming" v-model="streamingLocal"> @@ -124,11 +140,15 @@ </div> <div> <input type="checkbox" id="hidePostStats" v-model="hidePostStatsLocal"> - <label for="hidePostStats">{{$t('settings.hide_post_stats')}}</label> + <label for="hidePostStats"> + {{$t('settings.hide_post_stats')}} {{$t('settings.instance_default', { value: hidePostStatsDefault })}} + </label> </div> <div> <input type="checkbox" id="hideUserStats" v-model="hideUserStatsLocal"> - <label for="hideUserStats">{{$t('settings.hide_user_stats')}}</label> + <label for="hideUserStats"> + {{$t('settings.hide_user_stats')}} {{$t('settings.instance_default', { value: hideUserStatsDefault })}} + </label> </div> </div> <div class="setting-item"> |