From f7069dcd18d72b52408a6bd80ad8f14492163e19 Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 31 Oct 2018 11:16:13 +0900 Subject: [PATCH] =?UTF-8?q?=E8=89=AF=E3=81=84=E6=84=9F=E3=81=98=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- locales/ja-JP.yml | 13 +-- .../app/common/views/components/index.ts | 2 + .../views/components/mute-and-block.vue | 56 +++++++++++++ .../views/components/settings.blocking.vue | 31 ------- .../views/components/settings.mute.vue | 31 ------- .../app/desktop/views/components/settings.vue | 23 +----- .../app/mobile/views/pages/settings.vue | 2 + src/models/blocking.ts | 41 ++++++++++ src/models/mute.ts | 41 ++++++++++ src/server/api/endpoints/blocking/list.ts | 67 ++++++++------- src/server/api/endpoints/mute/list.ts | 82 ++++++++----------- 11 files changed, 225 insertions(+), 164 deletions(-) create mode 100644 src/client/app/common/views/components/mute-and-block.vue delete mode 100644 src/client/app/desktop/views/components/settings.blocking.vue delete mode 100644 src/client/app/desktop/views/components/settings.mute.vue diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 69fde53f5..bb3a151ad 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -832,7 +832,7 @@ desktop/views/components/settings.vue: profile: "プロフィール" notification: "通知" apps: "アプリ" - mute: "ミュート" + mute-and-block: "ミュート/ブロック" blocking: "ブロック" security: "セキュリティ" signin: "サインイン履歴" @@ -974,11 +974,12 @@ common/views/components/drive-settings.vue: in-use: "使用中" stats: "統計" -desktop/views/components/settings.mute.vue: - no-users: "ミュートしているユーザーはいません" - -desktop/views/components/settings.blocking.vue: - no-users: "ブロックしているユーザーはいません" +common/views/components/mute-and-block.vue: + mute-and-block: "ミュートとブロック" + mute: "ミュート" + block: "ブロック" + no-muted-users: "ミュートしているユーザーはいません" + no-blocked-users: "ブロックしているユーザーはいません" desktop/views/components/settings.password.vue: reset: "パスワードを変更する" diff --git a/src/client/app/common/views/components/index.ts b/src/client/app/common/views/components/index.ts index 33216e459..2f2217f8d 100644 --- a/src/client/app/common/views/components/index.ts +++ b/src/client/app/common/views/components/index.ts @@ -1,5 +1,6 @@ import Vue from 'vue'; +import muteAndBlock from './mute-and-block.vue'; import error from './error.vue'; import apiSettings from './api-settings.vue'; import driveSettings from './drive-settings.vue'; @@ -50,6 +51,7 @@ import uiInfo from './ui/info.vue'; import formButton from './ui/form/button.vue'; import formRadio from './ui/form/radio.vue'; +Vue.component('mk-mute-and-block', muteAndBlock); Vue.component('mk-error', error); Vue.component('mk-api-settings', apiSettings); Vue.component('mk-drive-settings', driveSettings); diff --git a/src/client/app/common/views/components/mute-and-block.vue b/src/client/app/common/views/components/mute-and-block.vue new file mode 100644 index 000000000..b244f975b --- /dev/null +++ b/src/client/app/common/views/components/mute-and-block.vue @@ -0,0 +1,56 @@ + + + diff --git a/src/client/app/desktop/views/components/settings.blocking.vue b/src/client/app/desktop/views/components/settings.blocking.vue deleted file mode 100644 index 43e4bf920..000000000 --- a/src/client/app/desktop/views/components/settings.blocking.vue +++ /dev/null @@ -1,31 +0,0 @@ - - - diff --git a/src/client/app/desktop/views/components/settings.mute.vue b/src/client/app/desktop/views/components/settings.mute.vue deleted file mode 100644 index 792afa923..000000000 --- a/src/client/app/desktop/views/components/settings.mute.vue +++ /dev/null @@ -1,31 +0,0 @@ - - - diff --git a/src/client/app/desktop/views/components/settings.vue b/src/client/app/desktop/views/components/settings.vue index e77320bef..74cedf9ec 100644 --- a/src/client/app/desktop/views/components/settings.vue +++ b/src/client/app/desktop/views/components/settings.vue @@ -7,8 +7,7 @@

%fa:R bell .fw%%i18n:@notification%

%fa:cloud .fw%%i18n:common.drive%

%fa:hashtag .fw%%i18n:@tags%

-

%fa:ban .fw%%i18n:@mute%

-

%fa:ban .fw%%i18n:@blocking%

+

%fa:ban .fw%%i18n:@mute-and-block%

%fa:puzzle-piece .fw%%i18n:@apps%

%fa:unlock-alt .fw%%i18n:@security%

%fa:key .fw%API

@@ -201,19 +200,9 @@ - -
%fa:ban% %i18n:@mute%
-
- -
-
- - -
%fa:ban% %i18n:@blocking%
-
- -
-
+
+ +
%fa:puzzle-piece% %i18n:@apps%
@@ -297,8 +286,6 @@