From c3b27ab4c2d6ca03d8bea171735521b770172104 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 28 Aug 2018 15:47:42 +0300
Subject: [PATCH] moved replies filtering to "filter" category in settings,
 made it more consistent

---
 src/components/settings/settings.vue | 21 +++++++++++----------
 src/i18n/messages.js                 |  5 +++++
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/components/settings/settings.vue b/src/components/settings/settings.vue
index 240cd70a..2f70c209 100644
--- a/src/components/settings/settings.vue
+++ b/src/components/settings/settings.vue
@@ -35,16 +35,6 @@
               <input type="checkbox" id="hoverPreview" v-model="hoverPreviewLocal">
               <label for="hoverPreview">{{$t('settings.reply_link_preview')}}</label>
             </li>
-            <li>
-              <label for="replyVisibility" class="select">
-                <select id="replyVisibility" v-model="replyVisibilityLocal">
-                  <option value="all" selected>{{$t('settings.reply_visibility_all')}}</option>
-                  <option value="following">{{$t('settings.reply_visibility_following')}}</option>
-                  <option value="self">{{$t('settings.reply_visibility_self')}}</option>
-                </select>
-                <i class="icon-down-open"/>
-              </label>
-            </li>
           </ul>
         </div>
         <div class="setting-item">
@@ -90,6 +80,17 @@
       </div>
 
       <div :title="$t('settings.filtering')" >
+        <div class="setting-item">
+          {{$t('settings.replies_in_timeline')}}
+          <label for="replyVisibility" class="select">
+            <select id="replyVisibility" v-model="replyVisibilityLocal">
+              <option value="all" selected>{{$t('settings.reply_visibility_all')}}</option>
+              <option value="following">{{$t('settings.reply_visibility_following')}}</option>
+              <option value="self">{{$t('settings.reply_visibility_self')}}</option>
+            </select>
+            <i class="icon-down-open"/>
+          </label>
+        </div>
         <div class="setting-item">
           <p>{{$t('settings.filtering_explanation')}}</p>
           <textarea id="muteWords" v-model="muteWordsString"></textarea>
diff --git a/src/i18n/messages.js b/src/i18n/messages.js
index cccf48cc..ebc96e81 100644
--- a/src/i18n/messages.js
+++ b/src/i18n/messages.js
@@ -327,6 +327,7 @@ const en = {
     loop_video: 'Loop videos',
     loop_video_silent_only: 'Loop only videos without sound (i.e. Mastodon\'s "gifs")',
     reply_link_preview: 'Enable reply-link preview on mouse hover',
+    replies_in_timeline: 'Replies in timeline',
     reply_visibility_all: 'Show all replies',
     reply_visibility_following: 'Only show replies directed at me or users I\'m following',
     reply_visibility_self: 'Only show replies directed at me',
@@ -1674,6 +1675,10 @@ const ru = {
     loop_video: 'Зациливать видео',
     loop_video_silent_only: 'Зацикливать только беззвучные видео (т.е. "гифки" с Mastodon)',
     reply_link_preview: 'Включить предварительный просмотр ответа при наведении мыши',
+    replies_in_timeline: 'Ответы в ленте',
+    reply_visibility_all: 'Показывать все ответы',
+    reply_visibility_following: 'Показывать только ответы мне и тех на кого я подписан',
+    reply_visibility_self: 'Показывать только ответы мне',
     follow_import: 'Импортировать читаемых',
     import_followers_from_a_csv_file: 'Импортировать читаемых из файла .csv',
     follows_imported: 'Список читаемых импортирован. Обработка займёт некоторое время..',