profxadke/misskey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

「メッセージ」「トーク」「ダイレクト投稿」( Fix #2748 ) (#4515)

Browse source 
* 「メッセージ」「トーク」「ダイレクト投稿」
トーク: 一対一のチャット機能・画面
メッセージ: トークでやり取りする発言
ダイレクト投稿: 自分向けのダイレクト投稿が一覧されるTL

* Fix display of messaging

* ✌️

* Update ja-JP.yml
This commit is contained in:
tamaina 2019-03-19 17:45:46 +09:00 • committed by syuilo
parent 87c5a9d9a6
commit 7f7e6d5aba
5 changed files with 10 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/client/app/desktop/views/components/messaging-room-window.vue
View file

@ -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)
},

4
src/client/app/desktop/views/components/messaging-window.vue
View file

@ -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)
},

4
src/client/app/desktop/views/pages/messaging-room.vue
View file

@ -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();
});

4
src/client/app/desktop/views/widgets/messaging.vue
View file

@ -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)
},