diff options
| author | Henry <spam@hjkos.com> | 2018-09-21 09:19:02 +0000 |
|---|---|---|
| committer | Henry <spam@hjkos.com> | 2018-09-21 09:19:02 +0000 |
| commit | cd48268c858f4a7f24767e41e81cb6524393c5e6 (patch) | |
| tree | 64020b07266815f88990274c5ad5ee134f04d5f1 /src/components/settings/settings.vue | |
| parent | 6f32ccf41717c2b59404c04ab0b0cb4b8c8171e3 (diff) | |
| parent | 1c2f0029e4835a34a94aba2aac7eeff592aa0d95 (diff) | |
Merge branch 'betterStorage' into 'develop'
Better storage
See merge request pleroma/pleroma-fe!343
Diffstat (limited to 'src/components/settings/settings.vue')
| -rw-r--r-- | src/components/settings/settings.vue | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/src/components/settings/settings.vue b/src/components/settings/settings.vue index c106b79c..42c660a3 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"> |