From 1245d7917f0f0172c09ab6e0c5fff0a1aed67784 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Sun, 9 Sep 2018 21:57:17 +0300
Subject: translations

---
 src/i18n/messages.js | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/i18n')

diff --git a/src/i18n/messages.js b/src/i18n/messages.js
index 2f70f7f0..7575c128 100644
--- a/src/i18n/messages.js
+++ b/src/i18n/messages.js
@@ -282,6 +282,8 @@ const en = {
     no_retweet_hint: 'Post is marked as followers-only or direct and cannot be repeated'
   },
   settings: {
+    saving_ok: 'Settings saved',
+    saving_err: 'Error saving settings',
     general: 'General',
     user_settings: 'User Settings',
     name_bio: 'Name & Bio',
-- 
cgit v1.2.3-70-g09d2


From a61ad0544adf013095b8052ebd7a3ea21a3510ae Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Thu, 20 Sep 2018 17:21:11 +0300
Subject: small thing to display instance-provided default

---
 src/components/settings/settings.js  | 1 +
 src/components/settings/settings.vue | 4 +++-
 src/i18n/messages.js                 | 5 +++++
 3 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'src/i18n')

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">
diff --git a/src/i18n/messages.js b/src/i18n/messages.js
index 7575c128..9dfc0b41 100644
--- a/src/i18n/messages.js
+++ b/src/i18n/messages.js
@@ -298,6 +298,11 @@ const en = {
     profile_background: 'Profile Background',
     set_new_profile_background: 'Set new profile background',
     settings: 'Settings',
+    instance_default: '(default: {value})',
+    values: {
+      true: 'yes',
+      false: 'no'
+    },
     theme: 'Theme',
     presets: 'Presets',
     export_theme: 'Save preset',
-- 
cgit v1.2.3-70-g09d2