From a1edf4fb4ac8756fe88795f198d197f238899100 Mon Sep 17 00:00:00 2001 From: tamaina Date: Sun, 26 Jul 2020 13:30:36 +0900 Subject: [PATCH] :v: (#6567) Co-authored-by: syuilo --- locales/ja-JP.yml | 21 +++++++++ src/client/components/deck/antenna-column.vue | 47 +++++++++++-------- src/client/components/deck/column.vue | 12 ++--- src/client/components/deck/list-column.vue | 4 +- .../components/deck/notifications-column.vue | 6 +-- src/client/components/deck/widgets-column.vue | 21 ++++++--- 6 files changed, 74 insertions(+), 37 deletions(-) diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 478fe1311..ffd61bfe4 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -104,6 +104,8 @@ unblockConfirm: "ブロック解除しますか？" suspendConfirm: "凍結しますか？" unsuspendConfirm: "解凍しますか？" selectList: "リストを選択" +selectAntenna: "アンテナを選択" +selectWidget: "ウィジェットを選択" customEmojis: "カスタム絵文字" emoji: "絵文字" emojiName: "絵文字名" @@ -535,6 +537,8 @@ enableAll: "全て有効にする" disableAll: "全て無効にする" tokenRequested: "アカウントへのアクセス許可" pluginTokenRequestedDescription: "このプラグインはここで設定した権限を行使できるようになります。" +notificationType: "通知の種類" +edit: "編集" useStarForReactionFallback: "リアクション絵文字が不明な場合、代わりに★を使う" emailConfig: "メールサーバー設定" enableEmail: "メール配信機能を有効化する" @@ -1225,10 +1229,27 @@ _notification: yourFollowRequestAccepted: "フォローリクエストが承認されました" youWereInvitedToGroup: "グループに招待されました" + _types: + all: "すべて" + follow: "フォロー" + mention: "メンション" + reply: "リプライ" + renote: "Renote" + quote: "引用" + reaction: "リアクション" + pollVote: "投票" + receiveFollowRequest: "フォローリクエスト" + _deck: alwaysShowMainColumn: "常にメインカラムを表示" columnAlign: "カラムの寄せ" addColumn: "カラムを追加" + swapLeft: "左に移動" + swapRight: "右に移動" + swapUp: "上に移動" + swapDown: "下に移動" + stackLeft: "左に重ねる" + popRight: "右に出す" _columns: widgets: "ウィジェット" diff --git a/src/client/components/deck/antenna-column.vue b/src/client/components/deck/antenna-column.vue index 83fe14f2c..dd38a087e 100644 --- a/src/client/components/deck/antenna-column.vue +++ b/src/client/components/deck/antenna-column.vue @@ -4,7 +4,7 @@ {{ column.name }} - + @@ -33,7 +33,6 @@ export default Vue.extend({ data() { return { - menu: null, faSatellite }; }, @@ -47,28 +46,36 @@ export default Vue.extend({ created() { this.menu = [{ icon: faCog, - text: this.$t('antenna'), - action: async () => { - const antennas = await this.$root.api('antennas/list'); - this.$root.dialog({ - title: this.$t('antenna'), - type: null, - select: { - items: antennas.map(x => ({ - value: x, text: x.name - })) - }, - showCancelButton: true - }).then(({ canceled, result: antenna }) => { - if (canceled) return; - this.column.antennaId = antenna.id; - this.$store.commit('deviceUser/updateDeckColumn', this.column); - }); - } + text: this.$t('selectAntenna'), + action: this.setAntenna }]; }, + mounted() { + if (this.column.antennaId == null) { + this.setAntenna(); + } + }, + methods: { + async setAntenna() { + const antennas = await this.$root.api('antennas/list'); + const { canceled, result: antenna } = await this.$root.dialog({ + title: this.$t('selectAntenna'), + type: null, + select: { + items: antennas.map(x => ({ + value: x, text: x.name + })), + default: this.column.antennaId + }, + showCancelButton: true + }); + if (canceled) return; + Vue.set(this.column, 'antennaId', antenna.id); + this.$store.commit('deviceUser/updateDeckColumn', this.column); + }, + focus() { (this.$refs.timeline as any).focus(); } diff --git a/src/client/components/deck/column.vue b/src/client/components/deck/column.vue index f7620e574..61b7ac9c6 100644 --- a/src/client/components/deck/column.vue +++ b/src/client/components/deck/column.vue @@ -150,37 +150,37 @@ export default Vue.extend({ } }, null, { icon: faArrowLeft, - text: this.$t('swap-left'), + text: this.$t('_deck.swapLeft'), action: () => { this.$store.commit('deviceUser/swapLeftDeckColumn', this.column.id); } }, { icon: faArrowRight, - text: this.$t('swap-right'), + text: this.$t('_deck.swapRight'), action: () => { this.$store.commit('deviceUser/swapRightDeckColumn', this.column.id); } }, this.isStacked ? { icon: faArrowUp, - text: this.$t('swap-up'), + text: this.$t('_deck.swapUp'), action: () => { this.$store.commit('deviceUser/swapUpDeckColumn', this.column.id); } } : undefined, this.isStacked ? { icon: faArrowDown, - text: this.$t('swap-down'), + text: this.$t('_deck.swapDown'), action: () => { this.$store.commit('deviceUser/swapDownDeckColumn', this.column.id); } } : undefined, null, { icon: faWindowRestore, - text: this.$t('stack-left'), + text: this.$t('_deck.stackLeft'), action: () => { this.$store.commit('deviceUser/stackLeftDeckColumn', this.column.id); } }, this.isStacked ? { icon: faWindowMaximize, - text: this.$t('pop-right'), + text: this.$t('_deck.popRight'), action: () => { this.$store.commit('deviceUser/popRightDeckColumn', this.column.id); } diff --git a/src/client/components/deck/list-column.vue b/src/client/components/deck/list-column.vue index a3576e8d6..a6e50802e 100644 --- a/src/client/components/deck/list-column.vue +++ b/src/client/components/deck/list-column.vue @@ -46,7 +46,7 @@ export default Vue.extend({ created() { this.menu = [{ icon: faCog, - text: this.$t('list'), + text: this.$t('selectList'), action: this.setList }]; }, @@ -61,7 +61,7 @@ export default Vue.extend({ async setList() { const lists = await this.$root.api('users/lists/list'); const { canceled, result: list } = await this.$root.dialog({ - title: this.$t('list'), + title: this.$t('selectList'), type: null, select: { items: lists.map(x => ({ diff --git a/src/client/components/deck/notifications-column.vue b/src/client/components/deck/notifications-column.vue index 58873aa13..331cb9207 100644 --- a/src/client/components/deck/notifications-column.vue +++ b/src/client/components/deck/notifications-column.vue @@ -45,14 +45,14 @@ export default Vue.extend({ this.menu = [{ icon: faCog, - text: this.$t('@.notification-type'), + text: this.$t('notificationType'), action: () => { this.$root.dialog({ - title: this.$t('@.notification-type'), + title: this.$t('notificationType'), type: null, select: { items: ['all', 'follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'pollVote', 'receiveFollowRequest'].map(x => ({ - value: x, text: this.$t('@.notification-types.' + x) + value: x, text: this.$t(`_notification._types.${x}`) })) default: this.column.notificationType, }, diff --git a/src/client/components/deck/widgets-column.vue b/src/client/components/deck/widgets-column.vue index 417027a8e..31d1e3d53 100644 --- a/src/client/components/deck/widgets-column.vue +++ b/src/client/components/deck/widgets-column.vue @@ -5,9 +5,12 @@