Skip to content

Commit

Permalink
廃止 削除された投稿を表示し続ける
Browse files Browse the repository at this point in the history
  • Loading branch information
mei23 committed Jan 13, 2020
1 parent c90de0d commit 4e90646
Show file tree
Hide file tree
Showing 8 changed files with 1 addition and 13 deletions.
1 change: 0 additions & 1 deletion locales/cs-CZ.yml
Expand Up @@ -186,7 +186,6 @@ common:
show-my-renotes: "Zobrazit moje renoty v časové ose"
show-renoted-my-notes: "Zobrazit renoty vašich vlastních příspěvků v časové ose"
show-local-renotes: "Zobrazit renoty místních příspěvků v časové ose"
remain-deleted-note: "I nadále zobrazovat odstraněné příspěvky"
sound: "Zvuk"
enable-sounds: "Povolit zvuk"
enable-sounds-desc: "Přehrát zvuk, například při odeslání nebo přijetí příspěvku, či zprávy. Toto nastavení je uloženo v prohlížeči."
Expand Down
1 change: 0 additions & 1 deletion locales/en-US.yml
Expand Up @@ -231,7 +231,6 @@ common:
show-my-renotes: "Show my renotes in the timeline"
show-renoted-my-notes: "Show renotes of your own posts in the timeline"
show-local-renotes: "Show renotes of local posts on the timeline"
remain-deleted-note: "Continue to show deleted notes"
sound: "Sound"
enable-sounds: "Enable sounds"
enable-sounds-desc: "Play a sound when you receive a post/message. This setting is stored in the browser."
Expand Down
1 change: 0 additions & 1 deletion locales/ja-JP.yml
Expand Up @@ -242,7 +242,6 @@ common:
show-my-renotes: "自分の行ったRenoteをタイムラインに表示する"
show-renoted-my-notes: "自分の投稿のRenoteをタイムラインに表示する"
show-local-renotes: "ローカルの投稿のRenoteをタイムラインに表示する"
remain-deleted-note: "削除された投稿を表示し続ける"
sound: "サウンド"
enable-sounds: "サウンドを有効にする"
enable-sounds-desc: "投稿やメッセージを送受信したときなどにサウンドを再生します。この設定はブラウザに記憶されます。"
Expand Down
1 change: 0 additions & 1 deletion locales/ko-KR.yml
Expand Up @@ -186,7 +186,6 @@ common:
show-my-renotes: "내 리노트를 타임라인에 보이기"
show-renoted-my-notes: "내 글이 리노트될 경우 타임라인에 보이기"
show-local-renotes: "로컬 글의 리노트를 타임라인에 보이기"
remain-deleted-note: "삭제된 글을 계속 표시"
sound: "소리"
enable-sounds: "소리 사용"
enable-sounds-desc: "글이나 메시지를 송수신하였을 때 소리를 재생합니다. 이 설정은 브라우저에 저장됩니다."
Expand Down
1 change: 0 additions & 1 deletion locales/zh-CN.yml
Expand Up @@ -186,7 +186,6 @@ common:
show-my-renotes: "在时间线上显示我的Renote"
show-renoted-my-notes: "在时间线上显示我的帖子的Renote"
show-local-renotes: "在时间线上显示本地帖子的Renote"
remain-deleted-note: "继续显示已删除的帖子"
sound: "声音"
enable-sounds: "开启声音"
enable-sounds-desc: "收到帖子/留言时播放声音。 此设置将被存储在浏览器中。"
Expand Down
6 changes: 0 additions & 6 deletions src/client/app/common/views/components/settings/settings.vue
Expand Up @@ -49,7 +49,6 @@
<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="remainDeletedNote" v-if="isAdvanced">{{ $t('@._settings.remain-deleted-note') }}</ui-switch>
</section>
<section v-if="isAdvanced">
<header>{{ $t('@._settings.line-width') }}</header>
Expand Down Expand Up @@ -624,11 +623,6 @@ export default Vue.extend({
set(value) { this.$store.commit('device/set', { key: 'disableShowingAnimatedImages', value }); }
},
remainDeletedNote: {
get() { return this.$store.state.settings.remainDeletedNote; },
set(value) { this.$store.dispatch('settings/set', { key: 'remainDeletedNote', value }); }
},
mobileNotificationPosition: {
get() { return this.$store.state.device.mobileNotificationPosition; },
set(value) { this.$store.commit('device/set', { key: 'mobileNotificationPosition', value }); }
Expand Down
2 changes: 1 addition & 1 deletion src/client/app/desktop/views/components/note.vue
Expand Up @@ -2,7 +2,7 @@
<div
class="note"
:class="{ mini: narrow }"
v-show="(this.$store.state.settings.remainDeletedNote || appearNote.deletedAt == null) && !hideThisNote"
v-show="appearNote.deletedAt == null && !hideThisNote"
:tabindex="appearNote.deletedAt == null ? '-1' : null"
v-hotkey="keymap"
:title="title"
Expand Down
1 change: 0 additions & 1 deletion src/client/app/store.ts
Expand Up @@ -14,7 +14,6 @@ const defaultSettings = {
keepCw: false,
tagTimelines: [],
fetchOnScroll: true,
remainDeletedNote: false,
showPostFormOnTopOfTl: false,
showPostFormOnTopOfTlMobile: false,
suggestRecentHashtags: true,
Expand Down

0 comments on commit 4e90646

Please sign in to comment.