graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-11-30 04:53:08 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix: no translations on sub notes

Browse source 
Closes bug:  transfem-org/Sharkey#89
This commit is contained in:
Mar0xy 2023-10-19 22:23:27 +02:00
parent 86f41914a6
commit fc5d75f8d4
No known key found for this signature in database
GPG key ID: 56569BBE47D2C828
2 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
packages/frontend/src/components/MkNoteSub.vue
View file

@ -16,7 +16,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<MkCwButton v-model="showContent" :note="note"/> <MkCwButton v-model="showContent" :note="note"/>
</p> </p>
<div v-show="note.cw == null || showContent"> <div v-show="note.cw == null || showContent">
<MkSubNoteContent :class="$style.text" :note="note"/> <MkSubNoteContent :class="$style.text" :note="note" :translating="translating" :translation="translation"/>
</div> </div>
</div> </div>
<footer :class="$style.footer"> <footer :class="$style.footer">
@ -121,7 +121,7 @@ const props = withDefaults(defineProps<{
const el = shallowRef<HTMLElement>(); const el = shallowRef<HTMLElement>();
const muted = ref($i ? checkWordMute(props.note, $i, $i.mutedWords) : false); const muted = ref($i ? checkWordMute(props.note, $i, $i.mutedWords) : false);
const translation = ref(null); const translation = ref<any>(null);
const translating = ref(false); const translating = ref(false);
const isDeleted = ref(false); const isDeleted = ref(false);
const renoted = ref(false); const renoted = ref(false);

16
packages/frontend/src/components/MkSubNoteContent.vue
View file

@ -10,6 +10,13 @@ SPDX-License-Identifier: AGPL-3.0-only
<span v-if="note.deletedAt" style="opacity: 0.5">({{ i18n.ts.deleted }})</span> <span v-if="note.deletedAt" style="opacity: 0.5">({{ i18n.ts.deleted }})</span>
<MkA v-if="note.replyId" :class="$style.reply" :to="`/notes/${note.replyId}`" v-on:click.stop><i class="ph-arrow-bend-left-up ph-bold pg-lg"></i></MkA> <MkA v-if="note.replyId" :class="$style.reply" :to="`/notes/${note.replyId}`" v-on:click.stop><i class="ph-arrow-bend-left-up ph-bold pg-lg"></i></MkA>
<Mfm v-if="note.text" :text="note.text" :author="note.user" :i="$i" :emojiUrls="note.emojis"/> <Mfm v-if="note.text" :text="note.text" :author="note.user" :i="$i" :emojiUrls="note.emojis"/>
<div v-if="note.text && translating || note.text && translation" :class="$style.translation">
<MkLoading v-if="translating" mini/>
<div v-else>
<b>{{ i18n.t('translatedFrom', { x: translation.sourceLang }) }}: </b>
<Mfm :text="translation.text" :author="note.user" :i="$i" :emojiUrls="note.emojis"/>
</div>
</div>
<MkA v-if="note.renoteId" :class="$style.rp" :to="`/notes/${note.renoteId}`" v-on:click.stop>RN: ...</MkA> <MkA v-if="note.renoteId" :class="$style.rp" :to="`/notes/${note.renoteId}`" v-on:click.stop>RN: ...</MkA>
</div> </div>
<details v-if="note.files.length > 0" :open="!defaultStore.state.collapseFiles"> <details v-if="note.files.length > 0" :open="!defaultStore.state.collapseFiles">
@ -42,6 +49,8 @@ import { useRouter } from '@/router.js';
const props = defineProps<{ const props = defineProps<{
note: Misskey.entities.Note; note: Misskey.entities.Note;
translating?: boolean;
translation?: any;
}>(); }>();
const router = useRouter(); const router = useRouter();
@ -102,6 +111,13 @@ const collapsed = $ref(isLong);
color: var(--renote); color: var(--renote);
} }
.translation {
border: solid 0.5px var(--divider);
border-radius: var(--radius);
padding: 12px;
margin-top: 8px;
}
.showLess { .showLess {
width: 100%; width: 100%;
margin-top: 14px; margin-top: 14px;