From 2ea9e2c929d5ae013977fb3d2e962296364629ac Mon Sep 17 00:00:00 2001 From: Minseo Lee Date: Tue, 7 May 2024 11:58:04 +0900 Subject: [PATCH] Improve localization marks (#3285) * Update Lightbox.tsx * Change strings for easier localization * Update DeleteAccount.tsx * Update LabelsOnMeDialog.tsx * Update FeedCard.tsx * Update index.tsx * Update LabelsOnMeDialog.tsx * Update index.tsx * Update FeedCard.tsx * Update SelfLabel.tsx * Update Hashtag.tsx * Update index.tsx * Update Hashtag.tsx * Update ChangeHandle.tsx * Update index.web.tsx * Update index.web.tsx * Update index.tsx * Remove unnecessary `` tags * Update Drawer.tsx --- src/components/ProfileHoverCard/index.web.tsx | 18 +++++---- .../moderation/LabelsOnMeDialog.tsx | 2 +- .../moderation/ModerationDetailsDialog.tsx | 16 ++++---- .../Onboarding/StepAlgoFeeds/FeedCard.tsx | 4 +- .../Onboarding/StepInterests/index.tsx | 4 +- src/screens/Profile/Header/Metrics.tsx | 21 ++++------ src/screens/Signup/index.tsx | 12 +++--- src/view/com/lightbox/Lightbox.tsx | 2 +- src/view/com/modals/ChangeHandle.tsx | 4 +- src/view/com/modals/DeleteAccount.tsx | 38 +++++++++---------- src/view/com/modals/SelfLabel.tsx | 6 +-- src/view/shell/Drawer.tsx | 6 +-- 12 files changed, 67 insertions(+), 66 deletions(-) diff --git a/src/components/ProfileHoverCard/index.web.tsx b/src/components/ProfileHoverCard/index.web.tsx index 305327d8..274a4c96 100644 --- a/src/components/ProfileHoverCard/index.web.tsx +++ b/src/components/ProfileHoverCard/index.web.tsx @@ -404,7 +404,9 @@ function Inner({ color={profileShadow.viewer?.following ? 'secondary' : 'primary'} variant="solid" label={ - profileShadow.viewer?.following ? _('Following') : _('Follow') + profileShadow.viewer?.following + ? _(msg`Following`) + : _(msg`Follow`) } style={[a.rounded_full]} onPress={profileShadow.viewer?.following ? unfollow : follow}> @@ -413,7 +415,9 @@ function Inner({ icon={profileShadow.viewer?.following ? Check : Plus} /> - {profileShadow.viewer?.following ? _('Following') : _('Follow')} + {profileShadow.viewer?.following + ? _(msg`Following`) + : _(msg`Follow`)} )} @@ -452,12 +456,10 @@ function Inner({ label={_(msg`${following} following`)} style={[t.atoms.text]} onPress={hide}> - - {following} - - {pluralizedFollowings} - - + {following} + + {pluralizedFollowings} + diff --git a/src/components/moderation/LabelsOnMeDialog.tsx b/src/components/moderation/LabelsOnMeDialog.tsx index 04b4dbd5..176b0494 100644 --- a/src/components/moderation/LabelsOnMeDialog.tsx +++ b/src/components/moderation/LabelsOnMeDialog.tsx @@ -190,7 +190,7 @@ function AppealForm({ }, reason: details, }) - Toast.show(_(msg`Appeal submitted.`)) + Toast.show(_(msg`Appeal submitted`)) } finally { control.close() } diff --git a/src/components/moderation/ModerationDetailsDialog.tsx b/src/components/moderation/ModerationDetailsDialog.tsx index da57de4d..edf82875 100644 --- a/src/components/moderation/ModerationDetailsDialog.tsx +++ b/src/components/moderation/ModerationDetailsDialog.tsx @@ -121,20 +121,20 @@ function ModerationDetailsDialogInner({ <> - - This label was applied by{' '} - {modcause.source.type === 'user' ? ( - the author - ) : ( + {modcause.source.type === 'user' ? ( + This label was applied by the author. + ) : ( + + This label was applied by{' '} control.close()} style={a.text_md}> {desc.source} - )} - . - + . + + )} )} diff --git a/src/screens/Onboarding/StepAlgoFeeds/FeedCard.tsx b/src/screens/Onboarding/StepAlgoFeeds/FeedCard.tsx index 06b5a145..d2b2a5f3 100644 --- a/src/screens/Onboarding/StepAlgoFeeds/FeedCard.tsx +++ b/src/screens/Onboarding/StepAlgoFeeds/FeedCard.tsx @@ -2,7 +2,7 @@ import React from 'react' import {View} from 'react-native' import {Image} from 'expo-image' import {LinearGradient} from 'expo-linear-gradient' -import {msg} from '@lingui/macro' +import {Trans, msg} from '@lingui/macro' import {useLingui} from '@lingui/react' import {FeedSourceInfo, useFeedSourceInfoQuery} from '#/state/queries/feed' @@ -109,7 +109,7 @@ function PrimaryFeedCardInner({ a.py_xs, ctx.selected && styles.textSelected, ]}> - by @{feed.creatorHandle} + by @{feed.creatorHandle} diff --git a/src/screens/Onboarding/StepInterests/index.tsx b/src/screens/Onboarding/StepInterests/index.tsx index df489f57..174488a3 100644 --- a/src/screens/Onboarding/StepInterests/index.tsx +++ b/src/screens/Onboarding/StepInterests/index.tsx @@ -189,9 +189,9 @@ export function StepInterests() { color: t.palette.negative_900, }, ]}> - Error:{' '} + Error:{' '} - {error?.message || 'an unknown error occurred'} + {error?.message || _(msg`an unknown error occurred`)} ) : ( diff --git a/src/screens/Profile/Header/Metrics.tsx b/src/screens/Profile/Header/Metrics.tsx index 6d0a2518..86472968 100644 --- a/src/screens/Profile/Header/Metrics.tsx +++ b/src/screens/Profile/Header/Metrics.tsx @@ -50,21 +50,16 @@ export function ProfileHeaderMetrics({ style={[a.flex_row, t.atoms.text]} to={makeProfileLink(profile, 'follows')} label={_(msg`${following} following`)}> - - {following} - - {pluralizedFollowings} - - + {following} + + {pluralizedFollowings} + - - {formatCount(profile.postsCount || 0)}{' '} - - {plural(profile.postsCount || 0, {one: 'post', other: 'posts'})} - - + {formatCount(profile.postsCount || 0)}{' '} + + {plural(profile.postsCount || 0, {one: 'post', other: 'posts'})} + ) diff --git a/src/screens/Signup/index.tsx b/src/screens/Signup/index.tsx index 5e2596d8..3d8b505b 100644 --- a/src/screens/Signup/index.tsx +++ b/src/screens/Signup/index.tsx @@ -151,11 +151,13 @@ export function Signup({onPressBack}: {onPressBack: () => void}) { ]}> - Step {state.activeStep + 1} of{' '} - {state.serviceDescription && - !state.serviceDescription.phoneVerificationRequired - ? '2' - : '3'} + + Step {state.activeStep + 1} of{' '} + {state.serviceDescription && + !state.serviceDescription.phoneVerificationRequired + ? '2' + : '3'} + {state.activeStep === SignupStep.INFO ? ( diff --git a/src/view/com/lightbox/Lightbox.tsx b/src/view/com/lightbox/Lightbox.tsx index 5bab643c..fd4c486a 100644 --- a/src/view/com/lightbox/Lightbox.tsx +++ b/src/view/com/lightbox/Lightbox.tsx @@ -78,7 +78,7 @@ function LightboxFooter({imageIndex}: {imageIndex: number}) { try { await saveImageToMediaLibrary({uri}) - Toast.show(_(msg`Saved to your camera roll.`)) + Toast.show(_(msg`Saved to your camera roll`)) } catch (e: any) { Toast.show(_(msg`Failed to save image: ${String(e)}`)) } diff --git a/src/view/com/modals/ChangeHandle.tsx b/src/view/com/modals/ChangeHandle.tsx index ae43d1e3..ea49a93f 100644 --- a/src/view/com/modals/ChangeHandle.tsx +++ b/src/view/com/modals/ChangeHandle.tsx @@ -507,7 +507,9 @@ function CustomHandleForm({ {canSave ? _(msg`Update to ${handle}`) - : _(msg`Verify ${isDNSForm ? 'DNS Record' : 'Text File'}`)} + : isDNSForm + ? _(msg`Verify DNS Record`) + : _(msg`Verify Text File`)} )} diff --git a/src/view/com/modals/DeleteAccount.tsx b/src/view/com/modals/DeleteAccount.tsx index 5e68daef..2e23a46b 100644 --- a/src/view/com/modals/DeleteAccount.tsx +++ b/src/view/com/modals/DeleteAccount.tsx @@ -84,26 +84,26 @@ export function Component({}: {}) { - Delete Account + + Delete Account{' '} + + " + + + {currentAccount?.handle} + + + " + + - - - {' "'} - - - {currentAccount?.handle} - - - {'"'} - - {!isEmailSent ? ( <> diff --git a/src/view/com/modals/SelfLabel.tsx b/src/view/com/modals/SelfLabel.tsx index 779a9e71..2b83c7a9 100644 --- a/src/view/com/modals/SelfLabel.tsx +++ b/src/view/com/modals/SelfLabel.tsx @@ -131,10 +131,10 @@ export function Component({ ) : ( - - Not Applicable. - + + Not Applicable. + {' '} This warning is only available for posts with media attached. diff --git a/src/view/shell/Drawer.tsx b/src/view/shell/Drawer.tsx index 04f144e8..b5756920 100644 --- a/src/view/shell/Drawer.tsx +++ b/src/view/shell/Drawer.tsx @@ -97,9 +97,9 @@ let DrawerProfileCard = ({ value={profile?.followersCount || 0} one="follower" other="followers" - />{' '} - ·{' '} - + /> + {' '} + ·{' '} {formatCountShortOnly(profile?.followsCount ?? 0)}