From 0c5c8898509e195654f4a42be77c59dbf6713c34 Mon Sep 17 00:00:00 2001 From: Maxim Filippov Date: Wed, 6 Feb 2019 14:21:13 +0300 Subject: [PATCH] Rename "hide_following" to "hide_follows" --- src/components/user_settings/user_settings.js | 6 +++--- src/components/user_settings/user_settings.vue | 4 ++-- src/i18n/de.json | 2 +- src/i18n/en.json | 2 +- src/i18n/ja.json | 2 +- src/i18n/ko.json | 2 +- src/i18n/ru.json | 2 +- src/services/api/api.service.js | 2 +- src/services/entity_normalizer/entity_normalizer.service.js | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/components/user_settings/user_settings.js b/src/components/user_settings/user_settings.js index 64f18373..ef9398f6 100644 --- a/src/components/user_settings/user_settings.js +++ b/src/components/user_settings/user_settings.js @@ -12,7 +12,7 @@ const UserSettings = { newLocked: this.$store.state.users.currentUser.locked, newNoRichText: this.$store.state.users.currentUser.no_rich_text, newDefaultScope: this.$store.state.users.currentUser.default_scope, - hideFollowings: this.$store.state.users.currentUser.hide_followings, + hideFollows: this.$store.state.users.currentUser.hide_follows, hideFollowers: this.$store.state.users.currentUser.hide_followers, followList: null, followImportError: false, @@ -69,7 +69,7 @@ const UserSettings = { /* eslint-disable camelcase */ const default_scope = this.newDefaultScope const no_rich_text = this.newNoRichText - const hide_followings = this.hideFollowings + const hide_follows = this.hideFollows const hide_followers = this.hideFollowers /* eslint-enable camelcase */ this.$store.state.api.backendInteractor @@ -82,7 +82,7 @@ const UserSettings = { /* eslint-disable camelcase */ default_scope, no_rich_text, - hide_followings, + hide_follows, hide_followers /* eslint-enable camelcase */ }}).then((user) => { diff --git a/src/components/user_settings/user_settings.vue b/src/components/user_settings/user_settings.vue index af8a1208..19b7bdbd 100644 --- a/src/components/user_settings/user_settings.vue +++ b/src/components/user_settings/user_settings.vue @@ -30,8 +30,8 @@

- - + +

diff --git a/src/i18n/de.json b/src/i18n/de.json index 82860e9e..59449e33 100644 --- a/src/i18n/de.json +++ b/src/i18n/de.json @@ -155,7 +155,7 @@ "notification_visibility_mentions": "Erwähnungen", "notification_visibility_repeats": "Wiederholungen", "no_rich_text_description": "Rich-Text Formatierungen von allen Beiträgen entfernen", - "hide_followings_description": "Zeige nicht, wem ich folge", + "hide_follows_description": "Zeige nicht, wem ich folge", "hide_followers_description": "Zeige nicht, wer mir folgt", "nsfw_clickthrough": "Aktiviere ausblendbares Overlay für Anhänge, die als NSFW markiert sind", "panelRadius": "Panel", diff --git a/src/i18n/en.json b/src/i18n/en.json index dc10fa7f..ac7cc2a7 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -164,7 +164,7 @@ "notification_visibility_mentions": "Mentions", "notification_visibility_repeats": "Repeats", "no_rich_text_description": "Strip rich text formatting from all posts", - "hide_followings_description": "Don't show who I'm following", + "hide_follows_description": "Don't show who I'm following", "hide_followers_description": "Don't show who's following me", "nsfw_clickthrough": "Enable clickthrough NSFW attachment hiding", "panelRadius": "Panels", diff --git a/src/i18n/ja.json b/src/i18n/ja.json index 37e96f6c..afce03a4 100644 --- a/src/i18n/ja.json +++ b/src/i18n/ja.json @@ -157,7 +157,7 @@ "notification_visibility_mentions": "メンション", "notification_visibility_repeats": "リピート", "no_rich_text_description": "リッチテキストをつかわない", - "hide_followings_description": "フォローしている人を表示しない", + "hide_follows_description": "フォローしている人を表示しない", "hide_followers_description": "フォローしている人を表示しない", "nsfw_clickthrough": "NSFWなファイルをかくす", "panelRadius": "パネル", diff --git a/src/i18n/ko.json b/src/i18n/ko.json index 9f40be51..f9e4dfa3 100644 --- a/src/i18n/ko.json +++ b/src/i18n/ko.json @@ -156,7 +156,7 @@ "notification_visibility_mentions": "멘션", "notification_visibility_repeats": "반복", "no_rich_text_description": "모든 게시물의 서식을 지우기", - "hide_followings_description": "내가 팔로우하는 사람을 표시하지 않음", + "hide_follows_description": "내가 팔로우하는 사람을 표시하지 않음", "hide_followers_description": "나를 따르는 사람을 보여주지 마라.", "nsfw_clickthrough": "NSFW 이미지 \"클릭해서 보이기\"를 활성화", "panelRadius": "패널", diff --git a/src/i18n/ru.json b/src/i18n/ru.json index bf1e319f..e86eaff9 100644 --- a/src/i18n/ru.json +++ b/src/i18n/ru.json @@ -127,7 +127,7 @@ "notification_visibility_mentions": "Упоминания", "notification_visibility_repeats": "Повторы", "no_rich_text_description": "Убрать форматирование из всех постов", - "hide_followings_description": "Не показывать кого я читаю", + "hide_follows_description": "Не показывать кого я читаю", "hide_followers_description": "Не показывать кто читает меня", "nsfw_clickthrough": "Включить скрытие NSFW вложений", "panelRadius": "Панели", diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js index 1d4790a0..d4d52ab1 100644 --- a/src/services/api/api.service.js +++ b/src/services/api/api.service.js @@ -130,7 +130,7 @@ const updateBanner = ({credentials, params}) => { // description const updateProfile = ({credentials, params}) => { // Always include these fields, because they might be empty or false - const fields = ['description', 'locked', 'no_rich_text', 'hide_followings', 'hide_followers'] + const fields = ['description', 'locked', 'no_rich_text', 'hide_follows', 'hide_followers'] let url = PROFILE_UPDATE_URL const form = new FormData() diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js index af774675..bba6b363 100644 --- a/src/services/entity_normalizer/entity_normalizer.service.js +++ b/src/services/entity_normalizer/entity_normalizer.service.js @@ -100,7 +100,7 @@ export const parseUser = (data) => { output.rights = data.rights output.no_rich_text = data.no_rich_text output.default_scope = data.default_scope - output.hide_followings = data.hide_followings + output.hide_follows = data.hide_follows output.hide_followers = data.hide_followers output.background_image = data.background_image // on mastoapi this info is contained in a "relationship"