Merge branch 'develop' into merge/2025-03-24

2025-04-13 13:07:24 -04:00
parent 7132696285 7faef0d11e
commit 91fb75dece
11 changed files with 34 additions and 6 deletions
@@ -65,7 +65,7 @@ const emits = defineEmits<{
 async function deleteAccount() {
 	const confirm = await os.confirm({
 		type: 'warning',
-		text: i18n.ts.deleteAccountConfirm,
+		text: i18n.ts.deleteThisAccountConfirm,
 	});
 	if (confirm.canceled) return;

@@ -1,5 +1,5 @@
 <!--
-SPDX-FileCopyrightText: marie and other Sharkey contributors
+SPDX-FileCopyrightText: puniko and other Sharkey contributors
 SPDX-License-Identifier: AGPL-3.0-only
 -->

@@ -449,7 +449,7 @@ async function deleteAllFiles() {
 async function deleteAccount() {
 	const confirm = await os.confirm({
 		type: 'warning',
-		text: i18n.ts.deleteAccountConfirm,
+		text: i18n.ts.deleteThisAccountConfirm,
 	});
 	if (confirm.canceled) return;

@@ -26,7 +26,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<Mfm :text="announcement.title"/>
 				</div>
 				<div :class="$style.content">
-					<Mfm :text="announcement.text"/>
+					<Mfm :text="announcement.text" :isBlock="true"/>
 					<img v-if="announcement.imageUrl" :src="announcement.imageUrl"/>
 					<div style="margin-top: 8px; opacity: 0.7; font-size: 85%;">
 						{{ i18n.ts.createdAt }}: <MkTime :time="announcement.createdAt" mode="detail"/>
@@ -1,6 +1,6 @@
 /*
- * SPDX-FileCopyrightText: marie and other Sharkey contributors
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-FileCopyrightText: Simon Gündling and other chiptune2.js contributors
+ * SPDX-License-Identifier: MIT
 */

 /* eslint-disable */