An ATproto social media client -- with an independent Appview.

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 `<Trans>` tags

* Update Drawer.tsx

authored by quiple.dev and committed by

GitHub 2ea9e2c9 4fad18b2

+67 -66
+10 -8
src/components/ProfileHoverCard/index.web.tsx
··· 404 404 color={profileShadow.viewer?.following ? 'secondary' : 'primary'} 405 405 variant="solid" 406 406 label={ 407 - profileShadow.viewer?.following ? _('Following') : _('Follow') 407 + profileShadow.viewer?.following 408 + ? _(msg`Following`) 409 + : _(msg`Follow`) 408 410 } 409 411 style={[a.rounded_full]} 410 412 onPress={profileShadow.viewer?.following ? unfollow : follow}> ··· 413 415 icon={profileShadow.viewer?.following ? Check : Plus} 414 416 /> 415 417 <ButtonText> 416 - {profileShadow.viewer?.following ? _('Following') : _('Follow')} 418 + {profileShadow.viewer?.following 419 + ? _(msg`Following`) 420 + : _(msg`Follow`)} 417 421 </ButtonText> 418 422 </Button> 419 423 )} ··· 452 456 label={_(msg`${following} following`)} 453 457 style={[t.atoms.text]} 454 458 onPress={hide}> 455 - <Trans> 456 - <Text style={[a.text_md, a.font_bold]}>{following} </Text> 457 - <Text style={[t.atoms.text_contrast_medium]}> 458 - {pluralizedFollowings} 459 - </Text> 460 - </Trans> 459 + <Text style={[a.text_md, a.font_bold]}>{following} </Text> 460 + <Text style={[t.atoms.text_contrast_medium]}> 461 + {pluralizedFollowings} 462 + </Text> 461 463 </InlineLinkText> 462 464 </View> 463 465
+1 -1
src/components/moderation/LabelsOnMeDialog.tsx
··· 190 190 }, 191 191 reason: details, 192 192 }) 193 - Toast.show(_(msg`Appeal submitted.`)) 193 + Toast.show(_(msg`Appeal submitted`)) 194 194 } finally { 195 195 control.close() 196 196 }
+8 -8
src/components/moderation/ModerationDetailsDialog.tsx
··· 121 121 <> 122 122 <Divider /> 123 123 <Text style={[t.atoms.text, a.text_md, a.leading_snug, a.mt_lg]}> 124 - <Trans> 125 - This label was applied by{' '} 126 - {modcause.source.type === 'user' ? ( 127 - <Trans>the author</Trans> 128 - ) : ( 124 + {modcause.source.type === 'user' ? ( 125 + <Trans>This label was applied by the author.</Trans> 126 + ) : ( 127 + <Trans> 128 + This label was applied by{' '} 129 129 <InlineLinkText 130 130 to={makeProfileLink({did: modcause.label.src, handle: ''})} 131 131 onPress={() => control.close()} 132 132 style={a.text_md}> 133 133 {desc.source} 134 134 </InlineLinkText> 135 - )} 136 - . 137 - </Trans> 135 + . 136 + </Trans> 137 + )} 138 138 </Text> 139 139 </> 140 140 )}
+2 -2
src/screens/Onboarding/StepAlgoFeeds/FeedCard.tsx
··· 2 2 import {View} from 'react-native' 3 3 import {Image} from 'expo-image' 4 4 import {LinearGradient} from 'expo-linear-gradient' 5 - import {msg} from '@lingui/macro' 5 + import {Trans, msg} from '@lingui/macro' 6 6 import {useLingui} from '@lingui/react' 7 7 8 8 import {FeedSourceInfo, useFeedSourceInfoQuery} from '#/state/queries/feed' ··· 109 109 a.py_xs, 110 110 ctx.selected && styles.textSelected, 111 111 ]}> 112 - by @{feed.creatorHandle} 112 + <Trans>by @{feed.creatorHandle}</Trans> 113 113 </Text> 114 114 </View> 115 115
+2 -2
src/screens/Onboarding/StepInterests/index.tsx
··· 189 189 color: t.palette.negative_900, 190 190 }, 191 191 ]}> 192 - Error:{' '} 192 + <Trans>Error:</Trans>{' '} 193 193 </Text> 194 - {error?.message || 'an unknown error occurred'} 194 + {error?.message || _(msg`an unknown error occurred`)} 195 195 </Text> 196 196 </View> 197 197 ) : (
+8 -13
src/screens/Profile/Header/Metrics.tsx
··· 50 50 style={[a.flex_row, t.atoms.text]} 51 51 to={makeProfileLink(profile, 'follows')} 52 52 label={_(msg`${following} following`)}> 53 - <Trans> 54 - <Text style={[a.font_bold, a.text_md]}>{following} </Text> 55 - <Text style={[t.atoms.text_contrast_medium, a.text_md]}> 56 - {pluralizedFollowings} 57 - </Text> 58 - </Trans> 53 + <Text style={[a.font_bold, a.text_md]}>{following} </Text> 54 + <Text style={[t.atoms.text_contrast_medium, a.text_md]}> 55 + {pluralizedFollowings} 56 + </Text> 59 57 </InlineLinkText> 60 58 <Text style={[a.font_bold, t.atoms.text, a.text_md]}> 61 - <Trans> 62 - {formatCount(profile.postsCount || 0)}{' '} 63 - <Text 64 - style={[t.atoms.text_contrast_medium, a.font_normal, a.text_md]}> 65 - {plural(profile.postsCount || 0, {one: 'post', other: 'posts'})} 66 - </Text> 67 - </Trans> 59 + {formatCount(profile.postsCount || 0)}{' '} 60 + <Text style={[t.atoms.text_contrast_medium, a.font_normal, a.text_md]}> 61 + {plural(profile.postsCount || 0, {one: 'post', other: 'posts'})} 62 + </Text> 68 63 </Text> 69 64 </View> 70 65 )
+7 -5
src/screens/Signup/index.tsx
··· 151 151 ]}> 152 152 <View style={[a.gap_sm, a.pb_3xl]}> 153 153 <Text style={[a.font_semibold, t.atoms.text_contrast_medium]}> 154 - <Trans>Step</Trans> {state.activeStep + 1} <Trans>of</Trans>{' '} 155 - {state.serviceDescription && 156 - !state.serviceDescription.phoneVerificationRequired 157 - ? '2' 158 - : '3'} 154 + <Trans> 155 + Step {state.activeStep + 1} of{' '} 156 + {state.serviceDescription && 157 + !state.serviceDescription.phoneVerificationRequired 158 + ? '2' 159 + : '3'} 160 + </Trans> 159 161 </Text> 160 162 <Text style={[a.text_3xl, a.font_bold]}> 161 163 {state.activeStep === SignupStep.INFO ? (
+1 -1
src/view/com/lightbox/Lightbox.tsx
··· 78 78 79 79 try { 80 80 await saveImageToMediaLibrary({uri}) 81 - Toast.show(_(msg`Saved to your camera roll.`)) 81 + Toast.show(_(msg`Saved to your camera roll`)) 82 82 } catch (e: any) { 83 83 Toast.show(_(msg`Failed to save image: ${String(e)}`)) 84 84 }
+3 -1
src/view/com/modals/ChangeHandle.tsx
··· 507 507 <Text type="xl-medium" style={[s.white, s.textCenter]}> 508 508 {canSave 509 509 ? _(msg`Update to ${handle}`) 510 - : _(msg`Verify ${isDNSForm ? 'DNS Record' : 'Text File'}`)} 510 + : isDNSForm 511 + ? _(msg`Verify DNS Record`) 512 + : _(msg`Verify Text File`)} 511 513 </Text> 512 514 )} 513 515 </Button>
+19 -19
src/view/com/modals/DeleteAccount.tsx
··· 84 84 <ScrollView style={[pal.view]} keyboardShouldPersistTaps="handled"> 85 85 <View style={[styles.titleContainer, pal.view]}> 86 86 <Text type="title-xl" style={[s.textCenter, pal.text]}> 87 - <Trans>Delete Account</Trans> 87 + <Trans> 88 + Delete Account{' '} 89 + <Text type="title-xl" style={[pal.text, s.bold]}> 90 + " 91 + </Text> 92 + <Text 93 + type="title-xl" 94 + numberOfLines={1} 95 + style={[ 96 + isMobile ? styles.titleMobile : styles.titleDesktop, 97 + pal.text, 98 + s.bold, 99 + ]}> 100 + {currentAccount?.handle} 101 + </Text> 102 + <Text type="title-xl" style={[pal.text, s.bold]}> 103 + " 104 + </Text> 105 + </Trans> 88 106 </Text> 89 - <View style={[pal.view, s.flexRow]}> 90 - <Text type="title-xl" style={[pal.text, s.bold]}> 91 - {' "'} 92 - </Text> 93 - <Text 94 - type="title-xl" 95 - numberOfLines={1} 96 - style={[ 97 - isMobile ? styles.titleMobile : styles.titleDesktop, 98 - pal.text, 99 - s.bold, 100 - ]}> 101 - {currentAccount?.handle} 102 - </Text> 103 - <Text type="title-xl" style={[pal.text, s.bold]}> 104 - {'"'} 105 - </Text> 106 - </View> 107 107 </View> 108 108 {!isEmailSent ? ( 109 109 <>
+3 -3
src/view/com/modals/SelfLabel.tsx
··· 131 131 ) : ( 132 132 <View> 133 133 <Text style={[pal.textLight]}> 134 - <Text type="md-bold" style={[pal.textLight, s.mr5]}> 135 - <Trans>Not Applicable.</Trans> 136 - </Text> 137 134 <Trans> 135 + <Text type="md-bold" style={[pal.textLight]}> 136 + Not Applicable. 137 + </Text>{' '} 138 138 This warning is only available for posts with media attached. 139 139 </Trans> 140 140 </Text>
+3 -3
src/view/shell/Drawer.tsx
··· 97 97 value={profile?.followersCount || 0} 98 98 one="follower" 99 99 other="followers" 100 - />{' '} 101 - &middot;{' '} 102 - </Trans> 100 + /> 101 + </Trans>{' '} 102 + &middot;{' '} 103 103 <Trans> 104 104 <Text type="xl-medium" style={pal.text}> 105 105 {formatCountShortOnly(profile?.followsCount ?? 0)}