From d95242cab09119541ec6a14428252175a6cb5e54 Mon Sep 17 00:00:00 2001 From: MeiMei <30769358+mei23@users.noreply.github.com> Date: Sun, 15 Dec 2019 03:42:33 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=9F=E3=83=A5=E3=83=BC=E3=83=88/=E3=83=96?= =?UTF-8?q?=E3=83=AD=E3=83=83=E3=82=AF=E3=81=A7=E3=83=9A=E3=83=BC=E3=82=B8?= =?UTF-8?q?=E3=83=B3=E3=82=B0=E3=81=A8=E8=A7=A3=E9=99=A4=E3=81=8C=E3=81=A7?= =?UTF-8?q?=E3=81=8D=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=20(#5610)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- locales/ja-JP.yml | 2 + .../settings/mute-and-block.user.vue | 39 ++++++ .../components/settings/mute-and-block.vue | 130 ++++++++++++++++-- 3 files changed, 157 insertions(+), 14 deletions(-) create mode 100644 src/client/app/common/views/components/settings/mute-and-block.user.vue diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index b1fe0be4d2..e0fb5087af 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -1225,6 +1225,8 @@ common/views/components/mute-and-block.vue: word-mute: "ワードミュート" muted-words: "ミュートされたキーワード" muted-words-description: "スペースで区切るとAND指定になり、改行で区切るとOR指定になります" + unmute-confirm: "このユーザーをミュート解除しますか?" + unblock-confirm: "このユーザーをブロック解除しますか?" save: "保存" common/views/components/password-settings.vue: diff --git a/src/client/app/common/views/components/settings/mute-and-block.user.vue b/src/client/app/common/views/components/settings/mute-and-block.user.vue new file mode 100644 index 0000000000..29ef1f7a67 --- /dev/null +++ b/src/client/app/common/views/components/settings/mute-and-block.user.vue @@ -0,0 +1,39 @@ + + + + + diff --git a/src/client/app/common/views/components/settings/mute-and-block.vue b/src/client/app/common/views/components/settings/mute-and-block.vue index 33b19582b7..8ff5804168 100644 --- a/src/client/app/common/views/components/settings/mute-and-block.vue +++ b/src/client/app/common/views/components/settings/mute-and-block.vue @@ -6,9 +6,13 @@
{{ $t('mute') }}
{{ $t('no-muted-users') }}
-
-

@{{ user | acct }}

+
+ + + +
+ {{ $t('@.load-more') }}
@@ -16,9 +20,13 @@
{{ $t('block') }}
{{ $t('no-blocked-users') }}
-
-

@{{ user | acct }}

+
+ + + +
+ {{ $t('@.load-more') }}
@@ -35,16 +43,25 @@ + + +