161sh/iceshrimp-161sh
1
0
Fork 0
mirror of https://iceshrimp.dev/crimekillz/iceshrimp-161sh.git synced 2024-11-22 20:23:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Better key name

Browse Source
This commit is contained in:
syuilo 2019-02-05 04:09:44 +09:00
parent 70fc92bcda
commit a66be66274
7 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
locales/ja-JP.yml
View File

@ -121,7 +121,7 @@ common:
use-avatar-reversi-stones: "リバーシの石にアバターを使う" use-avatar-reversi-stones: "リバーシの石にアバターを使う"
verified-user: "公式アカウント" verified-user: "公式アカウント"
disable-animated-mfm: "投稿内の動きのあるテキストを無効にする" disable-animated-mfm: "投稿内の動きのあるテキストを無効にする"
do-not-autoplay-animation: "アニメーション画像を再生しない" disable-showing-animated-images: "アニメーション画像を再生しない"
suggest-recent-hashtags: "最近のハッシュタグを投稿フォームに表示する" suggest-recent-hashtags: "最近のハッシュタグを投稿フォームに表示する"
always-show-nsfw: "常に閲覧注意のメディアを表示する" always-show-nsfw: "常に閲覧注意のメディアを表示する"
always-mark-nsfw: "常にメディアを閲覧注意として投稿" always-mark-nsfw: "常にメディアを閲覧注意として投稿"

2
src/client/app/common/views/components/avatar.vue
View File

@ -49,7 +49,7 @@ export default Vue.extend({
}; };
}, },
url(): string { url(): string {
return this.$store.state.device.doNotAutoplayAnimation return this.$store.state.device.disableShowingAnimatedImages
? getStaticImageUrl(this.user.avatarUrl) ? getStaticImageUrl(this.user.avatarUrl)
: this.user.avatarUrl; : this.user.avatarUrl;
}, },

2
src/client/app/common/views/components/emoji.vue
View File

@ -55,7 +55,7 @@ export default Vue.extend({
const customEmoji = this.customEmojis.find(x => x.name == this.name); const customEmoji = this.customEmojis.find(x => x.name == this.name);
if (customEmoji) { if (customEmoji) {
this.customEmoji = customEmoji; this.customEmoji = customEmoji;
this.url = this.$store.state.device.doNotAutoplayAnimation this.url = this.$store.state.device.disableShowingAnimatedImages
? getStaticImageUrl(customEmoji.url) ? getStaticImageUrl(customEmoji.url)
: customEmoji.url; : customEmoji.url;
} else { } else {

2
src/client/app/common/views/components/media-image.vue
View File

@ -38,7 +38,7 @@ export default Vue.extend({
computed: { computed: {
style(): any { style(): any {
let url = `url(${ let url = `url(${
this.$store.state.device.doNotAutoplayAnimation this.$store.state.device.disableShowingAnimatedImages
? getStaticImageUrl(this.image.thumbnailUrl) ? getStaticImageUrl(this.image.thumbnailUrl)
: this.image.thumbnailUrl : this.image.thumbnailUrl
})`; })`;

8
src/client/app/desktop/views/components/settings.vue
View File

@ -117,7 +117,7 @@
<ui-switch v-model="showReplyTarget">{{ $t('show-reply-target') }}</ui-switch> <ui-switch v-model="showReplyTarget">{{ $t('show-reply-target') }}</ui-switch>
<ui-switch v-model="showMaps">{{ $t('show-maps') }}</ui-switch> <ui-switch v-model="showMaps">{{ $t('show-maps') }}</ui-switch>
<ui-switch v-model="disableAnimatedMfm">{{ $t('@.disable-animated-mfm') }}</ui-switch> <ui-switch v-model="disableAnimatedMfm">{{ $t('@.disable-animated-mfm') }}</ui-switch>
<ui-switch v-model="doNotAutoplayAnimation">{{ $t('@.do-not-autoplay-animation') }}</ui-switch> <ui-switch v-model="disableShowingAnimatedImages">{{ $t('@.disable-showing-animated-images') }}</ui-switch>
<ui-switch v-model="remainDeletedNote">{{ $t('remain-deleted-note') }}</ui-switch> <ui-switch v-model="remainDeletedNote">{{ $t('remain-deleted-note') }}</ui-switch>
</section> </section>
<section> <section>
@ -517,9 +517,9 @@ export default Vue.extend({
set(value) { this.$store.dispatch('settings/set', { key: 'disableAnimatedMfm', value }); } set(value) { this.$store.dispatch('settings/set', { key: 'disableAnimatedMfm', value }); }
}, },
doNotAutoplayAnimation: { disableShowingAnimatedImages: {
get() { return this.$store.state.device.doNotAutoplayAnimation; }, get() { return this.$store.state.device.disableShowingAnimatedImages; },
set(value) { this.$store.commit('device/set', { key: 'doNotAutoplayAnimation', value }); } set(value) { this.$store.commit('device/set', { key: 'disableShowingAnimatedImages', value }); }
}, },
remainDeletedNote: { remainDeletedNote: {

8
src/client/app/mobile/views/pages/settings.vue
View File

@ -29,7 +29,7 @@
<ui-switch v-model="useOsDefaultEmojis">{{ $t('@.use-os-default-emojis') }}</ui-switch> <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="iLikeSushi">{{ $t('@.i-like-sushi') }}</ui-switch>
<ui-switch v-model="disableAnimatedMfm">{{ $t('@.disable-animated-mfm') }}</ui-switch> <ui-switch v-model="disableAnimatedMfm">{{ $t('@.disable-animated-mfm') }}</ui-switch>
<ui-switch v-model="doNotAutoplayAnimation">{{ $t('@.do-not-autoplay-animation') }}</ui-switch> <ui-switch v-model="disableShowingAnimatedImages">{{ $t('@.disable-showing-animated-images') }}</ui-switch>
<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="alwaysShowNsfw">{{ $t('@.always-show-nsfw') }} ({{ $t('@.this-setting-is-this-device-only') }})</ui-switch> <ui-switch v-model="alwaysShowNsfw">{{ $t('@.always-show-nsfw') }} ({{ $t('@.this-setting-is-this-device-only') }})</ui-switch>
</section> </section>
@ -314,9 +314,9 @@ export default Vue.extend({
set(value) { this.$store.dispatch('settings/set', { key: 'disableAnimatedMfm', value }); } set(value) { this.$store.dispatch('settings/set', { key: 'disableAnimatedMfm', value }); }
}, },
doNotAutoplayAnimation: { disableShowingAnimatedImages: {
get() { return this.$store.state.device.doNotAutoplayAnimation; }, get() { return this.$store.state.device.disableShowingAnimatedImages; },
set(value) { this.$store.commit('device/set', { key: 'doNotAutoplayAnimation', value }); } set(value) { this.$store.commit('device/set', { key: 'disableShowingAnimatedImages', value }); }
}, },
showReplyTarget: { showReplyTarget: {

2
src/client/app/store.ts
View File

@ -70,7 +70,7 @@ const defaultDeviceSettings = {
deckTemporaryColumn: null, deckTemporaryColumn: null,
deckDefault: false, deckDefault: false,
useOsDefaultEmojis: false, useOsDefaultEmojis: false,
doNotAutoplayAnimation: false disableShowingAnimatedImages: false
}; };
export default (os: MiOS) => new Vuex.Store({ export default (os: MiOS) => new Vuex.Store({