worldcone/cherrypick
2
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fix: i18n type, missing component, change icon

Browse source
This commit is contained in:
NoriDev 2023-05-17 17:11:04 +09:00
parent ad9f966233
commit f9d3be4ff1
3 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
packages/frontend/src/pages/messaging/messaging-room.form.vue
View file

@ -43,6 +43,7 @@ import { i18n } from '@/i18n';
//import { Autocomplete } from '@/scripts/autocomplete';
import { uploadFile } from '@/scripts/upload';
import { miLocalStorage } from '@/local-storage';
import MkLoading from "@/components/global/MkLoading.vue";
const props = defineProps<{
user?: Misskey.entities.UserDetailed | null;

14
packages/frontend/src/pages/messaging/messaging-room.message.vue
View file

@ -3,7 +3,7 @@
<MkAvatar class="avatar" :user="message.user" indicator link preview/>
<div class="content">
<div class="balloon" :class="{ noText: message.text == null }">
<button v-if="isMe" class="delete-button" :title="i18n.delete" @click="del">
<button v-if="isMe" class="delete-button" :title="i18n.ts.delete" @click="del">
<img src="/client-assets/remove.png" alt="Delete"/>
</button>
<div v-if="!message.isDeleted" class="content">
@ -16,17 +16,17 @@
</div>
</div>
<div v-else class="content">
<p class="is-deleted">{{ i18n.deleted }}</p>
<p class="is-deleted">{{ i18n.ts.deleted }}</p>
</div>
</div>
<div></div>
<MkUrlPreview v-for="url in urls" :key="url" :url="url" style="margin: 8px 0;"/>
<footer>
<template v-if="isGroup">
<span v-if="message.reads.length > 0" class="read">{{ i18n.messageRead }} {{ message.reads.length }}</span>
<span v-if="message.reads.length > 0" class="read">{{ i18n.ts.messageRead }} {{ message.reads.length }}</span>
</template>
<template v-else>
<span v-if="isMe && message.isRead" class="read">{{ i18n.messageRead }}</span>
<span v-if="isMe && message.isRead" class="read">{{ i18n.ts.messageRead }}</span>
</template>
<MkTime :time="message.createdAt"/>
<template v-if="message.is_edited"><i class="ti ti-pencil"></i></template>
@ -39,9 +39,11 @@
import { } from 'vue';
import * as mfm from 'mfm-js';
import * as Misskey from 'misskey-js';
import { extractUrlFromMfm } from '@/scripts/extract-url-from-mfm';
import MkUrlPreview from '@/components/MkUrlPreview.vue';
import * as os from '@/os';
import MkUrlPreview from '@/components/MkUrlPreview.vue';
import MkAvatar from "@/components/global/MkAvatar.vue";
import MkTime from "@/components/global/MkTime.vue";
import { extractUrlFromMfm } from '@/scripts/extract-url-from-mfm';
import { i18n } from '@/i18n';
import { $i } from '@/account';

5
packages/frontend/src/pages/messaging/messaging-room.vue
View file

@ -43,7 +43,7 @@
<Transition :name="animation ? 'fade' : ''">
<div v-show="showIndicator" :class="$style['new-message']">
<button class="_buttonPrimary" @click="onIndicatorClick" :class="$style['new-message-button']">
<i class="fas ti-fw fa-arrow-circle-down" :class="$style['new-message-icon']"></i>{{ i18n.ts.newMessageExists }}
<i class="ti ti-circle-arrow-down-filled" :class="$style['new-message-icon']"></i>{{ i18n.ts.newMessageExists }}
</button>
</div>
</Transition>
@ -69,6 +69,9 @@ import { i18n } from '@/i18n';
import { $i } from '@/account';
import { defaultStore } from '@/store';
import { definePageMetadata } from '@/scripts/page-metadata';
import MkStickyContainer from "@/components/global/MkStickyContainer.vue";
import MkPageHeader from "@/components/global/MkPageHeader.vue";
import MkEllipsis from "@/components/global/MkEllipsis.vue";
const props = defineProps<{
userAcct?: string;