From 2fdec0ce29c5b61f61640123db16d89a72e97de2 Mon Sep 17 00:00:00 2001 From: Hazelnoot Date: Fri, 16 May 2025 20:00:48 -0400 Subject: [PATCH] add option to put Translate button in the note toolbar --- locales/index.d.ts | 8 +++++ packages/frontend/src/components/MkNote.vue | 25 ++++++++++++--- .../src/components/MkNoteDetailed.vue | 23 ++++++++++--- .../frontend/src/components/MkNoteSub.vue | 2 +- .../src/components/MkSubNoteContent.vue | 7 ++-- packages/frontend/src/components/SkNote.vue | 25 ++++++++++++--- .../src/components/SkNoteDetailed.vue | 23 ++++++++++--- .../frontend/src/components/SkNoteSub.vue | 2 +- .../src/components/SkOldNoteWindow.vue | 9 +++--- .../src/pages/settings/preferences.vue | 9 ++++++ packages/frontend/src/preferences/def.ts | 3 ++ .../frontend/src/utility/get-note-menu.ts | 32 +++++++++++-------- sharkey-locales/en-US.yml | 2 ++ 13 files changed, 128 insertions(+), 42 deletions(-) diff --git a/locales/index.d.ts b/locales/index.d.ts index 3316a679e0..e10511db05 100644 --- a/locales/index.d.ts +++ b/locales/index.d.ts @@ -12933,6 +12933,14 @@ export interface Locale extends ILocale { * Fetch linked note */ "fetchLinkedNote": string; + /** + * Add "Translate" to note action menu + */ + "showTranslationButtonInNoteFooter": string; + /** + * Failed to translate note. Please try again later or contact an administrator for assistance. + */ + "translationFailed": string; "_processErrors": { /** * Unable to process quote. This post may be missing context. diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue index b4977b73bc..f4c33f6ea8 100644 --- a/packages/frontend/src/components/MkNote.vue +++ b/packages/frontend/src/components/MkNote.vue @@ -86,12 +86,13 @@ SPDX-License-Identifier: AGPL-3.0-only :isBlock="true" class="_selectable" /> -
+
-
+
{{ i18n.tsx.translatedFrom({ x: translation.sourceLang }) }}:
+
{{ i18n.ts.translationFailed }}
{{ i18n.ts._animatedMFM.play }} {{ i18n.ts._animatedMFM.stop }} @@ -163,6 +164,9 @@ SPDX-License-Identifier: AGPL-3.0-only + @@ -219,7 +223,7 @@ import { extractUrlFromMfm } from '@/utility/extract-url-from-mfm.js'; import { checkAnimationFromMfm } from '@/utility/check-animated-mfm.js'; import { $i } from '@/i.js'; import { i18n } from '@/i18n.js'; -import { getAbuseNoteMenu, getCopyNoteLinkMenu, getNoteClipMenu, getNoteMenu, getRenoteMenu } from '@/utility/get-note-menu.js'; +import { getAbuseNoteMenu, getCopyNoteLinkMenu, getNoteClipMenu, getNoteMenu, getRenoteMenu, translateNote } from '@/utility/get-note-menu.js'; import { getNoteVersionsMenu } from '@/utility/get-note-versions-menu.js'; import { useNoteCapture } from '@/use/use-note-capture.js'; import { deepClone } from '@/utility/clone.js'; @@ -229,7 +233,7 @@ import { getNoteSummary } from '@/utility/get-note-summary.js'; import MkRippleEffect from '@/components/MkRippleEffect.vue'; import { showMovedDialog } from '@/utility/show-moved-dialog.js'; import { boostMenuItems, computeRenoteTooltip } from '@/utility/boost-quote.js'; -import { isEnabledUrlPreview } from '@/instance.js'; +import { instance, isEnabledUrlPreview } from '@/instance.js'; import { focusPrev, focusNext } from '@/utility/focus.js'; import { getAppearNote } from '@/utility/get-appear-note.js'; import { prefer } from '@/preferences.js'; @@ -310,7 +314,7 @@ const collapsed = ref(prefer.s.expandLongNote && appearNote.value.cw == null && const isDeleted = ref(false); const renoted = ref(false); const { muted, hardMuted } = checkMutes(appearNote.value, props.withHardMute); -const translation = ref(null); +const translation = ref(null); const translating = ref(false); const showTicker = (prefer.s.instanceTicker === 'always') || (prefer.s.instanceTicker === 'remote' && appearNote.value.user.instance); const canRenote = computed(() => ['public', 'home'].includes(appearNote.value.visibility) || (appearNote.value.visibility === 'followers' && appearNote.value.userId === $i?.id)); @@ -358,6 +362,11 @@ const keymap = { if (!prefer.s.showClipButtonInNoteFooter) return; clip(); }, + 't': () => { + if (prefer.s.showTranslationButtonInNoteFooter && $i?.policies.canUseTranslator && instance.translatorAvailable) { + translate(); + } + }, 'o': () => { if (renoteCollapsed.value) return; galleryEl.value?.openGallery(); @@ -780,6 +789,12 @@ async function clip(): Promise { os.popupMenu(await getNoteClipMenu({ note: note.value, isDeleted, currentClip: currentClip?.value }), clipButton.value).then(focus); } +async function translate() { + if (props.mock) return; + + await translateNote(appearNote.value.id, translation, translating); +} + function showRenoteMenu(): void { if (props.mock) { return; diff --git a/packages/frontend/src/components/MkNoteDetailed.vue b/packages/frontend/src/components/MkNoteDetailed.vue index 4a51cb3641..dcdbfaf53f 100644 --- a/packages/frontend/src/components/MkNoteDetailed.vue +++ b/packages/frontend/src/components/MkNoteDetailed.vue @@ -104,12 +104,13 @@ SPDX-License-Identifier: AGPL-3.0-only class="_selectable" /> RN: -
+
-
+
{{ i18n.tsx.translatedFrom({ x: translation.sourceLang }) }}:
+
{{ i18n.ts.translationFailed }}
{{ i18n.ts._animatedMFM.play }} {{ i18n.ts._animatedMFM.stop }} @@ -175,6 +176,9 @@ SPDX-License-Identifier: AGPL-3.0-only + @@ -267,7 +271,7 @@ import { reactionPicker } from '@/utility/reaction-picker.js'; import { extractUrlFromMfm } from '@/utility/extract-url-from-mfm.js'; import { $i } from '@/i.js'; import { i18n } from '@/i18n.js'; -import { getNoteClipMenu, getNoteMenu, getRenoteMenu } from '@/utility/get-note-menu.js'; +import { getNoteClipMenu, getNoteMenu, getRenoteMenu, translateNote } from '@/utility/get-note-menu.js'; import { getNoteVersionsMenu } from '@/utility/get-note-versions-menu.js'; import { checkAnimationFromMfm } from '@/utility/check-animated-mfm.js'; import { useNoteCapture } from '@/use/use-note-capture.js'; @@ -281,7 +285,7 @@ import MkPagination from '@/components/MkPagination.vue'; import MkReactionIcon from '@/components/MkReactionIcon.vue'; import MkButton from '@/components/MkButton.vue'; import { boostMenuItems, computeRenoteTooltip } from '@/utility/boost-quote.js'; -import { isEnabledUrlPreview } from '@/instance.js'; +import { instance, isEnabledUrlPreview } from '@/instance.js'; import { getAppearNote } from '@/utility/get-appear-note.js'; import { prefer } from '@/preferences.js'; import { getPluginHandlers } from '@/plugin.js'; @@ -337,7 +341,7 @@ const isMyRenote = $i && ($i.id === note.value.userId); const showContent = ref(prefer.s.uncollapseCW); const isDeleted = ref(false); const renoted = ref(false); -const translation = ref(null); +const translation = ref(null); const translating = ref(false); const parsed = appearNote.value.text ? mfm.parse(appearNote.value.text) : null; const urls = parsed ? extractUrlFromMfm(parsed).filter((url) => appearNote.value.renote?.url !== url && appearNote.value.renote?.uri !== url) : null; @@ -386,6 +390,11 @@ const keymap = { if (!prefer.s.showClipButtonInNoteFooter) return; clip(); }, + 't': () => { + if (prefer.s.showTranslationButtonInNoteFooter && $i?.policies.canUseTranslator && instance.translatorAvailable) { + translate(); + } + }, 'o': () => galleryEl.value?.openGallery(), 'v|enter': () => { if (appearNote.value.cw != null) { @@ -764,6 +773,10 @@ async function clip(): Promise { os.popupMenu(await getNoteClipMenu({ note: note.value, isDeleted }), clipButton.value).then(focus); } +async function translate() { + await translateNote(appearNote.value.id, translation, translating); +} + function showRenoteMenu(): void { if (!isMyRenote) return; pleaseLogin({ openOnRemote: pleaseLoginContext.value }); diff --git a/packages/frontend/src/components/MkNoteSub.vue b/packages/frontend/src/components/MkNoteSub.vue index 7661bebfe7..eb72939bf1 100644 --- a/packages/frontend/src/components/MkNoteSub.vue +++ b/packages/frontend/src/components/MkNoteSub.vue @@ -123,7 +123,7 @@ const props = withDefaults(defineProps<{ const canRenote = computed(() => ['public', 'home'].includes(props.note.visibility) || props.note.userId === $i?.id); const el = shallowRef(); -const translation = ref(null); +const translation = ref(null); const translating = ref(false); const isDeleted = ref(false); const renoted = ref(false); diff --git a/packages/frontend/src/components/MkSubNoteContent.vue b/packages/frontend/src/components/MkSubNoteContent.vue index 8ac07c012a..e2a8ee4fe6 100644 --- a/packages/frontend/src/components/MkSubNoteContent.vue +++ b/packages/frontend/src/components/MkSubNoteContent.vue @@ -12,12 +12,13 @@ SPDX-License-Identifier: AGPL-3.0-only {{ i18n.ts._animatedMFM.play }} {{ i18n.ts._animatedMFM.stop }} -
+
-
+
{{ i18n.tsx.translatedFrom({ x: translation.sourceLang }) }}:
+
{{ i18n.ts.translationFailed }}
RN: ...
@@ -55,7 +56,7 @@ import { prefer } from '@/preferences.js'; const props = defineProps<{ note: Misskey.entities.Note; translating?: boolean; - translation?: any; + translation?: Misskey.entities.NotesTranslateResponse | false | null; hideFiles?: boolean; expandAllCws?: boolean; }>(); diff --git a/packages/frontend/src/components/SkNote.vue b/packages/frontend/src/components/SkNote.vue index ab8a3ec4a6..4f8b3a0900 100644 --- a/packages/frontend/src/components/SkNote.vue +++ b/packages/frontend/src/components/SkNote.vue @@ -88,12 +88,13 @@ SPDX-License-Identifier: AGPL-3.0-only :isAnim="allowAnim" :isBlock="true" /> -
+
-
+
{{ i18n.tsx.translatedFrom({ x: translation.sourceLang }) }}:
+
{{ i18n.ts.translationFailed }}
{{ i18n.ts._animatedMFM.play }} {{ i18n.ts._animatedMFM.stop }} @@ -164,6 +165,9 @@ SPDX-License-Identifier: AGPL-3.0-only + @@ -219,7 +223,7 @@ import { extractUrlFromMfm } from '@/utility/extract-url-from-mfm.js'; import { checkAnimationFromMfm } from '@/utility/check-animated-mfm.js'; import { $i } from '@/i.js'; import { i18n } from '@/i18n.js'; -import { getAbuseNoteMenu, getCopyNoteLinkMenu, getNoteClipMenu, getNoteMenu } from '@/utility/get-note-menu.js'; +import { getAbuseNoteMenu, getCopyNoteLinkMenu, getNoteClipMenu, getNoteMenu, translateNote } from '@/utility/get-note-menu.js'; import { getNoteVersionsMenu } from '@/utility/get-note-versions-menu.js'; import { useNoteCapture } from '@/use/use-note-capture.js'; import { deepClone } from '@/utility/clone.js'; @@ -229,7 +233,7 @@ import { getNoteSummary } from '@/utility/get-note-summary.js'; import MkRippleEffect from '@/components/MkRippleEffect.vue'; import { showMovedDialog } from '@/utility/show-moved-dialog.js'; import { boostMenuItems, computeRenoteTooltip } from '@/utility/boost-quote.js'; -import { isEnabledUrlPreview } from '@/instance.js'; +import { instance, isEnabledUrlPreview } from '@/instance.js'; import { focusPrev, focusNext } from '@/utility/focus.js'; import { getAppearNote } from '@/utility/get-appear-note.js'; import { prefer } from '@/preferences.js'; @@ -310,7 +314,7 @@ const collapsed = ref(prefer.s.expandLongNote && appearNote.value.cw == null && const isDeleted = ref(false); const renoted = ref(false); const { muted, hardMuted } = checkMutes(appearNote.value, props.withHardMute); -const translation = ref(null); +const translation = ref(null); const translating = ref(false); const showTicker = (prefer.s.instanceTicker === 'always') || (prefer.s.instanceTicker === 'remote' && appearNote.value.user.instance); const canRenote = computed(() => ['public', 'home'].includes(appearNote.value.visibility) || (appearNote.value.visibility === 'followers' && appearNote.value.userId === $i?.id)); @@ -358,6 +362,11 @@ const keymap = { if (!prefer.s.showClipButtonInNoteFooter) return; clip(); }, + 't': () => { + if (prefer.s.showTranslationButtonInNoteFooter && $i?.policies.canUseTranslator && instance.translatorAvailable) { + translate(); + } + }, 'o': () => { if (renoteCollapsed.value) return; galleryEl.value?.openGallery(); @@ -780,6 +789,12 @@ async function clip(): Promise { os.popupMenu(await getNoteClipMenu({ note: note.value, isDeleted, currentClip: currentClip?.value }), clipButton.value).then(focus); } +async function translate() { + if (props.mock) return; + + await translateNote(appearNote.value.id, translation, translating); +} + function showRenoteMenu(): void { if (props.mock) { return; diff --git a/packages/frontend/src/components/SkNoteDetailed.vue b/packages/frontend/src/components/SkNoteDetailed.vue index c499855a80..e2a9ba9a40 100644 --- a/packages/frontend/src/components/SkNoteDetailed.vue +++ b/packages/frontend/src/components/SkNoteDetailed.vue @@ -109,12 +109,13 @@ SPDX-License-Identifier: AGPL-3.0-only class="_selectable" /> RN: -
+
-
+
{{ i18n.tsx.translatedFrom({ x: translation.sourceLang }) }}:
+
{{ i18n.ts.translationFailed }}
{{ i18n.ts._animatedMFM.play }} {{ i18n.ts._animatedMFM.stop }} @@ -180,6 +181,9 @@ SPDX-License-Identifier: AGPL-3.0-only + @@ -272,7 +276,7 @@ import { reactionPicker } from '@/utility/reaction-picker.js'; import { extractUrlFromMfm } from '@/utility/extract-url-from-mfm.js'; import { $i } from '@/i.js'; import { i18n } from '@/i18n.js'; -import { getNoteClipMenu, getNoteMenu, getRenoteMenu } from '@/utility/get-note-menu.js'; +import { getNoteClipMenu, getNoteMenu, getRenoteMenu, translateNote } from '@/utility/get-note-menu.js'; import { getNoteVersionsMenu } from '@/utility/get-note-versions-menu.js'; import { checkAnimationFromMfm } from '@/utility/check-animated-mfm.js'; import { useNoteCapture } from '@/use/use-note-capture.js'; @@ -286,7 +290,7 @@ import MkPagination from '@/components/MkPagination.vue'; import MkReactionIcon from '@/components/MkReactionIcon.vue'; import MkButton from '@/components/MkButton.vue'; import { boostMenuItems, computeRenoteTooltip } from '@/utility/boost-quote.js'; -import { isEnabledUrlPreview } from '@/instance.js'; +import { instance, isEnabledUrlPreview } from '@/instance.js'; import { getAppearNote } from '@/utility/get-appear-note.js'; import { prefer } from '@/preferences.js'; import { getPluginHandlers } from '@/plugin.js'; @@ -343,7 +347,7 @@ const isMyRenote = $i && ($i.id === note.value.userId); const showContent = ref(prefer.s.uncollapseCW); const isDeleted = ref(false); const renoted = ref(false); -const translation = ref(null); +const translation = ref(null); const translating = ref(false); const parsed = appearNote.value.text ? mfm.parse(appearNote.value.text) : null; const urls = parsed ? extractUrlFromMfm(parsed).filter((url) => appearNote.value.renote?.url !== url && appearNote.value.renote?.uri !== url) : null; @@ -392,6 +396,11 @@ const keymap = { if (!prefer.s.showClipButtonInNoteFooter) return; clip(); }, + 't': () => { + if (prefer.s.showTranslationButtonInNoteFooter && $i?.policies.canUseTranslator && instance.translatorAvailable) { + translate(); + } + }, 'o': () => galleryEl.value?.openGallery(), 'v|enter': () => { if (appearNote.value.cw != null) { @@ -770,6 +779,10 @@ async function clip(): Promise { os.popupMenu(await getNoteClipMenu({ note: note.value, isDeleted }), clipButton.value).then(focus); } +async function translate() { + await translateNote(appearNote.value.id, translation, translating); +} + function showRenoteMenu(): void { if (!isMyRenote) return; pleaseLogin({ openOnRemote: pleaseLoginContext.value }); diff --git a/packages/frontend/src/components/SkNoteSub.vue b/packages/frontend/src/components/SkNoteSub.vue index 4c4fca2450..434af87ed9 100644 --- a/packages/frontend/src/components/SkNoteSub.vue +++ b/packages/frontend/src/components/SkNoteSub.vue @@ -137,7 +137,7 @@ const canRenote = computed(() => ['public', 'home'].includes(props.note.visibili const hideLine = computed(() => props.detail); const el = shallowRef(); -const translation = ref(null); +const translation = ref(null); const translating = ref(false); const isDeleted = ref(false); const renoted = ref(false); diff --git a/packages/frontend/src/components/SkOldNoteWindow.vue b/packages/frontend/src/components/SkOldNoteWindow.vue index bd5368351b..01339dbab8 100644 --- a/packages/frontend/src/components/SkOldNoteWindow.vue +++ b/packages/frontend/src/components/SkOldNoteWindow.vue @@ -42,12 +42,13 @@ SPDX-License-Identifier: AGPL-3.0-only RN: -
+
-
- {{ i18n.t('translatedFrom', { x: translation.sourceLang }) }}: +
+ {{ i18n.tsx.translatedFrom({ x: translation.sourceLang }) }}:
+
{{ i18n.ts.translationFailed }}
@@ -151,7 +152,7 @@ const renoteUrl = appearNote.value.renote ? appearNote.value.renote.url : null; const renoteUri = appearNote.value.renote ? appearNote.value.renote.uri : null; const showContent = ref(false); -const translation = ref(null); +const translation = ref(null); const translating = ref(false); const urls = appearNote.value.text ? extractUrlFromMfm(mfm.parse(appearNote.value.text)).filter(u => u !== renoteUrl && u !== renoteUri) : null; const showTicker = (prefer.s.instanceTicker === 'always') || (prefer.s.instanceTicker === 'remote' && appearNote.value.user.instance); diff --git a/packages/frontend/src/pages/settings/preferences.vue b/packages/frontend/src/pages/settings/preferences.vue index ff366d699f..a537b6e837 100644 --- a/packages/frontend/src/pages/settings/preferences.vue +++ b/packages/frontend/src/pages/settings/preferences.vue @@ -271,6 +271,14 @@ SPDX-License-Identifier: AGPL-3.0-only + + + + + + + + @@ -964,6 +972,7 @@ const serverDisconnectedBehavior = prefer.model('serverDisconnectedBehavior'); const hemisphere = prefer.model('hemisphere'); const showNoteActionsOnlyHover = prefer.model('showNoteActionsOnlyHover'); const showClipButtonInNoteFooter = prefer.model('showClipButtonInNoteFooter'); +const showTranslationButtonInNoteFooter = prefer.model('showTranslationButtonInNoteFooter'); const collapseRenotes = prefer.model('collapseRenotes'); const advancedMfm = prefer.model('advancedMfm'); const showReactionsCount = prefer.model('showReactionsCount'); diff --git a/packages/frontend/src/preferences/def.ts b/packages/frontend/src/preferences/def.ts index 277508d79d..a4d52c8acb 100644 --- a/packages/frontend/src/preferences/def.ts +++ b/packages/frontend/src/preferences/def.ts @@ -248,6 +248,9 @@ export const PREF_DEF = { showClipButtonInNoteFooter: { default: false, }, + showTranslationButtonInNoteFooter: { + default: false, + }, reactionsDisplaySize: { default: 'medium' as 'small' | 'medium' | 'large', }, diff --git a/packages/frontend/src/utility/get-note-menu.ts b/packages/frontend/src/utility/get-note-menu.ts index 0326ebdac8..f773149fac 100644 --- a/packages/frontend/src/utility/get-note-menu.ts +++ b/packages/frontend/src/utility/get-note-menu.ts @@ -176,7 +176,7 @@ function getNoteEmbedCodeMenu(note: Misskey.entities.Note, text: string): MenuIt export function getNoteMenu(props: { note: Misskey.entities.Note; - translation: Ref; + translation: Ref; translating: Ref; isDeleted: Ref; currentClip?: Misskey.entities.Clip; @@ -290,17 +290,6 @@ export function getNoteMenu(props: { os.pageWindow(`/notes/${appearNote.id}`); } - async function translate(): Promise { - if (props.translation.value != null) return; - props.translating.value = true; - props.translation.value = await misskeyApi('notes/translate', { - noteId: appearNote.id, - targetLang: miLocalStorage.getItem('lang') ?? navigator.language, - }).finally(() => { - props.translating.value = false; - }); - } - const menuItems: MenuItem[] = []; if ($i) { @@ -357,7 +346,7 @@ export function getNoteMenu(props: { menuItems.push({ icon: 'ti ti-language-hiragana', text: i18n.ts.translate, - action: translate, + action: () => translateNote(appearNote.id, props.translation, props.translating), }); } @@ -697,3 +686,20 @@ export function getRenoteMenu(props: { menu: renoteItems, }; } + +export async function translateNote(noteId: string, translation: Ref, translating: Ref): Promise { + if (translating.value || translation.value) return; + translating.value = true; + try { + const targetLang = miLocalStorage.getItem('lang') ?? navigator.language; + translation.value = await misskeyApi('notes/translate', { + noteId, + targetLang, + }); + } catch (err) { + console.error(`Translation failed for ${noteId}: `, err); + translation.value = false; + } finally { + translating.value = false; + } +} diff --git a/sharkey-locales/en-US.yml b/sharkey-locales/en-US.yml index bf746533af..d2e28b9ddd 100644 --- a/sharkey-locales/en-US.yml +++ b/sharkey-locales/en-US.yml @@ -523,6 +523,8 @@ id: "ID" mandatoryCW: "Force content warning" mandatoryCWDescription: "Applies a content warning to all posts created by this user. If the post already has a CW, then this is appended to the end." fetchLinkedNote: "Fetch linked note" +showTranslationButtonInNoteFooter: "Add \"Translate\" to note action menu" +translationFailed: "Failed to translate note. Please try again later or contact an administrator for assistance." _processErrors: quoteUnavailable: "Unable to process quote. This post may be missing context."