From 09a7805cadef91ba24fe9fe41ee1a7bbff732e25 Mon Sep 17 00:00:00 2001
From: Takayuki KUSANO <65759+tkusano@users.noreply.github.com>
Date: Tue, 16 Jan 2024 23:53:19 +0900
Subject: [PATCH 1/2] Remove excess l10n related markups

---
 src/view/com/modals/CreateOrEditList.tsx | 22 ++++++++++------------
 src/view/screens/Search/Search.tsx       |  4 +---
 src/view/screens/Settings.tsx            |  2 +-
 3 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/src/view/com/modals/CreateOrEditList.tsx b/src/view/com/modals/CreateOrEditList.tsx
index bd1eb33935..77a1debece 100644
--- a/src/view/com/modals/CreateOrEditList.tsx
+++ b/src/view/com/modals/CreateOrEditList.tsx
@@ -182,19 +182,17 @@ export function Component({
         ]}
         testID="createOrEditListModal">
         <Text style={[styles.title, pal.text]}>
-          <Trans>
-            {isCurateList ? (
-              list ? (
-                <Trans>Edit User List</Trans>
-              ) : (
-                <Trans>New User List</Trans>
-              )
-            ) : list ? (
-              <Trans>Edit Moderation List</Trans>
+          {isCurateList ? (
+            list ? (
+              <Trans>Edit User List</Trans>
             ) : (
-              <Trans>New Moderation List</Trans>
-            )}
-          </Trans>
+              <Trans>New User List</Trans>
+            )
+          ) : list ? (
+            <Trans>Edit Moderation List</Trans>
+          ) : (
+            <Trans>New Moderation List</Trans>
+          )}
         </Text>
         {error !== '' && (
           <View style={styles.errorContainer}>
diff --git a/src/view/screens/Search/Search.tsx b/src/view/screens/Search/Search.tsx
index 8e7e204ad2..f2b6742457 100644
--- a/src/view/screens/Search/Search.tsx
+++ b/src/view/screens/Search/Search.tsx
@@ -83,9 +83,7 @@ function EmptyState({message, error}: {message: string; error?: string}) {
         },
       ]}>
       <View style={[pal.viewLight, {padding: 18, borderRadius: 8}]}>
-        <Text style={[pal.text]}>
-          <Trans>{message}</Trans>
-        </Text>
+        <Text style={[pal.text]}>{message}</Text>
 
         {error && (
           <>
diff --git a/src/view/screens/Settings.tsx b/src/view/screens/Settings.tsx
index 1f117b45bc..3b50c54493 100644
--- a/src/view/screens/Settings.tsx
+++ b/src/view/screens/Settings.tsx
@@ -291,7 +291,7 @@ export function SettingsScreen({}: Props) {
         ]}>
         <View style={{flex: 1}}>
           <Text type="title-lg" style={[pal.text, {fontWeight: 'bold'}]}>
-            <Trans>{_(msg`Settings`)}</Trans>
+            <Trans>Settings</Trans>
           </Text>
         </View>
       </SimpleViewHeader>

From 367f4db43e1d00d43fd34b9c9a039273b007b427 Mon Sep 17 00:00:00 2001
From: Takayuki KUSANO <65759+tkusano@users.noreply.github.com>
Date: Wed, 17 Jan 2024 19:09:54 +0900
Subject: [PATCH 2/2] One more correction pointed out by quiple

---
 src/Navigation.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Navigation.tsx b/src/Navigation.tsx
index c68cb05807..edce531c3f 100644
--- a/src/Navigation.tsx
+++ b/src/Navigation.tsx
@@ -144,7 +144,7 @@ function commonScreens(Stack: typeof HomeTab, unreadCountLabel?: string) {
         name="Profile"
         getComponent={() => ProfileScreen}
         options={({route}) => ({
-          title: title(msg`@${route.params.name}`),
+          title: bskyTitle(`@${route.params.name}`, unreadCountLabel),
           animation: 'none',
         })}
       />