From 3f5bdd8be37efbe3bf7b1b60bea2bfa4e32aa159 Mon Sep 17 00:00:00 2001 From: Minseo Lee Date: Wed, 14 Feb 2024 11:06:37 +0900 Subject: [PATCH 01/33] Mark more texts for localization --- .../AdultContentEnabledPref.tsx | 12 +++-- src/view/com/auth/HomeLoggedOutCTA.tsx | 8 +++- src/view/com/auth/SplashScreen.tsx | 8 +++- src/view/com/auth/create/Policies.tsx | 19 +++++--- src/view/com/auth/create/Step3.tsx | 2 +- src/view/com/auth/login/LoginForm.tsx | 2 +- .../onboarding/RecommendedFollowsItem.tsx | 6 ++- .../com/auth/onboarding/WelcomeMobile.tsx | 6 ++- src/view/com/auth/server-input/index.tsx | 2 +- src/view/com/lightbox/Lightbox.tsx | 4 +- src/view/com/modals/ChangeHandle.tsx | 46 ++++++++++--------- src/view/com/modals/ChangePassword.tsx | 4 +- src/view/com/modals/DeleteAccount.tsx | 6 +-- src/view/com/modals/InAppBrowserConsent.tsx | 2 +- src/view/com/modals/LinkWarning.tsx | 4 +- src/view/com/modals/ModerationDetails.tsx | 2 +- src/view/com/modals/VerifyEmail.tsx | 2 +- .../com/modals/crop-image/CropImage.web.tsx | 12 ++--- .../com/modals/report/InputIssueDetails.tsx | 6 +-- src/view/com/modals/report/Modal.tsx | 7 ++- src/view/com/post-thread/PostThreadItem.tsx | 4 +- .../profile/ProfileHeaderSuggestedFollows.tsx | 14 +++--- src/view/screens/LanguageSettings.tsx | 2 +- src/view/screens/Moderation.tsx | 4 +- src/view/screens/ProfileFeed.tsx | 2 +- src/view/screens/Settings/index.tsx | 32 +++++++------ src/view/shell/NavSignupCard.tsx | 2 +- 27 files changed, 127 insertions(+), 93 deletions(-) diff --git a/src/screens/Onboarding/StepModeration/AdultContentEnabledPref.tsx b/src/screens/Onboarding/StepModeration/AdultContentEnabledPref.tsx index b38b3df1..c3d61640 100644 --- a/src/screens/Onboarding/StepModeration/AdultContentEnabledPref.tsx +++ b/src/screens/Onboarding/StepModeration/AdultContentEnabledPref.tsx @@ -85,7 +85,9 @@ export function AdultContentEnabledPref({ a.align_center, a.py_md, ]}> - Enable Adult Content + + Enable Adult Content + @@ -106,7 +108,9 @@ export function AdultContentEnabledPref({ )} - Adult Content + + Adult Content + Due to Apple policies, adult content can only be enabled on the web @@ -114,7 +118,9 @@ export function AdultContentEnabledPref({ - OK + + OK + diff --git a/src/view/com/auth/HomeLoggedOutCTA.tsx b/src/view/com/auth/HomeLoggedOutCTA.tsx index f796d8ba..a5b5bf7b 100644 --- a/src/view/com/auth/HomeLoggedOutCTA.tsx +++ b/src/view/com/auth/HomeLoggedOutCTA.tsx @@ -52,7 +52,9 @@ export function HomeLoggedOutCTA() { onPress={showCreateAccount} accessibilityRole="button" accessibilityLabel={_(msg`Create new account`)} - accessibilityHint="Opens flow to create a new Bluesky account"> + accessibilityHint={_( + msg`Opens flow to create a new Bluesky account`, + )}> + accessibilityHint={_( + msg`Opens flow to sign into your existing Bluesky account`, + )}> + accessibilityHint={_( + msg`Opens flow to create a new Bluesky account`, + )}> Create a new account @@ -77,7 +79,9 @@ export const SplashScreen = ({ onPress={onPressSignin} accessibilityRole="button" accessibilityLabel={_(msg`Sign in`)} - accessibilityHint="Opens flow to sign into your existing Bluesky account"> + accessibilityHint={_( + msg`Opens flow to sign into your existing Bluesky account`, + )}> Sign In diff --git a/src/view/com/auth/create/Policies.tsx b/src/view/com/auth/create/Policies.tsx index 2c7d6081..803e2ad3 100644 --- a/src/view/com/auth/create/Policies.tsx +++ b/src/view/com/auth/create/Policies.tsx @@ -9,6 +9,8 @@ import {TextLink} from '../../util/Link' import {Text} from '../../util/text/Text' import {s, colors} from 'lib/styles' import {usePalette} from 'lib/hooks/usePalette' +import {Trans, msg} from '@lingui/macro' +import {useLingui} from '@lingui/react' type ServiceDescription = ComAtprotoServerDescribeServer.OutputSchema @@ -20,6 +22,7 @@ export const Policies = ({ needsGuardian: boolean }) => { const pal = usePalette('default') + const {_} = useLingui() if (!serviceDescription) { return } @@ -40,7 +43,9 @@ export const Policies = ({ /> - This service has not provided terms of service or a privacy policy. + + This service has not provided terms of service or a privacy policy. + ) @@ -51,7 +56,7 @@ export const Policies = ({ , ) @@ -61,7 +66,7 @@ export const Policies = ({ , ) @@ -79,12 +84,14 @@ export const Policies = ({ return ( - By creating an account you agree to the {els}. + By creating an account you agree to the {els}. {needsGuardian && ( - If you are not yet an adult according to the laws of your country, - your parent or legal guardian must read these Terms on your behalf. + + If you are not yet an adult according to the laws of your country, + your parent or legal guardian must read these Terms on your behalf. + )} diff --git a/src/view/com/auth/create/Step3.tsx b/src/view/com/auth/create/Step3.tsx index 3a52abf8..afd21a32 100644 --- a/src/view/com/auth/create/Step3.tsx +++ b/src/view/com/auth/create/Step3.tsx @@ -30,7 +30,7 @@ export function Step3({ {profile.description ? ( diff --git a/src/view/com/auth/onboarding/WelcomeMobile.tsx b/src/view/com/auth/onboarding/WelcomeMobile.tsx index 5de1a781..b8659d56 100644 --- a/src/view/com/auth/onboarding/WelcomeMobile.tsx +++ b/src/view/com/auth/onboarding/WelcomeMobile.tsx @@ -6,7 +6,8 @@ import {usePalette} from 'lib/hooks/usePalette' import {FontAwesomeIcon} from '@fortawesome/react-native-fontawesome' import {Button} from 'view/com/util/forms/Button' import {ViewHeader} from 'view/com/util/ViewHeader' -import {Trans} from '@lingui/macro' +import {useLingui} from '@lingui/react' +import {Trans, msg} from '@lingui/macro' type Props = { next: () => void @@ -15,6 +16,7 @@ type Props = { export function WelcomeMobile({next, skip}: Props) { const pal = usePalette('default') + const {_} = useLingui() return ( @@ -91,7 +93,7 @@ export function WelcomeMobile({next, skip}: Props) { {canSave === true && ( @@ -504,8 +506,8 @@ function CustomHandleForm({ ) : ( {canSave - ? `Update to ${handle}` - : `Verify ${isDNSForm ? 'DNS Record' : 'Text File'}`} + ? _(msg`Update to ${handle}`) + : _(msg`Verify ${isDNSForm ? 'DNS Record' : 'Text File'}`)} )} @@ -513,9 +515,9 @@ function CustomHandleForm({ + accessibilityHint={_(msg`Use bsky.social as hosting provider`)}> - Nevermind, create a handle for me + Nevermind, create a handle for me diff --git a/src/view/com/modals/ChangePassword.tsx b/src/view/com/modals/ChangePassword.tsx index d8add979..44d85fc4 100644 --- a/src/view/com/modals/ChangePassword.tsx +++ b/src/view/com/modals/ChangePassword.tsx @@ -180,7 +180,7 @@ export function Component() { Cancel diff --git a/src/view/com/modals/InAppBrowserConsent.tsx b/src/view/com/modals/InAppBrowserConsent.tsx index 86bb46ca..3fa51593 100644 --- a/src/view/com/modals/InAppBrowserConsent.tsx +++ b/src/view/com/modals/InAppBrowserConsent.tsx @@ -77,7 +77,7 @@ export function Component({href}: {href: string}) { }} accessibilityLabel={_(msg`Cancel`)} accessibilityHint="" - label="Cancel" + label={_(msg`Cancel`)} labelContainerStyle={{justifyContent: 'center', padding: 8}} labelStyle={[s.f18]} /> diff --git a/src/view/com/modals/LinkWarning.tsx b/src/view/com/modals/LinkWarning.tsx index 81fdc728..4e6d8f91 100644 --- a/src/view/com/modals/LinkWarning.tsx +++ b/src/view/com/modals/LinkWarning.tsx @@ -74,7 +74,7 @@ export function Component({text, href}: {text: string; href: string}) { onPress={onPressVisit} accessibilityLabel={_(msg`Visit Site`)} accessibilityHint="" - label="Visit Site" + label={_(msg`Visit Site`)} labelContainerStyle={{justifyContent: 'center', padding: 4}} labelStyle={[s.f18]} /> @@ -86,7 +86,7 @@ export function Component({text, href}: {text: string; href: string}) { }} accessibilityLabel={_(msg`Cancel`)} accessibilityHint="" - label="Cancel" + label={_(msg`Cancel`)} labelContainerStyle={{justifyContent: 'center', padding: 4}} labelStyle={[s.f18]} /> diff --git a/src/view/com/modals/ModerationDetails.tsx b/src/view/com/modals/ModerationDetails.tsx index f890d50d..6c022761 100644 --- a/src/view/com/modals/ModerationDetails.tsx +++ b/src/view/com/modals/ModerationDetails.tsx @@ -115,7 +115,7 @@ export function Component({ closeModal() }}> - Okay + Okay diff --git a/src/view/com/modals/VerifyEmail.tsx b/src/view/com/modals/VerifyEmail.tsx index 30a57afc..d3086d38 100644 --- a/src/view/com/modals/VerifyEmail.tsx +++ b/src/view/com/modals/VerifyEmail.tsx @@ -149,7 +149,7 @@ export function Component({showReminder}: {showReminder?: boolean}) { onPress={onEmailIncorrect} style={styles.changeEmailLink}> - Change + Change diff --git a/src/view/com/modals/crop-image/CropImage.web.tsx b/src/view/com/modals/crop-image/CropImage.web.tsx index 6f094a1f..98a2494e 100644 --- a/src/view/com/modals/crop-image/CropImage.web.tsx +++ b/src/view/com/modals/crop-image/CropImage.web.tsx @@ -100,7 +100,7 @@ export function Component({ onPress={doSetAs(AspectRatio.Wide)} accessibilityRole="button" accessibilityLabel={_(msg`Wide`)} - accessibilityHint="Sets image aspect ratio to wide"> + accessibilityHint={_(msg`Sets image aspect ratio to wide`)}> + accessibilityHint={_(msg`Sets image aspect ratio to tall`)}> + accessibilityHint={_(msg`Sets image aspect ratio to square`)}> + accessibilityHint={_(msg`Exits image cropping process`)}> - Cancel + Cancel @@ -142,7 +142,7 @@ export function Component({ onPress={onPressDone} accessibilityRole="button" accessibilityLabel={_(msg`Save image crop`)} - accessibilityHint="Saves image crop settings"> + accessibilityHint={_(msg`Saves image crop settings`)}> + accessibilityHint={_(msg`Add more details to your report`)}> {' '} @@ -49,8 +49,8 @@ export function InputIssueDetails({ + accessibilityHint={_(msg`Add more details to your report`)}> Add details to report diff --git a/src/view/com/post-thread/PostThreadItem.tsx b/src/view/com/post-thread/PostThreadItem.tsx index 826d0d16..fc13fa0e 100644 --- a/src/view/com/post-thread/PostThreadItem.tsx +++ b/src/view/com/post-thread/PostThreadItem.tsx @@ -296,7 +296,7 @@ let PostThreadItemLoaded = ({ color={pal.colors.textLight} /> - Muted + Muted )} @@ -578,7 +578,7 @@ let PostThreadItemLoaded = ({ title={itemTitle} noFeedback> - More + More { try { await queueUnfollow() } catch (e: any) { if (e?.name !== 'AbortError') { - Toast.show('An issue occurred, please try again.') + Toast.show(_(msg`An issue occurred, please try again.`)) } } - }, [queueUnfollow]) + }, [queueUnfollow, _]) if (!moderationOpts) { return null @@ -236,7 +238,7 @@ function SuggestedFollow({ From 44259948ccb290c2a52496491c4a8d1cbbd071ef Mon Sep 17 00:00:00 2001 From: Minseo Lee Date: Wed, 14 Feb 2024 16:14:29 +0900 Subject: [PATCH 02/33] Update Drawer.tsx --- src/view/shell/Drawer.tsx | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/view/shell/Drawer.tsx b/src/view/shell/Drawer.tsx index 2a37d1fe..23a15d6b 100644 --- a/src/view/shell/Drawer.tsx +++ b/src/view/shell/Drawer.tsx @@ -93,10 +93,12 @@ let DrawerProfileCard = ({ {formatCountShortOnly(profile?.followersCount ?? 0)} {' '} {pluralize(profile?.followersCount || 0, 'follower')} ·{' '} - - {formatCountShortOnly(profile?.followsCount ?? 0)} - {' '} - following + + + {formatCountShortOnly(profile?.followsCount ?? 0)} + {' '} + following + ) From a7661b1f6fa38cec33465ce83f3a40afbeffa65a Mon Sep 17 00:00:00 2001 From: Minseo Lee Date: Thu, 15 Feb 2024 09:19:22 +0900 Subject: [PATCH 03/33] Update src/view/screens/Settings/index.tsx Co-authored-by: surfdude29 <149612116+surfdude29@users.noreply.github.com> --- src/view/screens/Settings/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/view/screens/Settings/index.tsx b/src/view/screens/Settings/index.tsx index daabf6de..a4224290 100644 --- a/src/view/screens/Settings/index.tsx +++ b/src/view/screens/Settings/index.tsx @@ -731,7 +731,7 @@ export function SettingsScreen({}: Props) { accessibilityRole="button" accessibilityLabel={_(msg`Change password`)} accessibilityHint={_( - msg`Opens modal for change your Bluesky password`, + msg`Opens modal for changing your Bluesky password`, )}> Date: Thu, 15 Feb 2024 09:19:28 +0900 Subject: [PATCH 04/33] Update src/view/screens/Settings/index.tsx Co-authored-by: surfdude29 <149612116+surfdude29@users.noreply.github.com> --- src/view/screens/Settings/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/view/screens/Settings/index.tsx b/src/view/screens/Settings/index.tsx index a4224290..461c378d 100644 --- a/src/view/screens/Settings/index.tsx +++ b/src/view/screens/Settings/index.tsx @@ -754,7 +754,7 @@ export function SettingsScreen({}: Props) { accessibilityRole="button" accessibilityLabel={_(msg`Export my data`)} accessibilityHint={_( - msg`Opens modal for download Bluesky account data (repository)`, + msg`Opens modal for downloading Bluesky account data (repository)`, )}> Date: Thu, 15 Feb 2024 09:19:40 +0900 Subject: [PATCH 05/33] Update src/view/com/modals/LinkWarning.tsx Co-authored-by: surfdude29 <149612116+surfdude29@users.noreply.github.com> --- src/view/com/modals/LinkWarning.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/view/com/modals/LinkWarning.tsx b/src/view/com/modals/LinkWarning.tsx index 4e6d8f91..6d2f687a 100644 --- a/src/view/com/modals/LinkWarning.tsx +++ b/src/view/com/modals/LinkWarning.tsx @@ -85,7 +85,7 @@ export function Component({text, href}: {text: string; href: string}) { closeModal() }} accessibilityLabel={_(msg`Cancel`)} - accessibilityHint="" + accessibilityHint={_(msg`Cancels opening the linked website`)} label={_(msg`Cancel`)} labelContainerStyle={{justifyContent: 'center', padding: 4}} labelStyle={[s.f18]} From b0cdaf71ddbe9f6ba1b3b4db3536111c6a42f8a8 Mon Sep 17 00:00:00 2001 From: Minseo Lee Date: Thu, 15 Feb 2024 09:19:46 +0900 Subject: [PATCH 06/33] Update src/view/com/modals/LinkWarning.tsx Co-authored-by: surfdude29 <149612116+surfdude29@users.noreply.github.com> --- src/view/com/modals/LinkWarning.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/view/com/modals/LinkWarning.tsx b/src/view/com/modals/LinkWarning.tsx index 6d2f687a..b5ff6700 100644 --- a/src/view/com/modals/LinkWarning.tsx +++ b/src/view/com/modals/LinkWarning.tsx @@ -73,7 +73,7 @@ export function Component({text, href}: {text: string; href: string}) { type="primary" onPress={onPressVisit} accessibilityLabel={_(msg`Visit Site`)} - accessibilityHint="" + accessibilityHint={_(msg`Opens the linked website`)} label={_(msg`Visit Site`)} labelContainerStyle={{justifyContent: 'center', padding: 4}} labelStyle={[s.f18]} From 2823e8aa47698bdaa3c1deae2a8e542e2f80592f Mon Sep 17 00:00:00 2001 From: Minseo Lee Date: Thu, 15 Feb 2024 09:19:54 +0900 Subject: [PATCH 07/33] Update src/view/screens/Moderation.tsx Co-authored-by: surfdude29 <149612116+surfdude29@users.noreply.github.com> --- src/view/screens/Moderation.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/view/screens/Moderation.tsx b/src/view/screens/Moderation.tsx index e96bb396..f12f6be0 100644 --- a/src/view/screens/Moderation.tsx +++ b/src/view/screens/Moderation.tsx @@ -70,7 +70,7 @@ export function ModerationScreen({}: Props) { onPress={onPressContentFiltering} accessibilityRole="tab" accessibilityLabel={_(msg`Content filtering`)} - accessibilityHint=""> + accessibilityHint={_(msg`Opens the content filtering preferences`)}> Date: Thu, 15 Feb 2024 09:39:29 +0900 Subject: [PATCH 08/33] Update index.tsx --- src/view/screens/Settings/index.tsx | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/view/screens/Settings/index.tsx b/src/view/screens/Settings/index.tsx index 461c378d..c39fb500 100644 --- a/src/view/screens/Settings/index.tsx +++ b/src/view/screens/Settings/index.tsx @@ -472,20 +472,20 @@ export function SettingsScreen({}: Props) { label={_(msg`System`)} left onSelect={() => setColorMode('system')} - accessibilityHint={_(msg`Set color theme to system setting`)} + accessibilityHint={_(msg`Sets color theme to system setting`)} /> setColorMode('light')} - accessibilityHint={_(msg`Set color theme to light`)} + accessibilityHint={_(msg`Sets color theme to light`)} /> setColorMode('dark')} - accessibilityHint={_(msg`Set color theme to dark`)} + accessibilityHint={_(msg`Sets color theme to dark`)} /> @@ -504,14 +504,14 @@ export function SettingsScreen({}: Props) { label={_(msg`Dim`)} left onSelect={() => setDarkTheme('dim')} - accessibilityHint={_(msg`Set dark theme to the dim theme`)} + accessibilityHint={_(msg`Sets dark theme to the dim theme`)} /> setDarkTheme('dark')} - accessibilityHint={_(msg`Set dark theme to the dark theme`)} + accessibilityHint={_(msg`Sets dark theme to the dark theme`)} /> @@ -572,9 +572,10 @@ export function SettingsScreen({}: Props) { pal.view, isSwitchingAccounts && styles.dimmed, ]} + onPress={onPressSavedFeeds} + accessibilityRole="button" accessibilityLabel={_(msg`My saved feeds`)} - accessibilityHint={_(msg`Opens screen with all saved feeds`)} - onPress={onPressSavedFeeds}> + accessibilityHint={_(msg`Opens screen with all saved feeds`)}> @@ -673,7 +674,7 @@ export function SettingsScreen({}: Props) { onPress={onPressAppPasswords} accessibilityRole="button" accessibilityLabel={_(msg`App password settings`)} - accessibilityHint={_(msg`Opens the app password settings page`)}> + accessibilityHint={_(msg`Opens the app password settings`)}> + accessibilityHint={_(msg`Opens modal for choosing or creating a new Bluesky username`)}> Date: Thu, 15 Feb 2024 09:41:51 +0900 Subject: [PATCH 09/33] Update index.tsx --- src/view/screens/Settings/index.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/view/screens/Settings/index.tsx b/src/view/screens/Settings/index.tsx index c39fb500..dd208370 100644 --- a/src/view/screens/Settings/index.tsx +++ b/src/view/screens/Settings/index.tsx @@ -695,7 +695,9 @@ export function SettingsScreen({}: Props) { onPress={isSwitchingAccounts ? undefined : onPressChangeHandle} accessibilityRole="button" accessibilityLabel={_(msg`Change handle`)} - accessibilityHint={_(msg`Opens modal for choosing or creating a new Bluesky username`)}> + accessibilityHint={_( + msg`Opens modal for choosing or creating a new Bluesky username`, + )}> Date: Thu, 15 Feb 2024 09:46:30 +0900 Subject: [PATCH 10/33] Update ProfileFeed.tsx --- src/view/screens/ProfileFeed.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/view/screens/ProfileFeed.tsx b/src/view/screens/ProfileFeed.tsx index d502fdbf..4901308b 100644 --- a/src/view/screens/ProfileFeed.tsx +++ b/src/view/screens/ProfileFeed.tsx @@ -103,7 +103,7 @@ export function ProfileFeedScreen(props: Props) { From 312f54cfc02c74bf559bd05ebc026a30f054266f Mon Sep 17 00:00:00 2001 From: Minseo Lee Date: Fri, 16 Feb 2024 10:05:40 +0900 Subject: [PATCH 12/33] Update Moderation.tsx --- src/view/screens/Moderation.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/view/screens/Moderation.tsx b/src/view/screens/Moderation.tsx index f12f6be0..36f1fb83 100644 --- a/src/view/screens/Moderation.tsx +++ b/src/view/screens/Moderation.tsx @@ -70,7 +70,7 @@ export function ModerationScreen({}: Props) { onPress={onPressContentFiltering} accessibilityRole="tab" accessibilityLabel={_(msg`Content filtering`)} - accessibilityHint={_(msg`Opens the content filtering preferences`)}> + accessibilityHint={_(msg`Opens modal for content filtering preferences`)}> Date: Fri, 16 Feb 2024 10:05:43 +0900 Subject: [PATCH 13/33] Update index.tsx --- src/view/screens/Settings/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/view/screens/Settings/index.tsx b/src/view/screens/Settings/index.tsx index dd208370..e2ddd377 100644 --- a/src/view/screens/Settings/index.tsx +++ b/src/view/screens/Settings/index.tsx @@ -776,7 +776,7 @@ export function SettingsScreen({}: Props) { accessibilityRole="button" accessibilityLabel={_(msg`Delete account`)} accessibilityHint={_( - msg`Opens modal for account deletion confirmation. Requires email code.`, + msg`Opens modal for account deletion confirmation. Requires email code`, )}> Date: Fri, 16 Feb 2024 10:08:28 +0900 Subject: [PATCH 14/33] Update Moderation.tsx --- src/view/screens/Moderation.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/view/screens/Moderation.tsx b/src/view/screens/Moderation.tsx index 36f1fb83..9db35806 100644 --- a/src/view/screens/Moderation.tsx +++ b/src/view/screens/Moderation.tsx @@ -70,7 +70,9 @@ export function ModerationScreen({}: Props) { onPress={onPressContentFiltering} accessibilityRole="tab" accessibilityLabel={_(msg`Content filtering`)} - accessibilityHint={_(msg`Opens modal for content filtering preferences`)}> + accessibilityHint={_( + msg`Opens modal for content filtering preferences`, + )}> Date: Fri, 16 Feb 2024 10:16:56 +0900 Subject: [PATCH 15/33] Update ExportCarDialog.tsx --- src/view/screens/Settings/ExportCarDialog.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/view/screens/Settings/ExportCarDialog.tsx b/src/view/screens/Settings/ExportCarDialog.tsx index 720cd4f0..8c028d4d 100644 --- a/src/view/screens/Settings/ExportCarDialog.tsx +++ b/src/view/screens/Settings/ExportCarDialog.tsx @@ -78,8 +78,9 @@ export function ExportCarDialog({ - this blogpost. + this blogpost + .

From 25d7e2449fcb7f23ae636a2d4e00a2191a00ceab Mon Sep 17 00:00:00 2001 From: Minseo Lee Date: Sat, 24 Feb 2024 18:23:14 +0900 Subject: [PATCH 16/33] Update NotFound.tsx --- src/view/screens/NotFound.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/view/screens/NotFound.tsx b/src/view/screens/NotFound.tsx index dfa840ab..bdf55b89 100644 --- a/src/view/screens/NotFound.tsx +++ b/src/view/screens/NotFound.tsx @@ -51,7 +51,7 @@ export const NotFoundScreen = () => { @@ -144,6 +146,7 @@ export function ListMaybePlaceholder({ const navigation = useNavigation() const t = useTheme() const {gtMobile} = useBreakpoints() + const {_} = useLingui() const canGoBack = navigation.canGoBack() const onGoBack = React.useCallback(() => { @@ -218,7 +221,7 @@ export function ListMaybePlaceholder({ )} From 4a858bacd6033a443858d9c599b12adc6ea316c9 Mon Sep 17 00:00:00 2001 From: Minseo Lee Date: Wed, 6 Mar 2024 19:38:13 +0900 Subject: [PATCH 24/33] Update src/view/screens/Settings/index.tsx Co-authored-by: surfdude29 <149612116+surfdude29@users.noreply.github.com> --- src/view/screens/Settings/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/view/screens/Settings/index.tsx b/src/view/screens/Settings/index.tsx index 7a725a66..f0d19e37 100644 --- a/src/view/screens/Settings/index.tsx +++ b/src/view/screens/Settings/index.tsx @@ -531,7 +531,7 @@ export function SettingsScreen({}: Props) { ]} onPress={openFollowingFeedPreferences} accessibilityRole="button" - accessibilityLabel={_(msg`Home feed preferences`)} + accessibilityLabel={_(msg`Following feed preferences`)} accessibilityHint={_(msg`Opens the home feed preferences`)}> Date: Wed, 6 Mar 2024 19:38:23 +0900 Subject: [PATCH 25/33] Update src/view/screens/Settings/index.tsx Co-authored-by: surfdude29 <149612116+surfdude29@users.noreply.github.com> --- src/view/screens/Settings/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/view/screens/Settings/index.tsx b/src/view/screens/Settings/index.tsx index f0d19e37..2e2de1d8 100644 --- a/src/view/screens/Settings/index.tsx +++ b/src/view/screens/Settings/index.tsx @@ -532,7 +532,7 @@ export function SettingsScreen({}: Props) { onPress={openFollowingFeedPreferences} accessibilityRole="button" accessibilityLabel={_(msg`Following feed preferences`)} - accessibilityHint={_(msg`Opens the home feed preferences`)}> + accessibilityHint={_(msg`Opens the Following feed preferences`)}> Date: Wed, 13 Mar 2024 10:41:34 +0900 Subject: [PATCH 26/33] Update index.tsx --- src/components/Menu/index.tsx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/components/Menu/index.tsx b/src/components/Menu/index.tsx index 9be9dd86..051e95b9 100644 --- a/src/components/Menu/index.tsx +++ b/src/components/Menu/index.tsx @@ -17,7 +17,7 @@ import { ItemIconProps, } from '#/components/Menu/types' import {Button, ButtonText} from '#/components/Button' -import {msg} from '@lingui/macro' +import {Trans, msg} from '@lingui/macro' import {useLingui} from '@lingui/react' import {isNative} from 'platform/detection' @@ -209,7 +209,9 @@ function Cancel() { variant="ghost" color="secondary" onPress={() => control.close()}> - Cancel + + Cancel + ) } From 1760043f79f6e50de3bb2df97c3d6fe9c700b035 Mon Sep 17 00:00:00 2001 From: Minseo Lee Date: Wed, 13 Mar 2024 10:41:38 +0900 Subject: [PATCH 27/33] Update index.tsx --- src/components/TagMenu/index.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/components/TagMenu/index.tsx b/src/components/TagMenu/index.tsx index 849a3f42..ae4b50bf 100644 --- a/src/components/TagMenu/index.tsx +++ b/src/components/TagMenu/index.tsx @@ -264,7 +264,9 @@ export function TagMenu({ variant="ghost" color="secondary" onPress={() => control.close()}> - Cancel + + Cancel + )} From 7a0bf7266a5a871fafb08194d794318fb02ac999 Mon Sep 17 00:00:00 2001 From: Minseo Lee Date: Sat, 16 Mar 2024 16:48:58 +0900 Subject: [PATCH 28/33] Update Lists.tsx --- src/components/Lists.tsx | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/components/Lists.tsx b/src/components/Lists.tsx index 8a6dfdc7..f506f52c 100644 --- a/src/components/Lists.tsx +++ b/src/components/Lists.tsx @@ -6,7 +6,7 @@ import {Loader} from '#/components/Loader' import {Trans, msg} from '@lingui/macro' import {useLingui} from '@lingui/react' import {cleanError} from 'lib/strings/errors' -import {Button} from '#/components/Button' +import {Button, ButtonText} from '#/components/Button' import {Text} from '#/components/Typography' import {StackActions} from '@react-navigation/native' import {router} from '#/routes' @@ -223,7 +223,7 @@ export function ListMaybePlaceholder({ )} From b4480738e3346b8b80fcdc3481b1de3266577ca0 Mon Sep 17 00:00:00 2001 From: Minseo Lee Date: Sat, 16 Mar 2024 16:50:15 +0900 Subject: [PATCH 29/33] Update ReasonOptions.tsx --- src/view/com/modals/report/ReasonOptions.tsx | 45 +++++++++++--------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/src/view/com/modals/report/ReasonOptions.tsx b/src/view/com/modals/report/ReasonOptions.tsx index 23b49b66..de904556 100644 --- a/src/view/com/modals/report/ReasonOptions.tsx +++ b/src/view/com/modals/report/ReasonOptions.tsx @@ -1,63 +1,66 @@ import {View} from 'react-native' import React, {useMemo} from 'react' import {AtUri, ComAtprotoModerationDefs} from '@atproto/api' +import {Trans} from '@lingui/macro' import {Text} from '../../util/text/Text' import {UsePaletteValue, usePalette} from 'lib/hooks/usePalette' import {RadioGroup, RadioGroupItem} from 'view/com/util/forms/RadioGroup' import {CollectionId} from './types' -type ReasonMap = Record +type ReasonMap = Record const CommonReasons = { [ComAtprotoModerationDefs.REASONRUDE]: { - title: 'Anti-Social Behavior', - description: 'Harassment, trolling, or intolerance', + title: Anti-Social Behavior, + description: Harassment, trolling, or intolerance, }, [ComAtprotoModerationDefs.REASONVIOLATION]: { - title: 'Illegal and Urgent', - description: 'Glaring violations of law or terms of service', + title: Illegal and Urgent, + description: Glaring violations of law or terms of service, }, [ComAtprotoModerationDefs.REASONOTHER]: { - title: 'Other', - description: 'An issue not included in these options', + title: Other, + description: An issue not included in these options, }, } const CollectionToReasonsMap: Record = { [CollectionId.Post]: { [ComAtprotoModerationDefs.REASONSPAM]: { - title: 'Spam', - description: 'Excessive mentions or replies', + title: Spam, + description: Excessive mentions or replies, }, [ComAtprotoModerationDefs.REASONSEXUAL]: { - title: 'Unwanted Sexual Content', - description: 'Nudity or pornography not labeled as such', + title: Unwanted Sexual Content, + description: Nudity or pornography not labeled as such, }, __copyright__: { - title: 'Copyright Violation', - description: 'Contains copyrighted material', + title: Copyright Violation, + description: Contains copyrighted material, }, ...CommonReasons, }, [CollectionId.List]: { ...CommonReasons, [ComAtprotoModerationDefs.REASONVIOLATION]: { - title: 'Name or Description Violates Community Standards', - description: 'Terms used violate community standards', + title: Name or Description Violates Community Standards, + description: Terms used violate community standards, }, }, } const AccountReportReasons = { [ComAtprotoModerationDefs.REASONMISLEADING]: { - title: 'Misleading Account', - description: 'Impersonation or false claims about identity or affiliation', + title: Misleading Account, + description: ( + Impersonation or false claims about identity or affiliation + ), }, [ComAtprotoModerationDefs.REASONSPAM]: { - title: 'Frequently Posts Unwanted Content', - description: 'Spam; excessive mentions or replies', + title: Frequently Posts Unwanted Content, + description: Spam; excessive mentions or replies, }, [ComAtprotoModerationDefs.REASONVIOLATION]: { - title: 'Name or Description Violates Community Standards', - description: 'Terms used violate community standards', + title: Name or Description Violates Community Standards, + description: Terms used violate community standards, }, } From 12d8f0071abc02eda8b09c181ff69d188b5b6fe5 Mon Sep 17 00:00:00 2001 From: Minseo Lee Date: Sat, 16 Mar 2024 16:56:56 +0900 Subject: [PATCH 30/33] Update ReasonOptions.tsx --- src/view/com/modals/report/ReasonOptions.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/view/com/modals/report/ReasonOptions.tsx b/src/view/com/modals/report/ReasonOptions.tsx index de904556..1c67bd26 100644 --- a/src/view/com/modals/report/ReasonOptions.tsx +++ b/src/view/com/modals/report/ReasonOptions.tsx @@ -70,8 +70,8 @@ const Option = ({ description, }: { pal: UsePaletteValue - description: string - title: string + description: JSX.Element + title: JSX.Element }) => { return ( From a3786ee5cddceaa6efa78bf4ec2c9768f3abc674 Mon Sep 17 00:00:00 2001 From: Minseo Lee Date: Sat, 16 Mar 2024 17:02:05 +0900 Subject: [PATCH 31/33] Update Modal.tsx --- src/view/com/modals/report/Modal.tsx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/view/com/modals/report/Modal.tsx b/src/view/com/modals/report/Modal.tsx index 236f3273..dbe36484 100644 --- a/src/view/com/modals/report/Modal.tsx +++ b/src/view/com/modals/report/Modal.tsx @@ -23,10 +23,10 @@ const DMCA_LINK = 'https://bsky.social/about/support/copyright' export const snapPoints = [575] const CollectionNames = { - [CollectionId.FeedGenerator]: 'Feed', - [CollectionId.Profile]: 'Profile', - [CollectionId.List]: 'List', - [CollectionId.Post]: 'Post', + [CollectionId.FeedGenerator]: Feed, + [CollectionId.Profile]: Profile, + [CollectionId.List]: List, + [CollectionId.Post]: Post, } type ReportComponentProps = @@ -129,9 +129,9 @@ export function Component(content: ReportComponentProps) { // If no atUri is passed, that means the reporting collection is account const getCollectionNameForReport = (atUri: AtUri | null) => { - if (!atUri) return 'Account' + if (!atUri) return Account // Generic fallback for any collection being reported - return CollectionNames[atUri.collection as CollectionId] || 'Content' + return CollectionNames[atUri.collection as CollectionId] || Content } const SelectIssue = ({ From 86d036cca8ea1546908b2e53b985162bc8023d3d Mon Sep 17 00:00:00 2001 From: Minseo Lee Date: Sat, 16 Mar 2024 17:04:45 +0900 Subject: [PATCH 32/33] Update Modal.tsx --- src/view/com/modals/report/Modal.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/view/com/modals/report/Modal.tsx b/src/view/com/modals/report/Modal.tsx index dbe36484..90697b07 100644 --- a/src/view/com/modals/report/Modal.tsx +++ b/src/view/com/modals/report/Modal.tsx @@ -131,7 +131,9 @@ export function Component(content: ReportComponentProps) { const getCollectionNameForReport = (atUri: AtUri | null) => { if (!atUri) return Account // Generic fallback for any collection being reported - return CollectionNames[atUri.collection as CollectionId] || Content + return ( + CollectionNames[atUri.collection as CollectionId] || Content + ) } const SelectIssue = ({ From 73dae9f7b5c169aa303e9ef9487040e850998edf Mon Sep 17 00:00:00 2001 From: Minseo Lee Date: Sat, 16 Mar 2024 17:17:54 +0900 Subject: [PATCH 33/33] Update Modal.tsx --- src/view/com/modals/report/Modal.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/view/com/modals/report/Modal.tsx b/src/view/com/modals/report/Modal.tsx index 90697b07..02ecefc0 100644 --- a/src/view/com/modals/report/Modal.tsx +++ b/src/view/com/modals/report/Modal.tsx @@ -26,7 +26,7 @@ const CollectionNames = { [CollectionId.FeedGenerator]: Feed, [CollectionId.Profile]: Profile, [CollectionId.List]: List, - [CollectionId.Post]: Post, + [CollectionId.Post]: Post, } type ReportComponentProps =