sjw
/
pleroma-fe
mirror of https://git.pleroma.social/sjw/pleroma-fe.git
1
0
Fork 0
Code Issues Releases Wiki Activity

small thing to display instance-provided default

This commit is contained in:
Henry Jameson 2018-09-20 17:21:11 +03:00
parent 419744080f
commit a61ad0544a
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/components/settings/settings.js
View File

@ -25,6 +25,7 @@ const settings = {
collapseMessageWithSubjectLocal: typeof user.collapseMessageWithSubject === 'undefined' collapseMessageWithSubjectLocal: typeof user.collapseMessageWithSubject === 'undefined'
? instance.collapseMessageWithSubject ? instance.collapseMessageWithSubject
: user.collapseMessageWithSubject, : user.collapseMessageWithSubject,
collapseMessageWithSubjectDefault: this.$t('settings.values.' + instance.collapseMessageWithSubject),
stopGifs: user.stopGifs, stopGifs: user.stopGifs,
loopSilentAvailable: loopSilentAvailable:
// Firefox // Firefox

4
src/components/settings/settings.vue
View File

@ -29,7 +29,9 @@
<ul class="setting-list"> <ul class="setting-list">
<li> <li>
<input type="checkbox" id="collapseMessageWithSubject" v-model="collapseMessageWithSubjectLocal"> <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>
<li> <li>
<input type="checkbox" id="streaming" v-model="streamingLocal"> <input type="checkbox" id="streaming" v-model="streamingLocal">

5
src/i18n/messages.js
View File

@ -298,6 +298,11 @@ const en = {
profile_background: 'Profile Background', profile_background: 'Profile Background',
set_new_profile_background: 'Set new profile background', set_new_profile_background: 'Set new profile background',
settings: 'Settings', settings: 'Settings',
instance_default: '(default: {value})',
values: {
true: 'yes',
false: 'no'
},
theme: 'Theme', theme: 'Theme',
presets: 'Presets', presets: 'Presets',
export_theme: 'Save preset', export_theme: 'Save preset',