diff options
| author | Aya Morisawa <AyaMorisawa4869@gmail.com> | 2018-12-05 18:44:57 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-05 18:44:57 +0900 |
| commit | dc8f4c8d6a255c460464729e9cf1d420e40b8808 (patch) | |
| tree | a7f7c16bc97e095271bf045e2b088541edb27c54 | |
| parent | [MFM] Add italic syntax (diff) | |
| download | misskey-dc8f4c8d6a255c460464729e9cf1d420e40b8808.tar.gz misskey-dc8f4c8d6a255c460464729e9cf1d420e40b8808.tar.bz2 misskey-dc8f4c8d6a255c460464729e9cf1d420e40b8808.zip | |
Fix #3341 (#3502)
| -rw-r--r-- | locales/ja-JP.yml | 2 | ||||
| -rw-r--r-- | src/client/app/desktop/views/components/settings.vue | 2 | ||||
| -rw-r--r-- | src/client/app/mobile/views/pages/settings.vue | 6 |
3 files changed, 8 insertions, 2 deletions
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index f975527d66..1f7abd0d3f 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -121,6 +121,7 @@ common: use-contrast-reversi-stones: "リバーシのアイコンにコントラストを付ける" verified-user: "公式アカウント" disable-animated-mfm: "投稿内の動きのあるテキストを無効にする" + suggest-recent-hashtags: "最近のハッシュタグを投稿フォームに表示する" always-show-nsfw: "常に閲覧注意のメディアを表示する" always-mark-nsfw: "常にメディアを閲覧注意として投稿" show-full-acct: "ユーザー名のホストを省略しない" @@ -853,7 +854,6 @@ desktop/views/components/settings.vue: circle-icons: "円形のアイコンを使用" contrasted-acct: "ユーザー名にコントラストを付ける" post-form-on-timeline: "タイムライン上部に投稿フォームを表示する" - suggest-recent-hashtags: "最近のハッシュタグを投稿フォームに表示する" show-clock-on-header: "右上に時計を表示する" show-reply-target: "リプライ先を表示する" timeline: "タイムライン" diff --git a/src/client/app/desktop/views/components/settings.vue b/src/client/app/desktop/views/components/settings.vue index 9cb28eb860..4b2345fb26 100644 --- a/src/client/app/desktop/views/components/settings.vue +++ b/src/client/app/desktop/views/components/settings.vue @@ -112,7 +112,7 @@ <ui-switch v-model="iLikeSushi">{{ $t('@.i-like-sushi') }}</ui-switch> </section> <section> - <ui-switch v-model="suggestRecentHashtags">{{ $t('suggest-recent-hashtags') }}</ui-switch> + <ui-switch v-model="suggestRecentHashtags">{{ $t('@.suggest-recent-hashtags') }}</ui-switch> <ui-switch v-model="showClockOnHeader">{{ $t('show-clock-on-header') }}</ui-switch> <ui-switch v-model="alwaysShowNsfw">{{ $t('@.always-show-nsfw') }}</ui-switch> <ui-switch v-model="showReplyTarget">{{ $t('show-reply-target') }}</ui-switch> diff --git a/src/client/app/mobile/views/pages/settings.vue b/src/client/app/mobile/views/pages/settings.vue index 3e048a1989..b66ef69c5c 100644 --- a/src/client/app/mobile/views/pages/settings.vue +++ b/src/client/app/mobile/views/pages/settings.vue @@ -27,6 +27,7 @@ <ui-switch v-model="useOsDefaultEmojis">{{ $t('@.use-os-default-emojis') }}</ui-switch> <ui-switch v-model="iLikeSushi">{{ $t('@.i-like-sushi') }}</ui-switch> <ui-switch v-model="disableAnimatedMfm">{{ $t('@.disable-animated-mfm') }}</ui-switch> + <ui-switch v-model="suggestRecentHashtags">{{ $t('@.suggest-recent-hashtags') }}</ui-switch> <ui-switch v-model="alwaysShowNsfw">{{ $t('@.always-show-nsfw') }} ({{ $t('@.this-setting-is-this-device-only') }})</ui-switch> </section> @@ -201,6 +202,11 @@ export default Vue.extend({ set(value) { this.$store.commit('device/set', { key: 'reduceMotion', value }); } }, + suggestRecentHashtags: { + get() { return this.$store.state.settings.suggestRecentHashtags; }, + set(value) { this.$store.commit('device/set', { key: 'suggestRecentHashtags', value }); } + }, + alwaysShowNsfw: { get() { return this.$store.state.device.alwaysShowNsfw; }, set(value) { this.$store.commit('device/set', { key: 'alwaysShowNsfw', value }); } |