Merge remote-tracking branch 'origin/develop' into shigusegubu-themes3

src/components/interactions/interactions.js

@@ -3,6 +3,7 @@ import TabSwitcher from 'src/components/tab_switcher/tab_switcher.jsx'
 
 const tabModeDict = {
   mentions: ['mention'],
+  statuses: ['status'],
   'likes+repeats': ['repeat', 'like'],
   follows: ['follow'],
   reactions: ['pleroma:emoji_reaction'],

src/components/interactions/interactions.vue

@@ -10,9 +10,13 @@
       :on-switch="onModeSwitch"
     >
       <span
-        key="mentions"
+        key="statuses"
         :label="$t('nav.mentions')"
       />
+      <span
+        key="statuses"
+        :label="$t('interactions.statuses')"
+      />
       <span
         key="likes+repeats"
         :label="$t('interactions.favs_repeats')"

src/components/notification/notification.vue

@@ -1,6 +1,6 @@
 <template>
   <article
-    v-if="notification.type === 'mention'"
+    v-if="notification.type === 'mention' || notification.type === 'status'"
   >
     <Status
       class="Notification"

src/components/notifications/notification_filters.vue

@@ -43,6 +43,15 @@
             :class="{ 'menu-checkbox-checked': filters.mentions }"
           />{{ $t('settings.notification_visibility_mentions') }}
         </button>
+        <button
+          class="menu-item dropdown-item"
+          @click="toggleNotificationFilter('statuses')"
+        >
+          <span
+            class="input menu-checkbox"
+            :class="{ 'menu-checkbox-checked': filters.statuses }"
+          />{{ $t('settings.notification_visibility_statuses') }}
+        </button>
         <button
           class="menu-item dropdown-item"
           @click="toggleNotificationFilter('emojiReactions')"

src/components/notifications/notifications.js

@@ -33,7 +33,7 @@ const Notifications = {
     // Disables panel styles, unread mark, potentially other notification-related actions
     // meant for "Interactions" timeline
     minimalMode: Boolean,
-    // Custom filter mode, an array of strings, possible values 'mention', 'repeat', 'like', 'follow', used to override global filter for use in "Interactions" timeline
+    // Custom filter mode, an array of strings, possible values 'mention', 'status', 'repeat', 'like', 'follow', used to override global filter for use in "Interactions" timeline
     filterMode: Array,
     // Do not show extra notifications
     noExtra: {

src/components/screen_reader_notice/screen_reader_notice.js

@@ -2,7 +2,7 @@ const ScreenReaderNotice = {
   props: {
     ariaLive: {
       type: String,
-      defualt: 'assertive'
+      default: 'assertive'
     }
   },
   data () {

src/components/settings_modal/tabs/filtering_tab.vue

@@ -49,24 +49,6 @@
             {{ $t('settings.mute_sensitive_posts') }}
           </BooleanSetting>
         </li>
-        <li>
-          <BooleanSetting path="hideMutedFederationRestrictions">
-            {{ $t('settings.hide_muted_federation_restrictions') }}
-          </BooleanSetting>
-          <ul
-            class="setting-list suboptions"
-            :class="[{disabled: !streaming}]"
-          >
-            <li
-              v-for="item in muteFederationRestrictionsLevels"
-              :key="'mute_' + item + '_federation_restriction'"
-            >
-              <BooleanSetting :path="'muteFederationRestrictions.' + item">
-                {{ $t('settings.mute_' + item + '_federation_restriction') }}
-              </BooleanSetting>
-            </li>
-          </ul>
-        </li>
         <li>
           <BooleanSetting path="hidePostStats">
             {{ $t('settings.hide_post_stats') }}

src/components/settings_modal/tabs/general_tab.js

@@ -75,6 +75,12 @@ const GeneralTab = {
         label: this.$t(`post_status.content_type["${format}"]`)
       }))
     },
+    language: {
+      get: function () { return this.$store.getters.mergedConfig.interfaceLanguage },
+      set: function (val) {
+        this.$store.dispatch('setOption', { name: 'interfaceLanguage', value: val })
+      }
+    },
     ...SharedComputedObject()
   },
   methods: {

src/components/settings_modal/tabs/notifications_tab.vue

@@ -60,6 +60,21 @@
                 </li>
               </ul>
             </li>
+            <li>
+              <h4> {{ $t('settings.notification_visibility_statuses') }}</h4>
+              <ul class="setting-list">
+                <li>
+                  <BooleanSetting path="notificationVisibility.statuses">
+                    {{ $t('settings.notification_visibility_in_column') }}
+                  </BooleanSetting>
+                </li>
+                <li>
+                  <BooleanSetting path="notificationNative.statuses">
+                    {{ $t('settings.notification_visibility_native_notifications') }}
+                  </BooleanSetting>
+                </li>
+              </ul>
+            </li>
             <li>
               <h4> {{ $t('settings.notification_visibility_likes') }}</h4>
               <ul class="setting-list">