From 48dc1678c383e09fcb6b542d6f8b59bce8d6dda4 Mon Sep 17 00:00:00 2001 From: Aya Morisawa Date: Fri, 17 Aug 2018 06:03:03 +0900 Subject: [PATCH] Resolve #2276 --- locales/ja.yml | 1 + src/client/app/desktop/views/components/post-form.vue | 2 +- src/client/app/desktop/views/components/settings.vue | 7 +++++++ src/client/app/mobile/views/components/post-form.vue | 2 +- src/client/app/store.ts | 1 + 5 files changed, 11 insertions(+), 2 deletions(-) diff --git a/locales/ja.yml b/locales/ja.yml index 0bb268d7a..888fb08c9 100644 --- a/locales/ja.yml +++ b/locales/ja.yml @@ -707,6 +707,7 @@ desktop/views/components/settings.vue: circle-icons: "円形のアイコンを使用" gradient-window-header: "ウィンドウのタイトルバーにグラデーションを使用" post-form-on-timeline: "タイムライン上部に投稿フォームを表示する" + suggest-recent-hashtags: "最近のハッシュタグを投稿フォームに表示する" show-reply-target: "リプライ先を表示する" show-my-renotes: "自分の行ったRenoteをタイムラインに表示する" show-renoted-my-notes: "自分の投稿のRenoteをタイムラインに表示する" diff --git a/src/client/app/desktop/views/components/post-form.vue b/src/client/app/desktop/views/components/post-form.vue index f504ce3de..ea5114417 100644 --- a/src/client/app/desktop/views/components/post-form.vue +++ b/src/client/app/desktop/views/components/post-form.vue @@ -10,7 +10,7 @@ {{ u | userName }}[x] %i18n:@add-visible-user% -
+
%i18n:@recent-tags%: #{{ tag }}
diff --git a/src/client/app/desktop/views/components/settings.vue b/src/client/app/desktop/views/components/settings.vue index fa21410d3..e249afed8 100644 --- a/src/client/app/desktop/views/components/settings.vue +++ b/src/client/app/desktop/views/components/settings.vue @@ -48,6 +48,7 @@
+ @@ -336,6 +337,12 @@ export default Vue.extend({ value: v }); }, + onChangeSuggestRecentHashtags(v) { + this.$store.dispatch('settings/set', { + key: 'suggestRecentHashtags', + value: v + }); + }, onChangeShowReplyTarget(v) { this.$store.dispatch('settings/set', { key: 'showReplyTarget', diff --git a/src/client/app/mobile/views/components/post-form.vue b/src/client/app/mobile/views/components/post-form.vue index 625fa45ac..702bc4c9e 100644 --- a/src/client/app/mobile/views/components/post-form.vue +++ b/src/client/app/mobile/views/components/post-form.vue @@ -45,7 +45,7 @@ - diff --git a/src/client/app/store.ts b/src/client/app/store.ts index 487b12df8..f85253a28 100644 --- a/src/client/app/store.ts +++ b/src/client/app/store.ts @@ -11,6 +11,7 @@ const defaultSettings = { fetchOnScroll: true, showMaps: true, showPostFormOnTopOfTl: false, + suggestRecentHashtags: true, circleIcons: true, gradientWindowHeader: false, showReplyTarget: true,