diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 0316927952d8d7779511417ad71162fd5ff2277c..d4457b6594a7307e19f7686181c412bb5fab6d95 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -925,12 +925,6 @@ desktop/views/input-dialog.vue: cancel: "ã‚ャンセル" ok: "決定" -desktop/views/components/messaging-room-window.vue: - title: "メッセージ:" - -desktop/views/components/messaging-window.vue: - title: "メッセージ" - desktop/views/components/note-detail.vue: private: "ã“ã®æŠ•ç¨¿ã¯éžå…¬é–‹ã§ã™" deleted: "ã“ã®æŠ•ç¨¿ã¯å‰Šé™¤ã•ã‚Œã¾ã—ãŸ" @@ -1100,7 +1094,7 @@ desktop/views/components/timeline.vue: hybrid: "ソーシャル" global: "ã‚°ãƒãƒ¼ãƒãƒ«" mentions: "ã‚ãªãŸå®›ã¦" - messages: "メッセージ" + messages: "ダイレクト投稿" list: "リスト" hashtag: "ãƒãƒƒã‚·ãƒ¥ã‚¿ã‚°" add-tag-timeline: "ãƒãƒƒã‚·ãƒ¥ã‚¿ã‚°ã‚’è¿½åŠ " @@ -1535,9 +1529,6 @@ desktop/views/pages/user/user.timeline.vue: with-media: "メディア" my-posts: "ç§ã®æŠ•ç¨¿" -desktop/views/widgets/messaging.vue: - title: "メッセージ" - desktop/views/widgets/notifications.vue: title: "通知" @@ -1685,7 +1676,7 @@ mobile/views/pages/home.vue: hybrid: "ソーシャル" global: "ã‚°ãƒãƒ¼ãƒãƒ«" mentions: "ã‚ãªãŸå®›ã¦" - messages: "メッセージ" + messages: "ダイレクト投稿" mobile/views/pages/tag.vue: no-posts-found: "ãƒãƒƒã‚·ãƒ¥ã‚¿ã‚°ã€Œ{q}ã€ãŒä»˜ã‘られãŸæŠ•ç¨¿ã¯è¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚" diff --git a/src/client/app/desktop/views/components/messaging-room-window.vue b/src/client/app/desktop/views/components/messaging-room-window.vue index ea94fa1bd7cd007c40dd2305a5c339e0ce3e3dcc..00cd423cd21cbc6d166a8527aae6c916ff5b9a93 100644 --- a/src/client/app/desktop/views/components/messaging-room-window.vue +++ b/src/client/app/desktop/views/components/messaging-room-window.vue @@ -1,6 +1,6 @@ <template> <mk-window ref="window" width="500px" height="560px" :popout-url="popout" @closed="destroyDom"> - <template #header><fa icon="comments"/> {{ $t('title') }} <mk-user-name :user="user"/></template> + <template #header><fa icon="comments"/> {{ $t('@.messaging') }}: <mk-user-name :user="user"/></template> <x-messaging-room :user="user" :class="$style.content"/> </mk-window> </template> @@ -12,7 +12,7 @@ import { url } from '../../../config'; import getAcct from '../../../../../misc/acct/render'; export default Vue.extend({ - i18n: i18n('desktop/views/components/messaging-room-window.vue'), + i18n: i18n(), components: { XMessagingRoom: () => import('../../../common/views/components/messaging-room.vue').then(m => m.default) }, diff --git a/src/client/app/desktop/views/components/messaging-window.vue b/src/client/app/desktop/views/components/messaging-window.vue index 51f7e2fe518c8eeb4070ea4b3f63f843aa5eb6c4..1572c40669946b1221034bced75fc7ead0d72137 100644 --- a/src/client/app/desktop/views/components/messaging-window.vue +++ b/src/client/app/desktop/views/components/messaging-window.vue @@ -1,6 +1,6 @@ <template> <mk-window ref="window" width="500px" height="560px" @closed="destroyDom"> - <template #header :class="$style.header"><fa icon="comments"/>{{ $t('title') }}</template> + <template #header :class="$style.header"><fa icon="comments"/>{{ $t('@.messaging') }}</template> <x-messaging :class="$style.content" @navigate="navigate"/> </mk-window> </template> @@ -11,7 +11,7 @@ import i18n from '../../../i18n'; import MkMessagingRoomWindow from './messaging-room-window.vue'; export default Vue.extend({ - i18n: i18n('desktop/views/components/messaging-window.vue'), + i18n: i18n(), components: { XMessaging: () => import('../../../common/views/components/messaging.vue').then(m => m.default) }, diff --git a/src/client/app/desktop/views/pages/messaging-room.vue b/src/client/app/desktop/views/pages/messaging-room.vue index 5bc28947cbad04b10ab6855bc28e4a164aaa4eea..376b402d30f4949a5c4d15ebe0f4d02ead89924a 100644 --- a/src/client/app/desktop/views/pages/messaging-room.vue +++ b/src/client/app/desktop/views/pages/messaging-room.vue @@ -12,7 +12,7 @@ import parseAcct from '../../../../../misc/acct/parse'; import getUserName from '../../../../../misc/get-user-name'; export default Vue.extend({ - i18n: i18n('.vue'), + i18n: i18n(), components: { XMessagingRoom: () => import('../../../common/views/components/messaging-room.vue').then(m => m.default) }, @@ -51,7 +51,7 @@ export default Vue.extend({ this.user = user; this.fetching = false; - document.title = `メッセージ: ${getUserName(this.user)}`; + document.title = this.$t('@.messaging') + ': ' + getUserName(this.user); Progress.done(); }); diff --git a/src/client/app/desktop/views/widgets/messaging.vue b/src/client/app/desktop/views/widgets/messaging.vue index 1cb4f0a670088fd5cc3301ab1a2ea2ee25bad070..1e82ae3d3a06fe8435248aa483cb9796c9a01461 100644 --- a/src/client/app/desktop/views/widgets/messaging.vue +++ b/src/client/app/desktop/views/widgets/messaging.vue @@ -1,7 +1,7 @@ <template> <div class="mkw-messaging"> <ui-container :show-header="props.design == 0"> - <template #header><fa icon="comments"/>{{ $t('title') }}</template> + <template #header><fa icon="comments"/>{{ $t('@.messaging') }}</template> <template #func><button @click="add"><fa icon="plus"/></button></template> <x-messaging ref="index" compact @navigate="navigate"/> @@ -21,7 +21,7 @@ export default define({ design: 0 }) }).extend({ - i18n: i18n('desktop/views/widgets/messaging.vue'), + i18n: i18n(''), components: { XMessaging: () => import('../../../common/views/components/messaging.vue').then(m => m.default) },