diff options
| author | tamaina <tamaina@hotmail.co.jp> | 2019-03-19 17:45:46 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2019-03-19 17:45:46 +0900 |
| commit | 7f7e6d5abaef42dc1522e1a3d13c4e8e1d23be13 (patch) | |
| tree | b750bfd3c86bfb9c03860ffebab3c083fa45d632 /src | |
| parent | Fix #97, Fix #2943 (#4533) (diff) | |
| download | misskey-7f7e6d5abaef42dc1522e1a3d13c4e8e1d23be13.tar.gz misskey-7f7e6d5abaef42dc1522e1a3d13c4e8e1d23be13.tar.bz2 misskey-7f7e6d5abaef42dc1522e1a3d13c4e8e1d23be13.zip | |
「メッセージ」「トーク」「ダイレクト投稿」( Fix #2748 ) (#4515)
* 「メッセージ」「トーク」「ダイレクト投稿」
トーク: 一対一のチャット機能・画面
メッセージ: トークでやり取りする発言
ダイレクト投稿: 自分向けのダイレクト投稿が一覧されるTL
* Fix display of messaging
* :v:
* Update ja-JP.yml
Diffstat (limited to 'src')
4 files changed, 8 insertions, 8 deletions
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 ea94fa1bd7..00cd423cd2 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 51f7e2fe51..1572c40669 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 5bc28947cb..376b402d30 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 1cb4f0a670..1e82ae3d3a 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) }, |