From dd39d6ea37443512a6c62c3e5fcbeb75ddf557a8 Mon Sep 17 00:00:00 2001 From: syuilo Date: Tue, 5 Feb 2019 04:09:44 +0900 Subject: [PATCH] Better key name --- locales/ja-JP.yml | 2 +- src/client/app/common/views/components/avatar.vue | 2 +- src/client/app/common/views/components/emoji.vue | 2 +- src/client/app/common/views/components/media-image.vue | 2 +- src/client/app/desktop/views/components/settings.vue | 8 ++++---- src/client/app/mobile/views/pages/settings.vue | 8 ++++---- src/client/app/store.ts | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 4064f3f352..f1517bf0c1 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -121,7 +121,7 @@ common: use-avatar-reversi-stones: "リバーシの石にアバターを使う" verified-user: "公式アカウント" disable-animated-mfm: "投稿内の動きのあるテキストを無効にする" - do-not-autoplay-animation: "アニメーション画像を再生しない" + disable-showing-animated-images: "アニメーション画像を再生しない" suggest-recent-hashtags: "最近のハッシュタグを投稿フォームに表示する" always-show-nsfw: "常に閲覧注意のメディアを表示する" always-mark-nsfw: "常にメディアを閲覧注意として投稿" diff --git a/src/client/app/common/views/components/avatar.vue b/src/client/app/common/views/components/avatar.vue index 205b4a6d79..0c6cd7048c 100644 --- a/src/client/app/common/views/components/avatar.vue +++ b/src/client/app/common/views/components/avatar.vue @@ -49,7 +49,7 @@ export default Vue.extend({ }; }, url(): string { - return this.$store.state.device.doNotAutoplayAnimation + return this.$store.state.device.disableShowingAnimatedImages ? getStaticImageUrl(this.user.avatarUrl) : this.user.avatarUrl; }, diff --git a/src/client/app/common/views/components/emoji.vue b/src/client/app/common/views/components/emoji.vue index b791dcab6a..b4618a8d85 100644 --- a/src/client/app/common/views/components/emoji.vue +++ b/src/client/app/common/views/components/emoji.vue @@ -55,7 +55,7 @@ export default Vue.extend({ const customEmoji = this.customEmojis.find(x => x.name == this.name); if (customEmoji) { this.customEmoji = customEmoji; - this.url = this.$store.state.device.doNotAutoplayAnimation + this.url = this.$store.state.device.disableShowingAnimatedImages ? getStaticImageUrl(customEmoji.url) : customEmoji.url; } else { diff --git a/src/client/app/common/views/components/media-image.vue b/src/client/app/common/views/components/media-image.vue index 4433ec2afc..4a99b953ef 100644 --- a/src/client/app/common/views/components/media-image.vue +++ b/src/client/app/common/views/components/media-image.vue @@ -38,7 +38,7 @@ export default Vue.extend({ computed: { style(): any { let url = `url(${ - this.$store.state.device.doNotAutoplayAnimation + this.$store.state.device.disableShowingAnimatedImages ? getStaticImageUrl(this.image.thumbnailUrl) : this.image.thumbnailUrl })`; diff --git a/src/client/app/desktop/views/components/settings.vue b/src/client/app/desktop/views/components/settings.vue index be0244ee00..76d99ee3c0 100644 --- a/src/client/app/desktop/views/components/settings.vue +++ b/src/client/app/desktop/views/components/settings.vue @@ -117,7 +117,7 @@ {{ $t('show-reply-target') }} {{ $t('show-maps') }} {{ $t('@.disable-animated-mfm') }} - {{ $t('@.do-not-autoplay-animation') }} + {{ $t('@.disable-showing-animated-images') }} {{ $t('remain-deleted-note') }}
@@ -517,9 +517,9 @@ export default Vue.extend({ set(value) { this.$store.dispatch('settings/set', { key: 'disableAnimatedMfm', value }); } }, - doNotAutoplayAnimation: { - get() { return this.$store.state.device.doNotAutoplayAnimation; }, - set(value) { this.$store.commit('device/set', { key: 'doNotAutoplayAnimation', value }); } + disableShowingAnimatedImages: { + get() { return this.$store.state.device.disableShowingAnimatedImages; }, + set(value) { this.$store.commit('device/set', { key: 'disableShowingAnimatedImages', value }); } }, remainDeletedNote: { diff --git a/src/client/app/mobile/views/pages/settings.vue b/src/client/app/mobile/views/pages/settings.vue index 8c01b6ac26..e8b51d1271 100644 --- a/src/client/app/mobile/views/pages/settings.vue +++ b/src/client/app/mobile/views/pages/settings.vue @@ -29,7 +29,7 @@ {{ $t('@.use-os-default-emojis') }} {{ $t('@.i-like-sushi') }} {{ $t('@.disable-animated-mfm') }} - {{ $t('@.do-not-autoplay-animation') }} + {{ $t('@.disable-showing-animated-images') }} {{ $t('@.suggest-recent-hashtags') }} {{ $t('@.always-show-nsfw') }} ({{ $t('@.this-setting-is-this-device-only') }})
@@ -314,9 +314,9 @@ export default Vue.extend({ set(value) { this.$store.dispatch('settings/set', { key: 'disableAnimatedMfm', value }); } }, - doNotAutoplayAnimation: { - get() { return this.$store.state.device.doNotAutoplayAnimation; }, - set(value) { this.$store.commit('device/set', { key: 'doNotAutoplayAnimation', value }); } + disableShowingAnimatedImages: { + get() { return this.$store.state.device.disableShowingAnimatedImages; }, + set(value) { this.$store.commit('device/set', { key: 'disableShowingAnimatedImages', value }); } }, showReplyTarget: { diff --git a/src/client/app/store.ts b/src/client/app/store.ts index ef2e57170e..d0f61f8bc1 100644 --- a/src/client/app/store.ts +++ b/src/client/app/store.ts @@ -70,7 +70,7 @@ const defaultDeviceSettings = { deckTemporaryColumn: null, deckDefault: false, useOsDefaultEmojis: false, - doNotAutoplayAnimation: false + disableShowingAnimatedImages: false }; export default (os: MiOS) => new Vuex.Store({