From 84ea25771dc032bb117d3f39523d102b623abc3d Mon Sep 17 00:00:00 2001
From: TalonTheDragon <talon@iamtalon.me>
Date: Sun, 21 May 2023 16:10:48 +0200
Subject: [PATCH 01/15] Add aria-label to note container. This makes
 screen-readers read out the content while navigating with the keyboard.

---
 packages/client/src/components/MkNote.vue | 34 +++++++++++++----------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue
index c9c38a53e0..d267f2d4de 100644
--- a/packages/client/src/components/MkNote.vue
+++ b/packages/client/src/components/MkNote.vue
@@ -1,19 +1,8 @@
 <template>
-	<div
-		v-if="!muted.muted"
-		v-show="!isDeleted"
-		ref="el"
-		v-hotkey="keymap"
-		v-size="{ max: [500, 450, 350, 300] }"
-		class="tkcbzcuz note-container"
-		:tabindex="!isDeleted ? '-1' : null"
-		:class="{ renote: isRenote }"
-	>
-		<MkNoteSub
-			v-if="appearNote.reply && !detailedView"
-			:note="appearNote.reply"
-			class="reply-to"
-		/>
+	<div :aria-label="accessibleLabel" v-if="!muted.muted" v-show="!isDeleted" ref="el" v-hotkey="keymap"
+		v-size="{ max: [500, 450, 350, 300] }" class="tkcbzcuz note-container" :tabindex="!isDeleted ? '-1' : null"
+		:class="{ renote: isRenote }">
+		<MkNoteSub v-if="appearNote.reply && !detailedView" :note="appearNote.reply" class="reply-to" />
 		<div v-if="!detailedView" class="note-context" @click="noteClick">
 			<div class="line"></div>
 			<div v-if="appearNote._prId_" class="info">
@@ -472,6 +461,21 @@ function readPromo() {
 	isDeleted.value = true;
 }
 
+let accessibleLabel: string = getAccessibleLabel();
+
+function getAccessibleLabel(): string {
+	let label = `${note.user.name ? note.user.name : note.user.username}: `;
+	if (note.cw && note.isHidden) {
+		label += `Content Warning: ${note.cw}`;
+
+	} else {
+		label += `${note.text}`;
+	}
+
+
+	label += `${note.createdAt.toLocaleUpperCase()}`;
+	return label;
+}
 defineExpose({
 	focus,
 	blur,

From 0b7e9068bc32c9ffdf0ec09343b6994225bda9a2 Mon Sep 17 00:00:00 2001
From: TalonTheDragon <talon@iamtalon.me>
Date: Sun, 21 May 2023 16:12:13 +0200
Subject: [PATCH 02/15] Properly set aria-hidden on note content only if CW is
 present and show content has not been clicked

---
 packages/client/src/components/MkSubNoteContent.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/components/MkSubNoteContent.vue b/packages/client/src/components/MkSubNoteContent.vue
index e2672298c4..b162bca0b9 100644
--- a/packages/client/src/components/MkSubNoteContent.vue
+++ b/packages/client/src/components/MkSubNoteContent.vue
@@ -58,7 +58,7 @@
 			<div
 				class="body"
 				v-bind="{
-					'aria-hidden': !showContent ? 'true' : null,
+					'aria-hidden': note.cw && !showContent ? 'true' : null,
 					tabindex: !showContent ? '-1' : null,
 				}"
 			>

From fd9d23f3cb3d00e583beb51517ad110f80953a36 Mon Sep 17 00:00:00 2001
From: TalonTheDragon <talon@iamtalon.me>
Date: Sun, 21 May 2023 19:17:13 +0200
Subject: [PATCH 03/15] Label deck and universal bar buttons for screen readers
 on mobile. Still needs translation and aria-selected

---
 packages/client/src/ui/deck.vue      | 6 ++++--
 packages/client/src/ui/universal.vue | 7 +++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/packages/client/src/ui/deck.vue b/packages/client/src/ui/deck.vue
index 9de91fe562..f1cb40797e 100644
--- a/packages/client/src/ui/deck.vue
+++ b/packages/client/src/ui/deck.vue
@@ -111,6 +111,7 @@
 
 		<div v-if="isMobile" class="buttons">
 			<button
+			aria-label="Menu"
 				class="button nav _button"
 				@click="drawerMenuShowing = true"
 			>
@@ -119,10 +120,11 @@
 					><i class="ph-circle ph-fill"></i
 				></span>
 			</button>
-			<button class="button home _button" @click="mainRouter.push('/')">
+			<button aria-label="Home" class="button home _button" @click="mainRouter.push('/')">
 				<i class="ph-house ph-bold ph-lg"></i>
 			</button>
 			<button
+			aria-label="Notifications"
 				class="button notifications _button"
 				@click="mainRouter.push('/my/notifications')"
 			>
@@ -131,7 +133,7 @@
 					><i class="ph-circle ph-fill"></i
 				></span>
 			</button>
-			<button class="button post _button" @click="os.post()">
+			<button aria-label="Post" class="button post _button" @click="os.post()">
 				<i class="ph-pencil ph-bold ph-lg"></i>
 			</button>
 		</div>
diff --git a/packages/client/src/ui/universal.vue b/packages/client/src/ui/universal.vue
index f42f49513b..84dd742a5e 100644
--- a/packages/client/src/ui/universal.vue
+++ b/packages/client/src/ui/universal.vue
@@ -36,6 +36,7 @@
 
 		<div v-if="isMobile" class="buttons">
 			<button
+			aria-label="Menu"
 				class="button nav _button"
 				@click="drawerMenuShowing = true"
 			>
@@ -47,6 +48,7 @@
 				</div>
 			</button>
 			<button
+			aria-label="Home"
 				class="button home _button"
 				@click="
 					mainRouter.currentRoute.value.name === 'index'
@@ -63,6 +65,7 @@
 				</div>
 			</button>
 			<button
+			aria-label="Notifications"
 				class="button notifications _button"
 				@click="
 					mainRouter.push('/my/notifications');
@@ -80,6 +83,7 @@
 				</div>
 			</button>
 			<button
+			aria-label="Chat"
 				class="button messaging _button"
 				@click="
 					mainRouter.push('/my/messaging');
@@ -99,6 +103,7 @@
 				</div>
 			</button>
 			<button
+			aria-label="Widgets"
 				class="button widget _button"
 				@click="widgetsShowing = true"
 			>
@@ -111,6 +116,7 @@
 		<button
 			v-if="isMobile && mainRouter.currentRoute.value.name === 'index'"
 			ref="postButton"
+			aria-label="Post"
 			class="postButton button post _button"
 			@click="os.post()"
 		>
@@ -122,6 +128,7 @@
 			"
 			ref="postButton"
 			class="postButton button post _button"
+			aria-label="New Chat"
 			@click="messagingStart"
 		>
 			<i class="ph-user-plus ph-bold ph-lg"></i>

From c240e37be9b13b794a223ecbe43966d10658b21e Mon Sep 17 00:00:00 2001
From: TalonTheDragon <talon@iamtalon.me>
Date: Sun, 21 May 2023 21:57:29 +0200
Subject: [PATCH 04/15] Accessible label in MKNote should be a computed value.
 Also Fixes renoted note labels

---
 packages/client/src/components/MkNote.vue | 30 ++++++++++++++---------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue
index d267f2d4de..63aa8978d4 100644
--- a/packages/client/src/components/MkNote.vue
+++ b/packages/client/src/components/MkNote.vue
@@ -461,21 +461,27 @@ function readPromo() {
 	isDeleted.value = true;
 }
 
-let accessibleLabel: string = getAccessibleLabel();
-
-function getAccessibleLabel(): string {
-	let label = `${note.user.name ? note.user.name : note.user.username}: `;
-	if (note.cw && note.isHidden) {
-		label += `Content Warning: ${note.cw}`;
-
+const accessibleLabel = computed(() => {
+	let label = `${props.note.user.username}; `;
+	if (props.note.renote) {
+		label += `boosted ${props.note.renote.user.username}; `;
+		if (props.note.renote.cw) {
+			label += `content warning: ${props.note.renote.cw}; `;
+		} else {
+			label += `${props.note.renote.text}; `;
+		}
 	} else {
-		label += `${note.text}`;
+		if (props.note.cw) {
+			label += `content warning: ${props.note.cw}; `;
+		} else {
+			label += `${props.note.text}; `;
+		}
 	}
-
-
-	label += `${note.createdAt.toLocaleUpperCase()}`;
+	const date = new Date(props.note.createdAt);
+	label += `${date.toDateString()}`;
 	return label;
-}
+})
+
 defineExpose({
 	focus,
 	blur,

From 8806dc92f7242192217261b9c4206321bec48bcf Mon Sep 17 00:00:00 2001
From: TalonTheDragon <talon@iamtalon.me>
Date: Sun, 21 May 2023 23:02:22 +0200
Subject: [PATCH 05/15] Add translation to aria labels

---
 packages/client/src/components/MkNote.vue |  4 ++--
 packages/client/src/ui/universal.vue      | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue
index 63aa8978d4..c43ee0c3d0 100644
--- a/packages/client/src/components/MkNote.vue
+++ b/packages/client/src/components/MkNote.vue
@@ -464,7 +464,7 @@ function readPromo() {
 const accessibleLabel = computed(() => {
 	let label = `${props.note.user.username}; `;
 	if (props.note.renote) {
-		label += `boosted ${props.note.renote.user.username}; `;
+		label += `${i18n.t("renoted")} ${props.note.renote.user.username}; `;
 		if (props.note.renote.cw) {
 			label += `content warning: ${props.note.renote.cw}; `;
 		} else {
@@ -478,7 +478,7 @@ const accessibleLabel = computed(() => {
 		}
 	}
 	const date = new Date(props.note.createdAt);
-	label += `${date.toDateString()}`;
+	label += `${date.toLocaleTimeString()}`;
 	return label;
 })
 
diff --git a/packages/client/src/ui/universal.vue b/packages/client/src/ui/universal.vue
index 84dd742a5e..6a39a739b8 100644
--- a/packages/client/src/ui/universal.vue
+++ b/packages/client/src/ui/universal.vue
@@ -36,7 +36,7 @@
 
 		<div v-if="isMobile" class="buttons">
 			<button
-			aria-label="Menu"
+			:aria-label="i18n.t('menu')"
 				class="button nav _button"
 				@click="drawerMenuShowing = true"
 			>
@@ -48,7 +48,7 @@
 				</div>
 			</button>
 			<button
-			aria-label="Home"
+			:aria-label="i18n.t('home')"
 				class="button home _button"
 				@click="
 					mainRouter.currentRoute.value.name === 'index'
@@ -65,7 +65,7 @@
 				</div>
 			</button>
 			<button
-			aria-label="Notifications"
+			:aria-label="i18n.t('notifications')"
 				class="button notifications _button"
 				@click="
 					mainRouter.push('/my/notifications');
@@ -83,7 +83,7 @@
 				</div>
 			</button>
 			<button
-			aria-label="Chat"
+			:aria-label="i18n.t('messaging')"
 				class="button messaging _button"
 				@click="
 					mainRouter.push('/my/messaging');
@@ -103,7 +103,7 @@
 				</div>
 			</button>
 			<button
-			aria-label="Widgets"
+			:aria-label="i18n.t('_deck._columns.widgets')"
 				class="button widget _button"
 				@click="widgetsShowing = true"
 			>
@@ -116,7 +116,7 @@
 		<button
 			v-if="isMobile && mainRouter.currentRoute.value.name === 'index'"
 			ref="postButton"
-			aria-label="Post"
+			:aria-label="i18n.t('note')"
 			class="postButton button post _button"
 			@click="os.post()"
 		>
@@ -128,7 +128,7 @@
 			"
 			ref="postButton"
 			class="postButton button post _button"
-			aria-label="New Chat"
+			:aria-label="i18n.t('startMessaging')"
 			@click="messagingStart"
 		>
 			<i class="ph-user-plus ph-bold ph-lg"></i>

From 1c275c91142d2961dee77ccdaf57457357bc99c8 Mon Sep 17 00:00:00 2001
From: TalonTheDragon <talon@iamtalon.me>
Date: Mon, 22 May 2023 10:54:42 +0200
Subject: [PATCH 06/15] Add translations to deck.vue aria labels

---
 packages/client/src/ui/deck.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/client/src/ui/deck.vue b/packages/client/src/ui/deck.vue
index f1cb40797e..b669aae28a 100644
--- a/packages/client/src/ui/deck.vue
+++ b/packages/client/src/ui/deck.vue
@@ -111,7 +111,7 @@
 
 		<div v-if="isMobile" class="buttons">
 			<button
-			aria-label="Menu"
+			:aria-label="i18n.t('menu')"
 				class="button nav _button"
 				@click="drawerMenuShowing = true"
 			>
@@ -120,11 +120,11 @@
 					><i class="ph-circle ph-fill"></i
 				></span>
 			</button>
-			<button aria-label="Home" class="button home _button" @click="mainRouter.push('/')">
+			<button :aria-label="i18n.t('home')" class="button home _button" @click="mainRouter.push('/')">
 				<i class="ph-house ph-bold ph-lg"></i>
 			</button>
 			<button
-			aria-label="Notifications"
+			:aria-label="i18n.t('notifications')"
 				class="button notifications _button"
 				@click="mainRouter.push('/my/notifications')"
 			>
@@ -133,7 +133,7 @@
 					><i class="ph-circle ph-fill"></i
 				></span>
 			</button>
-			<button aria-label="Post" class="button post _button" @click="os.post()">
+			<button :aria-label="i18n.t('note')" class="button post _button" @click="os.post()">
 				<i class="ph-pencil ph-bold ph-lg"></i>
 			</button>
 		</div>

From 4ae3eea8a33800465b47fc8e1ae17ff46aa0a974 Mon Sep 17 00:00:00 2001
From: TalonTheDragon <talon@iamtalon.me>
Date: Mon, 22 May 2023 10:56:42 +0200
Subject: [PATCH 07/15] Add translation to content warning in MKNote.vue

---
 packages/client/src/components/MkNote.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue
index c43ee0c3d0..cac0461b42 100644
--- a/packages/client/src/components/MkNote.vue
+++ b/packages/client/src/components/MkNote.vue
@@ -472,7 +472,7 @@ const accessibleLabel = computed(() => {
 		}
 	} else {
 		if (props.note.cw) {
-			label += `content warning: ${props.note.cw}; `;
+			label += `${i18n.t("cw")}: ${props.note.cw}; `;
 		} else {
 			label += `${props.note.text}; `;
 		}

From c6d6950006e474fd4aba48b06ef48a2f135eaed8 Mon Sep 17 00:00:00 2001
From: TalonTheDragon <talon@iamtalon.me>
Date: Mon, 22 May 2023 10:58:20 +0200
Subject: [PATCH 08/15] Add cw to english locale

---
 locales/en-US.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/locales/en-US.yml b/locales/en-US.yml
index b3944b1e57..9c658d668b 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -69,6 +69,7 @@ followRequestAccepted: "Follow request accepted"
 mention: "Mention"
 mentions: "Mentions"
 directNotes: "Direct messages"
+cw: "Content warning"
 importAndExport: "Import/Export Data"
 import: "Import"
 export: "Export"

From 891cc62e0d68c24e767f28ca4c89f3cd429a7edd Mon Sep 17 00:00:00 2001
From: TalonTheDragon <talon@iamtalon.me>
Date: Mon, 22 May 2023 12:18:17 +0200
Subject: [PATCH 09/15] Emit event when cw is expanded

---
 packages/client/src/components/MkNote.vue     | 76 +++++++------------
 .../src/components/MkSubNoteContent.vue       |  2 +
 2 files changed, 30 insertions(+), 48 deletions(-)

diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue
index cac0461b42..8e6eb0d109 100644
--- a/packages/client/src/components/MkNote.vue
+++ b/packages/client/src/components/MkNote.vue
@@ -18,79 +18,47 @@
 				{{ i18n.ts.featured }}
 			</div>
 			<div v-if="pinned" class="info">
-				<i class="ph-push-pin ph-bold ph-lg"></i
-				>{{ i18n.ts.pinnedNote }}
+				<i class="ph-push-pin ph-bold ph-lg"></i>{{ i18n.ts.pinnedNote }}
 			</div>
 			<div v-if="isRenote" class="renote">
 				<i class="ph-repeat ph-bold ph-lg"></i>
 				<I18n :src="i18n.ts.renotedBy" tag="span">
 					<template #user>
-						<MkA
-							v-user-preview="note.userId"
-							class="name"
-							:to="userPage(note.user)"
-							@click.stop
-						>
+						<MkA v-user-preview="note.userId" class="name" :to="userPage(note.user)" @click.stop>
 							<MkUserName :user="note.user" />
 						</MkA>
 					</template>
 				</I18n>
 				<div class="info">
-					<button
-						ref="renoteTime"
-						class="_button time"
-						@click.stop="showRenoteMenu()"
-					>
-						<i
-							v-if="isMyRenote"
-							class="ph-dots-three-outline ph-bold ph-lg dropdownIcon"
-						></i>
+					<button ref="renoteTime" class="_button time" @click.stop="showRenoteMenu()">
+						<i v-if="isMyRenote" class="ph-dots-three-outline ph-bold ph-lg dropdownIcon"></i>
 						<MkTime :time="note.createdAt" />
 					</button>
 					<MkVisibility :note="note" />
 				</div>
 			</div>
 		</div>
-		<article
-			class="article"
-			@contextmenu.stop="onContextmenu"
-			@click="noteClick"
-		>
+		<article class="article" @contextmenu.stop="onContextmenu" @click="noteClick">
 			<div class="main">
 				<div class="header-container">
 					<MkAvatar class="avatar" :user="appearNote.user" />
-					<XNoteHeader
-						class="header"
-						:note="appearNote"
-						:mini="true"
-					/>
+					<XNoteHeader class="header" :note="appearNote" :mini="true" />
 				</div>
 				<div class="body">
-					<MkSubNoteContent
-						class="text"
-						:note="appearNote"
-						:detailed="true"
-						:detailedView="detailedView"
-						:parentId="appearNote.parentId"
-						@push="(e) => router.push(notePage(e))"
-						@focusfooter="footerEl.focus()"
-					></MkSubNoteContent>
+					<MkSubNoteContent class="text" :note="appearNote" :detailed="true" :detailedView="detailedView"
+						:parentId="appearNote.parentId" @push="(e) => router.push(notePage(e))"
+						@focusfooter="footerEl.focus()" @expanded="(e) => setPostExpanded(e)"></MkSubNoteContent>
 					<div v-if="translating || translation" class="translation">
 						<MkLoading v-if="translating" mini />
 						<div v-else class="translated">
-							<b
-								>{{
-									i18n.t("translatedFrom", {
-										x: translation.sourceLang,
-									})
-								}}:
+							<b>{{
+								i18n.t("translatedFrom", {
+									x: translation.sourceLang,
+								})
+							}}:
 							</b>
-							<Mfm
-								:text="translation.text"
-								:author="appearNote.user"
-								:i="$i"
-								:custom-emojis="appearNote.emojis"
-							/>
+							<Mfm :text="translation.text" :author="appearNote.user" :i="$i"
+								:custom-emojis="appearNote.emojis" />
 						</div>
 					</div>
 				</div>
@@ -461,18 +429,30 @@ function readPromo() {
 	isDeleted.value = true;
 }
 
+let postIsExpanded = false;
+
+function setPostExpanded(val: boolean) {
+	postIsExpanded = val;
+}
+
 const accessibleLabel = computed(() => {
 	let label = `${props.note.user.username}; `;
 	if (props.note.renote) {
 		label += `${i18n.t("renoted")} ${props.note.renote.user.username}; `;
 		if (props.note.renote.cw) {
 			label += `content warning: ${props.note.renote.cw}; `;
+			if (postIsExpanded) {
+				label += `${props.note.renote.text}; `;	
+			}
 		} else {
 			label += `${props.note.renote.text}; `;
 		}
 	} else {
 		if (props.note.cw) {
 			label += `${i18n.t("cw")}: ${props.note.cw}; `;
+			if (postIsExpanded) {
+				label += `${props.note.text}; `;
+			}
 		} else {
 			label += `${props.note.text}; `;
 		}
diff --git a/packages/client/src/components/MkSubNoteContent.vue b/packages/client/src/components/MkSubNoteContent.vue
index b162bca0b9..5a46a319c5 100644
--- a/packages/client/src/components/MkSubNoteContent.vue
+++ b/packages/client/src/components/MkSubNoteContent.vue
@@ -54,6 +54,7 @@
 				v-model="showContent"
 				:note="note"
 				v-on:keydown="focusFooter"
+				v-on:update:model-value="(val) => emit('expanded', val)"
 			/>
 			<div
 				class="body"
@@ -190,6 +191,7 @@ const props = defineProps<{
 const emit = defineEmits<{
 	(ev: "push", v): void;
 	(ev: "focusfooter"): void;
+	(ev: "expanded", v): void;
 }>();
 
 const cwButton = ref<HTMLElement>();

From fea1f993e21f376898ee339180360daec39d11e8 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Mon, 22 May 2023 06:21:41 -0400
Subject: [PATCH 10/15] Hide icons in note tabs, always show reply tab

---
 packages/client/src/components/MkNoteDetailed.vue | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue
index ec14c76b02..beb7aea0ff 100644
--- a/packages/client/src/components/MkNoteDetailed.vue
+++ b/packages/client/src/components/MkNoteDetailed.vue
@@ -46,28 +46,28 @@
 			"
 			@update:modelValue="loadTab"
 		>
-			<option value="replies" v-if="appearNote.repliesCount > 0">
-				<i class="ph-arrow-u-up-left ph-bold ph-lg"></i>
-				<span class="count">{{ appearNote.repliesCount }}</span>
+			<option value="replies">
+				<!-- <i class="ph-arrow-u-up-left ph-bold ph-lg"></i> -->
+				<span v-if="appearNote.repliesCount > 0" class="count">{{ appearNote.repliesCount }}</span>
 				{{ i18n.ts._notification._types.reply }}
 			</option>
 			<option value="renotes" v-if="appearNote.renoteCount > 0">
-				<i class="ph-repeat ph-bold ph-lg"></i>
+				<!-- <i class="ph-repeat ph-bold ph-lg"></i> -->
 				<span class="count">{{ appearNote.renoteCount }}</span>
 				{{ i18n.ts._notification._types.renote }}
 			</option>
 			<option value="reactions" v-if="reactionsCount > 0">
-				<i class="ph-smiley ph-bold ph-lg"></i>
+				<!-- <i class="ph-smiley ph-bold ph-lg"></i> -->
 				<span class="count">{{ reactionsCount }}</span>
 				{{ i18n.ts.reaction }}
 			</option>
 			<option value="quotes" v-if="directQuotes?.length > 0">
-				<i class="ph-quotes ph-bold ph-lg"></i>
+				<!-- <i class="ph-quotes ph-bold ph-lg"></i> -->
 				<span class="count">{{ directQuotes.length }}</span>
 				{{ i18n.ts._notification._types.quote }}
 			</option>
 			<option value="clips" v-if="clips?.length > 0">
-				<i class="ph-paperclip ph-bold ph-lg"></i>
+				<!-- <i class="ph-paperclip ph-bold ph-lg"></i> -->
 				<span class="count">{{ clips.length }}</span>
 				{{ i18n.ts.clips }}
 			</option>

From ef17ff4e0524641ac191d149fcfee9f9b5889304 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Mon, 22 May 2023 06:26:17 -0400
Subject: [PATCH 11/15] fix

---
 packages/client/src/components/MkNoteDetailed.vue | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue
index beb7aea0ff..2fcf8b0e70 100644
--- a/packages/client/src/components/MkNoteDetailed.vue
+++ b/packages/client/src/components/MkNoteDetailed.vue
@@ -35,15 +35,7 @@
 
 		<MkTab
 			v-model="tab"
-			:style="
-				appearNote.repliesCount > 0 &&
-				appearNote.renoteCount > 0 &&
-				reactionsCount > 0 &&
-				directQuotes?.length > 0 &&
-				clips?.length > 0
-					? 'underline'
-					: ''
-			"
+			:style="'underline'"
 			@update:modelValue="loadTab"
 		>
 			<option value="replies">

From 16bec67f27b24336f6b845d0a48224db51fb01b9 Mon Sep 17 00:00:00 2001
From: TalonTheDragon <talon@iamtalon.me>
Date: Mon, 22 May 2023 13:08:32 +0200
Subject: [PATCH 12/15] Set postIsExpanded to ref() for reactivity

---
 packages/client/src/components/MkNote.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue
index 8e6eb0d109..fa82c0e212 100644
--- a/packages/client/src/components/MkNote.vue
+++ b/packages/client/src/components/MkNote.vue
@@ -429,10 +429,10 @@ function readPromo() {
 	isDeleted.value = true;
 }
 
-let postIsExpanded = false;
+let postIsExpanded = ref(false);
 
 function setPostExpanded(val: boolean) {
-	postIsExpanded = val;
+	postIsExpanded.value = val;
 }
 
 const accessibleLabel = computed(() => {
@@ -440,8 +440,8 @@ const accessibleLabel = computed(() => {
 	if (props.note.renote) {
 		label += `${i18n.t("renoted")} ${props.note.renote.user.username}; `;
 		if (props.note.renote.cw) {
-			label += `content warning: ${props.note.renote.cw}; `;
-			if (postIsExpanded) {
+			label += `${i18n.t('cw')}: ${props.note.renote.cw}; `;
+			if (postIsExpanded.value) {
 				label += `${props.note.renote.text}; `;	
 			}
 		} else {
@@ -450,7 +450,7 @@ const accessibleLabel = computed(() => {
 	} else {
 		if (props.note.cw) {
 			label += `${i18n.t("cw")}: ${props.note.cw}; `;
-			if (postIsExpanded) {
+			if (postIsExpanded.value) {
 				label += `${props.note.text}; `;
 			}
 		} else {

From 561706bb2fc33f55fcd4c90b4e514a92dbbecd11 Mon Sep 17 00:00:00 2001
From: jolupa <jolupameister@gmail.com>
Date: Mon, 22 May 2023 04:49:14 +0000
Subject: [PATCH 13/15] chore: Translated using Weblate (Catalan)

Currently translated at 100.0% (1747 of 1747 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/ca/
---
 locales/ca-ES.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/locales/ca-ES.yml b/locales/ca-ES.yml
index cce91104a1..de8246be39 100644
--- a/locales/ca-ES.yml
+++ b/locales/ca-ES.yml
@@ -1704,7 +1704,9 @@ oneWeek: Una setmana
 reflectMayTakeTime: Pot trigar una mica a reflectir-se.
 thereIsUnresolvedAbuseReportWarning: Hi ha informes sense resoldre.
 driveCapOverrideLabel: Canvieu la capacitat del disc per a aquest usuari
-isSystemAccount: Un compte creat i operat automàticament pel sistema.
+isSystemAccount: Aquest compte és creat i operat automàticament pel sistema. Si us
+  plau, no modereu, editeu, suprimiu o modifiqueu aquest compte de cap forma, o podria
+  trencar el vostre servidor.
 typeToConfirm: Introduïu {x} per confirmar
 deleteAccount: Suprimeix el compte
 document: Documentació
@@ -2056,3 +2058,4 @@ newer: Més nou
 older: Més antic
 silencedWarning: S'està mostrant aquesta pàgina per què aquest usuari és d'un servidor
   que l'administrador a silenciat, així que pot ser spam.
+jumpToPrevious: Vés a l'anterior

From 1ad166bfa35a0d1370a84ed7406be832e9bb16d8 Mon Sep 17 00:00:00 2001
From: Richard <galmt@protonmail.com>
Date: Mon, 22 May 2023 14:44:40 +0000
Subject: [PATCH 14/15] chore: Translated using Weblate (Dutch)

Currently translated at 24.9% (436 of 1747 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/nl/
---
 locales/nl-NL.yml | 38 ++++++++++++++++++++++++++++----------
 1 file changed, 28 insertions(+), 10 deletions(-)

diff --git a/locales/nl-NL.yml b/locales/nl-NL.yml
index da447aa6f8..e6cbd87a3e 100644
--- a/locales/nl-NL.yml
+++ b/locales/nl-NL.yml
@@ -47,8 +47,8 @@ copyContent: "Kopiëren inhoud"
 copyLink: "Kopiëren link"
 delete: "Verwijderen"
 deleteAndEdit: "Verwijderen en bewerken"
-deleteAndEditConfirm: "Weet je zeker dat je deze notitie wilt verwijderen en dan bewerken?
-  Je verliest alle reacties, herdelingen en antwoorden erop."
+deleteAndEditConfirm: "Weet je zeker dat je deze post wilt verwijderen en dan bewerken?
+  Je verliest alle reacties, boosts en antwoorden erop."
 addToList: "Aan lijst toevoegen"
 sendMessage: "Verstuur bericht"
 copyUsername: "Kopiëren gebruikersnaam "
@@ -68,7 +68,7 @@ export: "Export"
 files: "Bestanden"
 download: "Downloaden"
 driveFileDeleteConfirm: "Weet je zeker dat je het bestand \"{name}\" wilt verwijderen?
-  Notities met dit bestand als bijlage worden ook verwijderd."
+  Posts met dit bestand als bijlage worden ook verwijderd."
 unfollowConfirm: "Weet je zeker dat je {name} wilt ontvolgen?"
 exportRequested: "Je hebt een export aangevraagd. Dit kan een tijdje duren. Het wordt
   toegevoegd aan je Drive zodra het is voltooid."
@@ -103,9 +103,9 @@ followRequestPending: "Wachten op goedkeuring volgverzoek"
 enterEmoji: "Voer een emoji in"
 renote: "Herdelen"
 unrenote: "Stop herdelen"
-renoted: "Herdeeld"
-cantRenote: "Dit bericht kan niet worden herdeeld"
-cantReRenote: "Een herdeling kan niet worden herdeeld"
+renoted: "Boosted."
+cantRenote: "Dit bericht kan niet worden geboost."
+cantReRenote: "Een boost kan niet worden geboost."
 quote: "Quote"
 pinnedNote: "Vastgemaakte notitie"
 pinned: "Vastmaken aan profielpagina"
@@ -139,8 +139,8 @@ flagAsCat: "Markeer dit account als een kat."
 flagAsCatDescription: "Zet deze vlag aan als je wilt aangeven dat dit account een
   kat is."
 flagShowTimelineReplies: "Toon antwoorden op de tijdlijn"
-flagShowTimelineRepliesDescription: "Als je dit vlag aanzet, toont de tijdlijn ook
-  antwoorden op andere en niet alleen jouw eigen notities."
+flagShowTimelineRepliesDescription: "Als je deze vlag aanzet, toont de tijdlijn ook
+  antwoorden op andere en niet alleen jouw eigen post."
 autoAcceptFollowed: "Accepteer verzoeken om jezelf te volgen vanzelf als je de verzoeker
   al volgt"
 addAccount: "Account toevoegen"
@@ -203,8 +203,8 @@ mutedUsers: "Gedempte gebruikers"
 blockedUsers: "Geblokkeerde gebruikers"
 noUsers: "Er zijn geen gebruikers."
 editProfile: "Bewerk Profiel"
-noteDeleteConfirm: "Ben je zeker dat je dit bericht wil verwijderen?"
-pinLimitExceeded: "Je kunt geen berichten meer vastprikken"
+noteDeleteConfirm: "Ben je zeker dat je deze post wil verwijderen?"
+pinLimitExceeded: "Je kunt geen posts meer vastprikken"
 intro: "Installatie van Calckey geëindigd! Maak nu een beheerder aan."
 done: "Klaar"
 processing: "Bezig met verwerken"
@@ -499,3 +499,21 @@ manageGroups: Beheer groepen
 subscribePushNotification: Pushmeldingen inschakelen
 unsubscribePushNotification: Pushmeldingen uitschakelen
 pushNotificationAlreadySubscribed: Pushmeldingen zijn al ingeschakeld
+antennaSource: Antenne bron
+antennaKeywords: Trefwoorden om naar te luisteren
+antennaExcludeKeywords: Trefwoorden om te negeren
+driveCapacityPerRemoteAccount: Schijfruimte per externe gebruiker
+backgroundImageUrl: Achtergrondafbeelding URL
+basicInfo: Basis informatie
+pinnedUsers: Vastgezette gebruikers
+pinnedPages: Vastgezette Pagina's
+driveCapacityPerLocalAccount: Schijfruimte per lokale gebruiker
+iconUrl: Icoon URL
+bannerUrl: Banner afbeelding URL
+manageAntennas: Beheer Antennes
+name: Naam
+notifyAntenna: Meld nieuwe posts
+withFileAntenna: Alleen posts met bestanden
+enableServiceworker: Schakel pushmeldingen voor je browser in
+renoteUnmute: Ontdemp boosts
+jumpToPrevious: Spring naar vorige

From d6c7d038f611176853a479158cc6ae7155f61f44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?GayCookie=20=E2=9C=8C?= <contact@gaycookie.dev>
Date: Mon, 22 May 2023 11:19:59 +0000
Subject: [PATCH 15/15] chore: Translated using Weblate (Dutch)

Currently translated at 24.9% (436 of 1747 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/nl/
---
 locales/nl-NL.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/locales/nl-NL.yml b/locales/nl-NL.yml
index e6cbd87a3e..cea1d5f70f 100644
--- a/locales/nl-NL.yml
+++ b/locales/nl-NL.yml
@@ -101,13 +101,13 @@ followRequests: "Volgverzoeken"
 unfollow: "Ontvolgen"
 followRequestPending: "Wachten op goedkeuring volgverzoek"
 enterEmoji: "Voer een emoji in"
-renote: "Herdelen"
+renote: "Boost"
 unrenote: "Stop herdelen"
 renoted: "Boosted."
 cantRenote: "Dit bericht kan niet worden geboost."
 cantReRenote: "Een boost kan niet worden geboost."
 quote: "Quote"
-pinnedNote: "Vastgemaakte notitie"
+pinnedNote: "Vastgemaakte post"
 pinned: "Vastmaken aan profielpagina"
 you: "Jij"
 clickToShow: "Klik om te bekijken"
@@ -116,7 +116,7 @@ add: "Toevoegen"
 reaction: "Reacties"
 reactionSettingDescription2: "Sleep om opnieuw te ordenen, Klik om te verwijderen,
   Druk op \"+\" om toe te voegen"
-rememberNoteVisibility: "Vergeet niet de notitie zichtbaarheidsinstellingen"
+rememberNoteVisibility: "Onthoud post zichtbaarheidsinstellingen"
 attachCancel: "Verwijder bijlage"
 markAsSensitive: "Markeren als NSFW"
 unmarkAsSensitive: "Geen NSFW"