Skip to content

Commit

Permalink
インスタンス情報をデフォルト無効に
Browse files Browse the repository at this point in the history
  • Loading branch information
mei23 committed Aug 4, 2021
1 parent d9de296 commit c1d7fd9
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion locales/en-US.yml
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ common:
use-avatar-reversi-stones: "Use avatar as a stone in reversi"
disable-animated-mfm: "Disable animated texts in a post"
disable-showing-animated-images: "Do not play animated images"
disableShowingInstanceInfo: "Do not display instance information"
showInstanceInfo: "Show instance information"
enableKeyboardShortcutInNote: "Enable keyboard shortcut in post"
suggest-recent-hashtags: "Show recent popular hashtags on the post form"
always-show-nsfw: "Always show NSFW contents"
Expand Down
2 changes: 1 addition & 1 deletion locales/ja-JP.yml
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ common:
use-avatar-reversi-stones: "リバーシの石にアバターを使う"
disable-animated-mfm: "投稿内の動きのあるテキストを無効にする"
disable-showing-animated-images: "アニメーション画像を再生しない"
disableShowingInstanceInfo: "インスタンス情報を表示しない"
showInstanceInfo: "インスタンス情報を表示する"
enableKeyboardShortcutInNote: "投稿でのキーボードショートカットを有効にする"
suggest-recent-hashtags: "最近のハッシュタグを投稿フォームに表示する"
always-show-nsfw: "常に閲覧注意のメディアを表示する"
Expand Down
8 changes: 4 additions & 4 deletions src/client/app/common/views/components/settings/settings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<ui-switch v-model="showReplyTarget">{{ $t('@._settings.show-reply-target') }}</ui-switch>
<ui-switch v-model="disableAnimatedMfm">{{ $t('@._settings.disable-animated-mfm') }}</ui-switch>
<ui-switch v-model="disableShowingAnimatedImages">{{ $t('@._settings.disable-showing-animated-images') }}</ui-switch>
<ui-switch v-model="disableShowingInstanceInfo">{{ $t('@._settings.disableShowingInstanceInfo') }}</ui-switch>
<ui-switch v-model="showInstanceInfo">{{ $t('@._settings.showInstanceInfo') }}</ui-switch>
</section>
<section v-if="$root.isMobile">
<header>{{ $t('@._settings.post-style') }}</header>
Expand Down Expand Up @@ -649,9 +649,9 @@ export default Vue.extend({
set(value) { this.$store.commit('device/set', { key: 'disableShowingAnimatedImages', value }); }
},
disableShowingInstanceInfo: {
get() { return !!this.$store.state.device.disableShowingInstanceInfo; },
set(value) { this.$store.commit('device/set', { key: 'disableShowingInstanceInfo', value }); }
showInstanceInfo: {
get() { return !!this.$store.state.device.showInstanceInfo; },
set(value) { this.$store.commit('device/set', { key: 'showInstanceInfo', value }); }
},
enableKeyboardShortcutInNote: {
Expand Down
2 changes: 1 addition & 1 deletion src/client/app/desktop/views/components/note-detail.vue
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<mk-user-name :user="appearNote.user"/>
</router-link>
<span class="username"><mk-acct :user="appearNote.user"/></span>
<x-instance-info v-if="appearNote.user.instance && !$store.state.device.disableShowingInstanceInfo" :instance="appearNote.user.instance" />
<x-instance-info v-if="appearNote.user.instance && $store.state.device.showInstanceInfo" :instance="appearNote.user.instance" />
</header>
<div class="body">
<p v-if="appearNote.cw != null" class="cw">
Expand Down
2 changes: 1 addition & 1 deletion src/client/app/desktop/views/components/note.vue
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<mk-avatar class="avatar" :user="appearNote.user"/>
<div class="main">
<mk-note-header class="header" :note="appearNote" :mini="narrow" :no-info="detail"/>
<x-instance-info v-if="appearNote.user.instance && !$store.state.device.disableShowingInstanceInfo" :instance="appearNote.user.instance" />
<x-instance-info v-if="appearNote.user.instance && $store.state.device.showInstanceInfo" :instance="appearNote.user.instance" />
<div class="body" v-if="appearNote.deletedAt == null">
<p v-if="appearNote.cw != null" class="cw">
<mfm v-if="appearNote.cw != ''" class="text" :text="appearNote.cw" :author="appearNote.user" :i="$store.state.i" :custom-emojis="appearNote.emojis" :hashtags="appearNote.tags" :basic="!!appearNote.notHaveDecorationMfm" />
Expand Down
2 changes: 1 addition & 1 deletion src/client/app/mobile/views/components/note-detail.vue
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<div>
<router-link class="name" :to="appearNote.user | userPage"><mk-user-name :user="appearNote.user"/></router-link>
<span class="username"><mk-acct :user="appearNote.user"/></span>
<x-instance-info v-if="appearNote.user.instance && !$store.state.device.disableShowingInstanceInfo" :instance="appearNote.user.instance" />
<x-instance-info v-if="appearNote.user.instance && $store.state.device.showInstanceInfo" :instance="appearNote.user.instance" />
</div>
</header>
<div class="body">
Expand Down
2 changes: 1 addition & 1 deletion src/client/app/mobile/views/components/note.vue
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<mk-avatar class="avatar" :user="appearNote.user" v-if="$store.state.device.postStyle != 'smart'"/>
<div class="main">
<mk-note-header class="header" :note="appearNote" :mini="true"/>
<x-instance-info v-if="appearNote.user.instance && !$store.state.device.disableShowingInstanceInfo" :instance="appearNote.user.instance" />
<x-instance-info v-if="appearNote.user.instance && $store.state.device.showInstanceInfo" :instance="appearNote.user.instance" />
<div class="body" v-if="appearNote.deletedAt == null">
<p v-if="appearNote.cw != null" class="cw">
<mfm v-if="appearNote.cw != ''" class="text" :text="appearNote.cw" :author="appearNote.user" :i="$store.state.i" :custom-emojis="appearNote.emojis" :hashtags="appearNote.tags" :basic="!!appearNote.notHaveDecorationMfm"/>
Expand Down
2 changes: 1 addition & 1 deletion src/client/app/store.ts
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ const defaultDeviceSettings = Object.assign({
navbar: 'top',
mobileNotificationPosition: 'bottom',
disableShowingAnimatedImages: true,
disableShowingInstanceInfo: false,
showInstanceInfo: false,
enableKeyboardShortcutInNote: false,
expandUsersPhotos: true,
expandUsersActivity: true,
Expand Down

0 comments on commit c1d7fd9

Please sign in to comment.