Rename moderation link in settings to "Moderation and content filters" (#10192)

src/screens/Settings/Settings.tsx

@@ -2,9 +2,7 @@ import {useState} from 'react'
 import {Alert, LayoutAnimation, Linking, Pressable, View} from 'react-native'
 import {useReducedMotion} from 'react-native-reanimated'
 import {type AppBskyActorDefs, moderateProfile} from '@atproto/api'
-import {msg} from '@lingui/core/macro'
+import {Trans, useLingui} from '@lingui/react/macro'
-import {useLingui} from '@lingui/react'
-import {Trans} from '@lingui/react/macro'
 import {useNavigation} from '@react-navigation/native'
 import {type NativeStackScreenProps} from '@react-navigation/native-stack'
 
@@ -73,7 +71,7 @@ import {useActivitySubscriptionsNudged} from '#/storage/hooks/activity-subscript
 type Props = NativeStackScreenProps<CommonNavigatorParams, 'Settings'>
 export function SettingsScreen({}: Props) {
   const ax = useAnalytics()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const reducedMotion = useReducedMotion()
   const {logoutEveryAccount} = useSessionApi()
   const {accounts, currentAccount} = useSession()
@@ -121,10 +119,8 @@ export function SettingsScreen({}: Props) {
           {accounts.length > 1 ? (
             <>
               <SettingsList.PressableItem
-                label={_(msg`Switch account`)}
+                label={l`Switch account`}
-                accessibilityHint={_(
+                accessibilityHint={l`Shows other accounts you can switch to`}
-                  msg`Shows other accounts you can switch to`,
-                )}
                 onPress={() => {
                   if (!reducedMotion) {
                     LayoutAnimation.configureNext(
@@ -174,7 +170,7 @@ export function SettingsScreen({}: Props) {
             <AddAccountRow />
           )}
           <SettingsList.Divider />
-          <SettingsList.LinkItem to="/settings/account" label={_(msg`Account`)}>
+          <SettingsList.LinkItem to="/settings/account" label={l`Account`}>
             <SettingsList.ItemIcon icon={PersonIcon} />
             <SettingsList.ItemText>
               <Trans>Account</Trans>
@@ -182,21 +178,23 @@ export function SettingsScreen({}: Props) {
           </SettingsList.LinkItem>
           <SettingsList.LinkItem
             to="/settings/privacy-and-security"
-            label={_(msg`Privacy and security`)}>
+            label={l`Privacy and security`}>
             <SettingsList.ItemIcon icon={LockIcon} />
             <SettingsList.ItemText>
               <Trans>Privacy and security</Trans>
             </SettingsList.ItemText>
           </SettingsList.LinkItem>
-          <SettingsList.LinkItem to="/moderation" label={_(msg`Moderation`)}>
+          <SettingsList.LinkItem
+            to="/moderation"
+            label={l`Moderation and content filters`}>
             <SettingsList.ItemIcon icon={HandIcon} />
             <SettingsList.ItemText>
-              <Trans>Moderation</Trans>
+              <Trans>Moderation and content filters</Trans>
             </SettingsList.ItemText>
           </SettingsList.LinkItem>
           <SettingsList.LinkItem
             to="/settings/notifications"
-            label={_(msg`Notifications`)}>
+            label={l`Notifications`}>
             <SettingsList.ItemIcon icon={NotificationIcon} />
             <SettingsList.ItemText>
               <Trans>Notifications</Trans>
@@ -204,7 +202,7 @@ export function SettingsScreen({}: Props) {
           </SettingsList.LinkItem>
           <SettingsList.LinkItem
             to="/settings/content-and-media"
-            label={_(msg`Content and media`)}>
+            label={l`Content and media`}>
             <SettingsList.ItemIcon icon={WindowIcon} />
             <SettingsList.ItemText>
               <Trans>Content and media</Trans>
@@ -215,7 +213,7 @@ export function SettingsScreen({}: Props) {
             !ax.features.enabled(ax.features.ImportContactsSettingsDisable) && (
               <SettingsList.LinkItem
                 to="/settings/find-contacts"
-                label={_(msg`Find friends from contacts`)}>
+                label={l`Find friends from contacts`}>
                 <SettingsList.ItemIcon icon={ContactsIcon} />
                 <SettingsList.ItemText>
                   <Trans>Find friends from contacts</Trans>
@@ -224,7 +222,7 @@ export function SettingsScreen({}: Props) {
             )}
           <SettingsList.LinkItem
             to="/settings/appearance"
-            label={_(msg`Appearance`)}>
+            label={l`Appearance`}>
             <SettingsList.ItemIcon icon={PaintRollerIcon} />
             <SettingsList.ItemText>
               <Trans>Appearance</Trans>
@@ -232,15 +230,13 @@ export function SettingsScreen({}: Props) {
           </SettingsList.LinkItem>
           <SettingsList.LinkItem
             to="/settings/accessibility"
-            label={_(msg`Accessibility`)}>
+            label={l`Accessibility`}>
             <SettingsList.ItemIcon icon={AccessibilityIcon} />
             <SettingsList.ItemText>
               <Trans>Accessibility</Trans>
             </SettingsList.ItemText>
           </SettingsList.LinkItem>
-          <SettingsList.LinkItem
+          <SettingsList.LinkItem to="/settings/language" label={l`Languages`}>
-            to="/settings/language"
-            label={_(msg`Languages`)}>
             <SettingsList.ItemIcon icon={EarthIcon} />
             <SettingsList.ItemText>
               <Trans>Languages</Trans>
@@ -248,15 +244,15 @@ export function SettingsScreen({}: Props) {
           </SettingsList.LinkItem>
           <SettingsList.PressableItem
             onPress={() => void Linking.openURL(HELP_DESK_URL)}
-            label={_(msg`Help`)}
+            label={l`Help`}
-            accessibilityHint={_(msg`Opens helpdesk in browser`)}>
+            accessibilityHint={l`Opens helpdesk in browser`}>
             <SettingsList.ItemIcon icon={CircleQuestionIcon} />
             <SettingsList.ItemText>
               <Trans>Help</Trans>
             </SettingsList.ItemText>
             <SettingsList.Chevron />
           </SettingsList.PressableItem>
-          <SettingsList.LinkItem to="/settings/about" label={_(msg`About`)}>
+          <SettingsList.LinkItem to="/settings/about" label={l`About`}>
             <SettingsList.ItemIcon icon={BubbleInfoIcon} />
             <SettingsList.ItemText>
               <Trans>About</Trans>
@@ -266,7 +262,7 @@ export function SettingsScreen({}: Props) {
           <SettingsList.PressableItem
             destructive
             onPress={() => signOutPromptControl.open()}
-            label={_(msg`Sign out`)}>
+            label={l`Sign out`}>
             <SettingsList.ItemText>
               <Trans>Sign out</Trans>
             </SettingsList.ItemText>
@@ -283,7 +279,7 @@ export function SettingsScreen({}: Props) {
                   }
                   setShowDevOptions(d => !d)
                 }}
-                label={_(msg`Developer options`)}>
+                label={l`Developer options`}>
                 <SettingsList.ItemIcon icon={CodeBracketsIcon} />
                 <SettingsList.ItemText>
                   <Trans>Developer options</Trans>
@@ -297,11 +293,11 @@ export function SettingsScreen({}: Props) {
 
       <Prompt.Basic
         control={signOutPromptControl}
-        title={_(msg`Sign out?`)}
+        title={l`Sign out?`}
-        description={_(msg`You will be signed out of all your accounts.`)}
+        description={l`You will be signed out of all your accounts.`}
         onConfirm={() => logoutEveryAccount('Settings')}
-        confirmButtonCta={_(msg`Sign out`)}
+        confirmButtonCta={l`Sign out`}
-        cancelButtonCta={_(msg`Cancel`)}
+        cancelButtonCta={l`Cancel`}
         confirmButtonColor="negative"
       />
 
@@ -378,7 +374,7 @@ function ProfilePreview({
 }
 
 function DevOptions() {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const agent = useAgent()
   const [override, setOverride] = useStorage(device, [
     'policyUpdateDebugOverride',
@@ -397,12 +393,12 @@ function DevOptions() {
   const resetOnboarding = () => {
     navigation.navigate('Home')
     onboardingDispatch({type: 'start'})
-    Toast.show(_(msg`Onboarding reset`))
+    Toast.show(l`Onboarding reset`)
   }
 
   const clearAllStorage = async () => {
     await clearStorage()
-    Toast.show(_(msg`Storage cleared, you need to restart the app now.`))
+    Toast.show(l`Storage cleared, you need to restart the app now.`)
   }
 
   const onPressUnsnoozeReminder = () => {
@@ -413,7 +409,7 @@ function DevOptions() {
       ...persisted.get('reminders'),
       lastEmailConfirm: lastEmailConfirm.toISOString(),
     })
-    Toast.show(_(msg`You probably want to restart the app now.`))
+    Toast.show(l`You probably want to restart the app now.`)
   }
 
   const onPressActySubsUnNudge = () => {
@@ -448,42 +444,42 @@ function DevOptions() {
     <>
       <SettingsList.PressableItem
         onPress={() => navigation.navigate('Log')}
-        label={_(msg`Open system log`)}>
+        label={l`Open system log`}>
         <SettingsList.ItemText>
           <Trans>System log</Trans>
         </SettingsList.ItemText>
       </SettingsList.PressableItem>
       <SettingsList.PressableItem
         onPress={() => navigation.navigate('Debug')}
-        label={_(msg`Open storybook page`)}>
+        label={l`Open storybook page`}>
         <SettingsList.ItemText>
           <Trans>Storybook</Trans>
         </SettingsList.ItemText>
       </SettingsList.PressableItem>
       <SettingsList.PressableItem
         onPress={() => navigation.navigate('DebugMod')}
-        label={_(msg`Open moderation debug page`)}>
+        label={l`Open moderation debug page`}>
         <SettingsList.ItemText>
           <Trans>Debug Moderation</Trans>
         </SettingsList.ItemText>
       </SettingsList.PressableItem>
       <SettingsList.PressableItem
         onPress={() => deleteChatDeclarationRecord()}
-        label={_(msg`Open storybook page`)}>
+        label={l`Open storybook page`}>
         <SettingsList.ItemText>
           <Trans>Delete chat declaration record</Trans>
         </SettingsList.ItemText>
       </SettingsList.PressableItem>
       <SettingsList.PressableItem
         onPress={() => void resetOnboarding()}
-        label={_(msg`Reset onboarding state`)}>
+        label={l`Reset onboarding state`}>
         <SettingsList.ItemText>
           <Trans>Reset onboarding state</Trans>
         </SettingsList.ItemText>
       </SettingsList.PressableItem>
       <SettingsList.PressableItem
         onPress={onPressUnsnoozeReminder}
-        label={_(msg`Unsnooze email reminder`)}>
+        label={l`Unsnooze email reminder`}>
         <SettingsList.ItemText>
           <Trans>Unsnooze email reminder</Trans>
         </SettingsList.ItemText>
@@ -491,7 +487,7 @@ function DevOptions() {
       {actyNotifNudged && (
         <SettingsList.PressableItem
           onPress={onPressActySubsUnNudge}
-          label={_(msg`Reset activity subscription nudge`)}>
+          label={l`Reset activity subscription nudge`}>
           <SettingsList.ItemText>
             <Trans>Reset activity subscription nudge</Trans>
           </SettingsList.ItemText>
@@ -499,7 +495,7 @@ function DevOptions() {
       )}
       <SettingsList.PressableItem
         onPress={() => void clearAllStorage()}
-        label={_(msg`Clear all storage data`)}>
+        label={l`Clear all storage data`}>
         <SettingsList.ItemText>
           <Trans>Clear all storage data (restart after this)</Trans>
         </SettingsList.ItemText>
@@ -507,7 +503,7 @@ function DevOptions() {
       {IS_IOS ? (
         <SettingsList.PressableItem
           onPress={onPressApplyOta}
-          label={_(msg`Apply Pull Request`)}>
+          label={l`Apply Pull Request`}>
           <SettingsList.ItemText>
             <Trans>Apply Pull Request</Trans>
           </SettingsList.ItemText>
@@ -516,7 +512,7 @@ function DevOptions() {
       {IS_NATIVE && isCurrentlyRunningPullRequestDeployment ? (
         <SettingsList.PressableItem
           onPress={() => void revertToEmbedded()}
-          label={_(msg`Unapply Pull Request`)}>
+          label={l`Unapply Pull Request`}>
           <SettingsList.ItemText>
             <Trans>Unapply Pull Request {currentChannel}</Trans>
           </SettingsList.ItemText>
@@ -564,7 +560,7 @@ function DevOptions() {
 }
 
 function AddAccountRow() {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {setShowLoggedOut} = useLoggedOutViewControls()
   const closeEverything = useCloseAllActiveElements()
 
@@ -576,7 +572,7 @@ function AddAccountRow() {
   return (
     <SettingsList.PressableItem
       onPress={onAddAnotherAccount}
-      label={_(msg`Add another account`)}>
+      label={l`Add another account`}>
       <SettingsList.ItemIcon icon={PersonPlusIcon} />
       <SettingsList.ItemText>
         <Trans>Add another account</Trans>
@@ -599,7 +595,7 @@ function AccountRow({
     logContext: 'Settings',
   ) => void
 }) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const t = useTheme()
 
   const moderationOpts = useModerationOpts()
@@ -616,7 +612,7 @@ function AccountRow({
     <View style={[a.relative]}>
       <SettingsList.PressableItem
         onPress={onSwitchAccount}
-        label={_(msg`Switch account`)}>
+        label={l`Switch account`}>
         {moderationOpts && profile ? (
           <UserAvatar
             size={28}
@@ -638,7 +634,7 @@ function AccountRow({
       </SettingsList.PressableItem>
       {!pendingDid && (
         <Menu.Root>
-          <Menu.Trigger label={_(msg`Account options`)}>
+          <Menu.Trigger label={l`Account options`}>
             {({props, state}) => (
               <Pressable
                 {...props}
@@ -655,7 +651,7 @@ function AccountRow({
           </Menu.Trigger>
           <Menu.Outer showCancel>
             <Menu.Item
-              label={_(msg`Remove account`)}
+              label={l`Remove account`}
               onPress={() => removePromptControl.open()}>
               <Menu.ItemText>
                 <Trans>Remove account</Trans>
@@ -668,15 +664,13 @@ function AccountRow({
 
       <Prompt.Basic
         control={removePromptControl}
-        title={_(msg`Remove from quick access?`)}
+        title={l`Remove from quick access?`}
-        description={_(
+        description={l`This will remove @${account.handle} from the quick access list.`}
-          msg`This will remove @${account.handle} from the quick access list.`,
-        )}
         onConfirm={() => {
           removeAccount(account)
-          Toast.show(_(msg`Account removed from quick access`))
+          Toast.show(l`Account removed from quick access`)
         }}
-        confirmButtonCta={_(msg`Remove`)}
+        confirmButtonCta={l`Remove`}
         confirmButtonColor="negative"
       />
     </View>