aboutsummaryrefslogtreecommitdiff
path: root/src/components
diff options
context:
space:
mode:
authorHenry Jameson <me@hjkos.com>2018-09-20 17:21:11 +0300
committerHenry Jameson <me@hjkos.com>2018-09-20 17:21:11 +0300
commita61ad0544adf013095b8052ebd7a3ea21a3510ae (patch)
treef8fbf9826b5b74325265abda9c18f0978bb63e2b /src/components
parent419744080ff2dfcf4b860f01692463b78f30c40a (diff)
small thing to display instance-provided default
Diffstat (limited to 'src/components')
-rw-r--r--src/components/settings/settings.js1
-rw-r--r--src/components/settings/settings.vue4
2 files changed, 4 insertions, 1 deletions
diff --git a/src/components/settings/settings.js b/src/components/settings/settings.js
index 856ca40e..a24bc265 100644
--- a/src/components/settings/settings.js
+++ b/src/components/settings/settings.js
@@ -25,6 +25,7 @@ const settings = {
collapseMessageWithSubjectLocal: typeof user.collapseMessageWithSubject === 'undefined'
? instance.collapseMessageWithSubject
: user.collapseMessageWithSubject,
+ collapseMessageWithSubjectDefault: this.$t('settings.values.' + instance.collapseMessageWithSubject),
stopGifs: user.stopGifs,
loopSilentAvailable:
// Firefox
diff --git a/src/components/settings/settings.vue b/src/components/settings/settings.vue
index 8c7c1b71..42c660a3 100644
--- a/src/components/settings/settings.vue
+++ b/src/components/settings/settings.vue
@@ -29,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">