* 「メッセージ」「トーク」「ダイレクト投稿」
トーク: 一対一のチャット機能・画面
メッセージ: トークでやり取りする発言
ダイレクト投稿: 自分向けのダイレクト投稿が一覧されるTL
* Fix display of messaging
* ✌️
* Update ja-JP.yml
This commit is contained in:
parent
87c5a9d9a6
commit
7f7e6d5aba
|
@ -925,12 +925,6 @@ desktop/views/input-dialog.vue:
|
||||||
cancel: "キャンセル"
|
cancel: "キャンセル"
|
||||||
ok: "決定"
|
ok: "決定"
|
||||||
|
|
||||||
desktop/views/components/messaging-room-window.vue:
|
|
||||||
title: "メッセージ:"
|
|
||||||
|
|
||||||
desktop/views/components/messaging-window.vue:
|
|
||||||
title: "メッセージ"
|
|
||||||
|
|
||||||
desktop/views/components/note-detail.vue:
|
desktop/views/components/note-detail.vue:
|
||||||
private: "この投稿は非公開です"
|
private: "この投稿は非公開です"
|
||||||
deleted: "この投稿は削除されました"
|
deleted: "この投稿は削除されました"
|
||||||
|
@ -1100,7 +1094,7 @@ desktop/views/components/timeline.vue:
|
||||||
hybrid: "ソーシャル"
|
hybrid: "ソーシャル"
|
||||||
global: "グローバル"
|
global: "グローバル"
|
||||||
mentions: "あなた宛て"
|
mentions: "あなた宛て"
|
||||||
messages: "メッセージ"
|
messages: "ダイレクト投稿"
|
||||||
list: "リスト"
|
list: "リスト"
|
||||||
hashtag: "ハッシュタグ"
|
hashtag: "ハッシュタグ"
|
||||||
add-tag-timeline: "ハッシュタグを追加"
|
add-tag-timeline: "ハッシュタグを追加"
|
||||||
|
@ -1535,9 +1529,6 @@ desktop/views/pages/user/user.timeline.vue:
|
||||||
with-media: "メディア"
|
with-media: "メディア"
|
||||||
my-posts: "私の投稿"
|
my-posts: "私の投稿"
|
||||||
|
|
||||||
desktop/views/widgets/messaging.vue:
|
|
||||||
title: "メッセージ"
|
|
||||||
|
|
||||||
desktop/views/widgets/notifications.vue:
|
desktop/views/widgets/notifications.vue:
|
||||||
title: "通知"
|
title: "通知"
|
||||||
|
|
||||||
|
@ -1685,7 +1676,7 @@ mobile/views/pages/home.vue:
|
||||||
hybrid: "ソーシャル"
|
hybrid: "ソーシャル"
|
||||||
global: "グローバル"
|
global: "グローバル"
|
||||||
mentions: "あなた宛て"
|
mentions: "あなた宛て"
|
||||||
messages: "メッセージ"
|
messages: "ダイレクト投稿"
|
||||||
|
|
||||||
mobile/views/pages/tag.vue:
|
mobile/views/pages/tag.vue:
|
||||||
no-posts-found: "ハッシュタグ「{q}」が付けられた投稿は見つかりませんでした。"
|
no-posts-found: "ハッシュタグ「{q}」が付けられた投稿は見つかりませんでした。"
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
<template>
|
<template>
|
||||||
<mk-window ref="window" width="500px" height="560px" :popout-url="popout" @closed="destroyDom">
|
<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"/>
|
<x-messaging-room :user="user" :class="$style.content"/>
|
||||||
</mk-window>
|
</mk-window>
|
||||||
</template>
|
</template>
|
||||||
|
@ -12,7 +12,7 @@ import { url } from '../../../config';
|
||||||
import getAcct from '../../../../../misc/acct/render';
|
import getAcct from '../../../../../misc/acct/render';
|
||||||
|
|
||||||
export default Vue.extend({
|
export default Vue.extend({
|
||||||
i18n: i18n('desktop/views/components/messaging-room-window.vue'),
|
i18n: i18n(),
|
||||||
components: {
|
components: {
|
||||||
XMessagingRoom: () => import('../../../common/views/components/messaging-room.vue').then(m => m.default)
|
XMessagingRoom: () => import('../../../common/views/components/messaging-room.vue').then(m => m.default)
|
||||||
},
|
},
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
<template>
|
<template>
|
||||||
<mk-window ref="window" width="500px" height="560px" @closed="destroyDom">
|
<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"/>
|
<x-messaging :class="$style.content" @navigate="navigate"/>
|
||||||
</mk-window>
|
</mk-window>
|
||||||
</template>
|
</template>
|
||||||
|
@ -11,7 +11,7 @@ import i18n from '../../../i18n';
|
||||||
import MkMessagingRoomWindow from './messaging-room-window.vue';
|
import MkMessagingRoomWindow from './messaging-room-window.vue';
|
||||||
|
|
||||||
export default Vue.extend({
|
export default Vue.extend({
|
||||||
i18n: i18n('desktop/views/components/messaging-window.vue'),
|
i18n: i18n(),
|
||||||
components: {
|
components: {
|
||||||
XMessaging: () => import('../../../common/views/components/messaging.vue').then(m => m.default)
|
XMessaging: () => import('../../../common/views/components/messaging.vue').then(m => m.default)
|
||||||
},
|
},
|
||||||
|
|
|
@ -12,7 +12,7 @@ import parseAcct from '../../../../../misc/acct/parse';
|
||||||
import getUserName from '../../../../../misc/get-user-name';
|
import getUserName from '../../../../../misc/get-user-name';
|
||||||
|
|
||||||
export default Vue.extend({
|
export default Vue.extend({
|
||||||
i18n: i18n('.vue'),
|
i18n: i18n(),
|
||||||
components: {
|
components: {
|
||||||
XMessagingRoom: () => import('../../../common/views/components/messaging-room.vue').then(m => m.default)
|
XMessagingRoom: () => import('../../../common/views/components/messaging-room.vue').then(m => m.default)
|
||||||
},
|
},
|
||||||
|
@ -51,7 +51,7 @@ export default Vue.extend({
|
||||||
this.user = user;
|
this.user = user;
|
||||||
this.fetching = false;
|
this.fetching = false;
|
||||||
|
|
||||||
document.title = `メッセージ: ${getUserName(this.user)}`;
|
document.title = this.$t('@.messaging') + ': ' + getUserName(this.user);
|
||||||
|
|
||||||
Progress.done();
|
Progress.done();
|
||||||
});
|
});
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
<template>
|
<template>
|
||||||
<div class="mkw-messaging">
|
<div class="mkw-messaging">
|
||||||
<ui-container :show-header="props.design == 0">
|
<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>
|
<template #func><button @click="add"><fa icon="plus"/></button></template>
|
||||||
|
|
||||||
<x-messaging ref="index" compact @navigate="navigate"/>
|
<x-messaging ref="index" compact @navigate="navigate"/>
|
||||||
|
@ -21,7 +21,7 @@ export default define({
|
||||||
design: 0
|
design: 0
|
||||||
})
|
})
|
||||||
}).extend({
|
}).extend({
|
||||||
i18n: i18n('desktop/views/widgets/messaging.vue'),
|
i18n: i18n(''),
|
||||||
components: {
|
components: {
|
||||||
XMessaging: () => import('../../../common/views/components/messaging.vue').then(m => m.default)
|
XMessaging: () => import('../../../common/views/components/messaging.vue').then(m => m.default)
|
||||||
},
|
},
|
||||||
|
|
Loading…
Reference in New Issue