summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorこぴなたみぽ <syuilotan@yahoo.co.jp>2017-12-22 10:38:59 +0900
committerこぴなたみぽ <syuilotan@yahoo.co.jp>2017-12-22 10:38:59 +0900
commit2c4d86d8a0fca323b162adb73af60bbf644e7beb (patch)
tree7946062c9ce721d4ee63cd4c5c104ee859ecbcd3
parentUpdate mute.ja.pug (diff)
downloadmisskey-2c4d86d8a0fca323b162adb73af60bbf644e7beb.tar.gz
misskey-2c4d86d8a0fca323b162adb73af60bbf644e7beb.tar.bz2
misskey-2c4d86d8a0fca323b162adb73af60bbf644e7beb.zip
wip
-rw-r--r--locales/en.yml4
-rw-r--r--locales/ja.yml4
-rw-r--r--src/web/app/desktop/tags/settings.tag38
3 files changed, 46 insertions, 0 deletions
diff --git a/locales/en.yml b/locales/en.yml
index dd3ee2a2a2..e559846772 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -346,6 +346,9 @@ desktop:
failed: "Failed to setup. please ensure that the token is correct."
info: "From the next sign in, enter the token that is displayed on the device in addition to the password."
+ mk-mute-setting:
+ no-users: "No muted users"
+
mk-post-form:
post-placeholder: "What's happening?"
reply-placeholder: "Reply to this post..."
@@ -379,6 +382,7 @@ desktop:
mk-settings:
profile: "Profile"
+ mute: "Mute"
drive: "Drive"
security: "Security"
password: "Password"
diff --git a/locales/ja.yml b/locales/ja.yml
index d12eec86d1..70ff8739f3 100644
--- a/locales/ja.yml
+++ b/locales/ja.yml
@@ -346,6 +346,9 @@ desktop:
failed: "設定に失敗しました。トークンに誤りがないかご確認ください。"
info: "次回サインインからは、同様にパスワードに加えてデバイスに表示されているトークンを入力します。"
+ mk-mute-setting:
+ no-users: "ミュートしているユーザーはいません"
+
mk-post-form:
post-placeholder: "いまどうしてる?"
reply-placeholder: "この投稿への返信..."
@@ -379,6 +382,7 @@ desktop:
mk-settings:
profile: "プロフィール"
+ mute: "ミュート"
drive: "ドライブ"
security: "セキュリティ"
password: "パスワード"
diff --git a/src/web/app/desktop/tags/settings.tag b/src/web/app/desktop/tags/settings.tag
index 2f36d9b3ec..457b7e2276 100644
--- a/src/web/app/desktop/tags/settings.tag
+++ b/src/web/app/desktop/tags/settings.tag
@@ -4,6 +4,7 @@
<p class={ active: page == 'web' } onmousedown={ setPage.bind(null, 'web') }>%fa:desktop .fw%Web</p>
<p class={ active: page == 'notification' } onmousedown={ setPage.bind(null, 'notification') }>%fa:R bell .fw%通知</p>
<p class={ active: page == 'drive' } onmousedown={ setPage.bind(null, 'drive') }>%fa:cloud .fw%%i18n:desktop.tags.mk-settings.drive%</p>
+ <p class={ active: page == 'mute' } onmousedown={ setPage.bind(null, 'mute') }>%fa:ban .fw%%i18n:desktop.tags.mk-settings.mute%</p>
<p class={ active: page == 'apps' } onmousedown={ setPage.bind(null, 'apps') }>%fa:puzzle-piece .fw%アプリ</p>
<p class={ active: page == 'twitter' } onmousedown={ setPage.bind(null, 'twitter') }>%fa:B twitter .fw%Twitter</p>
<p class={ active: page == 'security' } onmousedown={ setPage.bind(null, 'security') }>%fa:unlock-alt .fw%%i18n:desktop.tags.mk-settings.security%</p>
@@ -26,6 +27,11 @@
<mk-drive-setting/>
</section>
+ <section class="mute" show={ page == 'mute' }>
+ <h1>%i18n:desktop.tags.mk-settings.mute%</h1>
+ <mk-mute-setting/>
+ </section>
+
<section class="apps" show={ page == 'apps' }>
<h1>アプリケーション</h1>
<mk-authorized-apps/>
@@ -386,3 +392,35 @@
});
</script>
</mk-drive-setting>
+
+<mk-mute-setting>
+ <div class="none ui info" if={ !fetching && users.length == 0 }>
+ <p>%fa:info-circle%%i18n:desktop.tags.mk-mute-setting.no-users%</p>
+ </div>
+ <div class="users" if={ users.length != 0 }>
+ <div each={ user in users }>
+ <p><b>{ user.name }</b> @{ user.username }</p>
+ </div>
+ </div>
+
+ <style>
+ :scope
+ display block
+
+ </style>
+ <script>
+ this.mixin('api');
+
+ this.apps = [];
+ this.fetching = true;
+
+ this.on('mount', () => {
+ this.api('mute/list').then(x => {
+ this.update({
+ fetching: false,
+ users: x.users
+ });
+ });
+ });
+ </script>
+</mk-mute-setting>