diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue index 43d64eabf5..3418676d58 100644 --- a/packages/frontend/src/components/MkNote.vue +++ b/packages/frontend/src/components/MkNote.vue @@ -86,14 +86,7 @@ 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 }} @@ -241,6 +234,7 @@ import { getPluginHandlers } from '@/plugin.js'; import { DI } from '@/di.js'; import { useRouter } from '@/router.js'; import SkMutedNote from '@/components/SkMutedNote.vue'; +import SkNoteTranslation from '@/components/SkNoteTranslation.vue'; const props = withDefaults(defineProps<{ note: Misskey.entities.Note; @@ -1169,13 +1163,6 @@ function emitUpdReaction(emoji: string, delta: number) { margin-right: 0.5em; } -.translation { - border: solid 0.5px var(--MI_THEME-divider); - border-radius: var(--MI-radius); - padding: 12px; - margin-top: 8px; -} - .urlPreview { margin-top: 8px; } diff --git a/packages/frontend/src/components/MkNoteDetailed.vue b/packages/frontend/src/components/MkNoteDetailed.vue index 48c66d235f..bde2086508 100644 --- a/packages/frontend/src/components/MkNoteDetailed.vue +++ b/packages/frontend/src/components/MkNoteDetailed.vue @@ -104,14 +104,7 @@ 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 }}
@@ -291,6 +284,7 @@ import { prefer } from '@/preferences.js'; import { getPluginHandlers } from '@/plugin.js'; import { DI } from '@/di.js'; import SkMutedNote from '@/components/SkMutedNote.vue'; +import SkNoteTranslation from '@/components/SkNoteTranslation.vue'; const props = withDefaults(defineProps<{ note: Misskey.entities.Note; @@ -1055,13 +1049,6 @@ function animatedMFM() { color: var(--MI_THEME-renote); } -.translation { - border: solid 0.5px var(--MI_THEME-divider); - border-radius: var(--MI-radius); - padding: 12px; - margin-top: 8px; -} - .poll { font-size: 80%; } diff --git a/packages/frontend/src/components/MkSubNoteContent.vue b/packages/frontend/src/components/MkSubNoteContent.vue index 9a59678a99..0780f6c910 100644 --- a/packages/frontend/src/components/MkSubNoteContent.vue +++ b/packages/frontend/src/components/MkSubNoteContent.vue @@ -12,14 +12,7 @@ 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: ...
@@ -52,14 +45,20 @@ import * as os from '@/os.js'; import { checkAnimationFromMfm } from '@/utility/check-animated-mfm.js'; import { useRouter } from '@/router'; import { prefer } from '@/preferences.js'; +import SkNoteTranslation from '@/components/SkNoteTranslation.vue'; -const props = defineProps<{ +const props = withDefaults(defineProps<{ note: Misskey.entities.Note; translating?: boolean; translation?: Misskey.entities.NotesTranslateResponse | false | null; hideFiles?: boolean; expandAllCws?: boolean; -}>(); +}>(), { + translating: false, + translation: null, + hideFiles: false, + expandAllCws: false, +}); const router = useRouter(); @@ -141,13 +140,6 @@ watch(() => props.expandAllCws, (expandAllCws) => { color: var(--MI_THEME-renote); } -.translation { - border: solid 0.5px var(--MI_THEME-divider); - border-radius: var(--MI-radius); - padding: 12px; - margin-top: 8px; -} - .showLess { width: 100%; margin-top: 14px; diff --git a/packages/frontend/src/components/SkNote.vue b/packages/frontend/src/components/SkNote.vue index 0ff3535f64..197d0ecc0d 100644 --- a/packages/frontend/src/components/SkNote.vue +++ b/packages/frontend/src/components/SkNote.vue @@ -88,14 +88,7 @@ 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 }} @@ -241,6 +234,7 @@ import { getPluginHandlers } from '@/plugin.js'; import { DI } from '@/di.js'; import { useRouter } from '@/router.js'; import SkMutedNote from '@/components/SkMutedNote.vue'; +import SkNoteTranslation from '@/components/SkNoteTranslation.vue'; const props = withDefaults(defineProps<{ note: Misskey.entities.Note; @@ -1203,13 +1197,6 @@ function emitUpdReaction(emoji: string, delta: number) { margin-right: 0.5em; } -.translation { - border: solid 0.5px var(--MI_THEME-divider); - border-radius: var(--MI-radius); - padding: 12px; - margin-top: 8px; -} - .urlPreview { margin-top: 8px; } diff --git a/packages/frontend/src/components/SkNoteDetailed.vue b/packages/frontend/src/components/SkNoteDetailed.vue index 5b01d278ec..02cc53fc24 100644 --- a/packages/frontend/src/components/SkNoteDetailed.vue +++ b/packages/frontend/src/components/SkNoteDetailed.vue @@ -109,14 +109,7 @@ 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 }}
@@ -296,6 +289,7 @@ import { prefer } from '@/preferences.js'; import { getPluginHandlers } from '@/plugin.js'; import { DI } from '@/di.js'; import SkMutedNote from '@/components/SkMutedNote.vue'; +import SkNoteTranslation from '@/components/SkNoteTranslation.vue'; const props = withDefaults(defineProps<{ note: Misskey.entities.Note; @@ -1113,13 +1107,6 @@ onUnmounted(() => { color: var(--MI_THEME-renote); } -.translation { - border: solid 0.5px var(--MI_THEME-divider); - border-radius: var(--MI-radius); - padding: 12px; - margin-top: 8px; -} - .poll { font-size: 80%; } diff --git a/packages/frontend/src/components/SkNoteTranslation.vue b/packages/frontend/src/components/SkNoteTranslation.vue new file mode 100644 index 0000000000..75fe11988c --- /dev/null +++ b/packages/frontend/src/components/SkNoteTranslation.vue @@ -0,0 +1,48 @@ + + + + + + + diff --git a/packages/frontend/src/components/SkOldNoteWindow.vue b/packages/frontend/src/components/SkOldNoteWindow.vue index 47d813ea3f..608722def0 100644 --- a/packages/frontend/src/components/SkOldNoteWindow.vue +++ b/packages/frontend/src/components/SkOldNoteWindow.vue @@ -42,14 +42,7 @@ SPDX-License-Identifier: AGPL-3.0-only RN: -
- -
- {{ i18n.tsx.translatedFrom({ x: translation.sourceLang }) }}: - -
-
{{ i18n.ts.translationFailed }}
-
+
@@ -99,6 +92,7 @@ import { deepClone } from '@/utility/clone.js'; import { dateTimeFormat } from '@/utility/intl-const.js'; import { prefer } from '@/preferences'; import { getPluginHandlers } from '@/plugin.js'; +import SkNoteTranslation from '@/components/SkNoteTranslation.vue'; const props = defineProps<{ note: Misskey.entities.Note; @@ -260,13 +254,6 @@ const showTicker = (prefer.s.instanceTicker === 'always') || (prefer.s.instanceT color: var(--MI_THEME-renote); } -.translation { - border: solid 0.5px var(--MI_THEME-divider); - border-radius: var(--MI-radius); - padding: 12px; - margin-top: 8px; -} - .poll { font-size: 80%; }