+6

src/Navigation.tsx

··· 158 159 /** 160 * These "common screens" are reused across stacks. 0 0 0 0 0 0 161 */ 162 function commonScreens(Stack: typeof Flat, unreadCountLabel?: string) { 163 const title = (page: MessageDescriptor) =>

··· 158 159 /** 160 * These "common screens" are reused across stacks. 161 + * 162 + * Note: Navigation titles use i18n._() which evaluates at setup time, not render time. 163 + * This means they cannot dynamically respond to terminology preference changes. 164 + * All in-app content (buttons, dialogs, messages) uses the terminology system, 165 + * but these navigation bar titles remain static. This is a low-impact limitation 166 + * as navigation titles are rarely noticed by users. 167 */ 168 function commonScreens(Stack: typeof Flat, unreadCountLabel?: string) { 169 const title = (page: MessageDescriptor) =>

+23 -4

src/components/PostControls/BookmarkButton.tsx

··· 6 import type React from 'react' 7 8 import {useCleanError} from '#/lib/hooks/useCleanError' 0 0 9 import {logger} from '#/logger' 10 import {type Shadow} from '#/state/cache/post-shadow' 11 import {useBookmarkMutation} from '#/state/queries/bookmarks/useBookmarkMutation' ··· 29 }): React.ReactNode { 30 const t = useTheme() 31 const {_} = useLingui() 0 32 const {mutateAsync: bookmark} = useBookmarkMutation() 33 const cleanError = useCleanError() 34 const requireAuth = useRequireAuth() ··· 56 <toast.Outer> 57 <toast.Icon /> 58 <toast.Text> 59 - <Trans>Skeet saved</Trans> 0 0 0 0 60 </toast.Text> 61 {!disableUndo && ( 62 <toast.Action ··· 91 <toast.Outer> 92 <toast.Icon icon={TrashIcon} /> 93 <toast.Text> 94 - <Trans>Removed from saved skeets</Trans> 0 0 0 0 95 </toast.Text> 96 {!disableUndo && ( 97 <toast.Action ··· 125 big={big} 126 label={ 127 isBookmarked 128 - ? _(msg`Remove from saved skeets`) 129 - : _(msg`Add to saved skeets`) 0 0 0 0 0 0 0 0 130 } 131 onPress={onHandlePress} 132 hitSlop={hitSlop}>

··· 6 import type React from 'react' 7 8 import {useCleanError} from '#/lib/hooks/useCleanError' 9 + import {getTerminology} from '#/lib/strings/terminology' 10 + import {useTerminologyPreference} from '#/state/preferences' 11 import {logger} from '#/logger' 12 import {type Shadow} from '#/state/cache/post-shadow' 13 import {useBookmarkMutation} from '#/state/queries/bookmarks/useBookmarkMutation' ··· 31 }): React.ReactNode { 32 const t = useTheme() 33 const {_} = useLingui() 34 + const terminologyPreference = useTerminologyPreference() 35 const {mutateAsync: bookmark} = useBookmarkMutation() 36 const cleanError = useCleanError() 37 const requireAuth = useRequireAuth() ··· 59 <toast.Outer> 60 <toast.Icon /> 61 <toast.Text> 62 + <Trans>{_(getTerminology(terminologyPreference, { 63 + skeet: msg`Skeet saved`, 64 + post: msg`Post saved`, 65 + spell: msg`Spell saved`, 66 + }))}</Trans> 67 </toast.Text> 68 {!disableUndo && ( 69 <toast.Action ··· 98 <toast.Outer> 99 <toast.Icon icon={TrashIcon} /> 100 <toast.Text> 101 + <Trans>{_(getTerminology(terminologyPreference, { 102 + skeet: msg`Removed from saved skeets`, 103 + post: msg`Removed from saved posts`, 104 + spell: msg`Removed from saved spells`, 105 + }))}</Trans> 106 </toast.Text> 107 {!disableUndo && ( 108 <toast.Action ··· 136 big={big} 137 label={ 138 isBookmarked 139 + ? _(getTerminology(terminologyPreference, { 140 + skeet: msg`Remove from saved skeets`, 141 + post: msg`Remove from saved posts`, 142 + spell: msg`Remove from saved spells`, 143 + })) 144 + : _(getTerminology(terminologyPreference, { 145 + skeet: msg`Add to saved skeets`, 146 + post: msg`Add to saved posts`, 147 + spell: msg`Add to saved spells`, 148 + })) 149 } 150 onPress={onHandlePress} 151 hitSlop={hitSlop}>

+24 -22

src/components/PostControls/PostMenu/PostMenuItems.tsx

··· 47 import {useFeedFeedbackContext} from '#/state/feed-feedback' 48 import {useLanguagePrefs} from '#/state/preferences' 49 import {useHiddenPosts, useHiddenPostsApi} from '#/state/preferences' 0 50 import {usePinnedPostMutation} from '#/state/queries/pinned-post' 51 import { 52 usePostDeleteMutation, ··· 188 postUri: post.uri, 189 rootPostUri: rootUri, 190 }) 0 191 192 const href = useMemo(() => { 193 const urip = new AtUri(postUri) ··· 197 const onDeletePost = () => { 198 deletePostMutate({uri: postUri}).then( 199 () => { 200 - Toast.show(_(msg({message: 'Skeet deleted', context: 'toast'}))) 201 202 const route = getCurrentRoute(navigation.getState()) 203 if (route.name === 'PostThread') { ··· 217 }, 218 e => { 219 logger.error('Failed to delete post', {message: e}) 220 - Toast.show(_(msg`Failed to delete skeet, please try again`), 'xmark') 221 }, 222 ) 223 } ··· 475 }) 476 Toast.show( 477 isDetach 478 - ? _(msg`Quote skeet was successfully detached`) 479 - : _(msg`Quote skeet was re-attached`), 480 ) 481 } catch (e: any) { 482 Toast.show( ··· 667 <> 668 <Prompt.Basic 669 control={redraftPromptControl} 670 - title={_(msg`Redraft this skeet?`)} 671 description={_( 672 - msg`This will delete the original skeet and open the composer with its content.`, 673 )} 674 onConfirm={onConfirmRedraft} 675 confirmButtonCta={_(msg`Redraft`)} ··· 753 754 <Menu.Item 755 testID="postDropdownCopyTextBtn" 756 - label={_(msg`Copy post text`)} 757 onPress={onCopyPostText}> 758 - <Menu.ItemText>{_(msg`Copy skeet text`)}</Menu.ItemText> 759 <Menu.ItemIcon icon={ClipboardIcon} position="right" /> 760 </Menu.Item> 761 </> 762 ) : ( 763 <Menu.Item 764 testID="postDropdownSignInBtn" 765 - label={_(msg`Sign in to view skeet`)} 766 onPress={onSignIn}> 767 - <Menu.ItemText>{_(msg`Sign in to view skeet`)}</Menu.ItemText> 768 <Menu.ItemIcon icon={Eye} position="right" /> 769 </Menu.Item> 770 )} ··· 847 label={ 848 isReply 849 ? _(msg`Hide reply for me`) 850 - : _(msg`Hide skeet for me`) 851 } 852 onPress={() => hidePromptControl.open()}> 853 <Menu.ItemText> 854 {isReply 855 ? _(msg`Hide reply for me`) 856 - : _(msg`Hide skeet for me`)} 857 </Menu.ItemText> 858 <Menu.ItemIcon icon={EyeSlash} position="right" /> 859 </Menu.Item> ··· 955 956 <Menu.Item 957 testID="postDropdownReportBtn" 958 - label={_(msg`Report skeet`)} 959 onPress={() => reportDialogControl.open()}> 960 - <Menu.ItemText>{_(msg`Report skeet`)}</Menu.ItemText> 961 <Menu.ItemIcon icon={Warning} position="right" /> 962 </Menu.Item> 963 </> ··· 986 </Menu.Item> 987 <Menu.Item 988 testID="postDropdownDeleteBtn" 989 - label={_(msg`Delete post`)} 990 onPress={() => deletePromptControl.open()}> 991 - <Menu.ItemText>{_(msg`Delete skeet`)}</Menu.ItemText> 992 <Menu.ItemIcon icon={Trash} position="right" /> 993 </Menu.Item> 994 </> ··· 1000 1001 <Prompt.Basic 1002 control={deletePromptControl} 1003 - title={_(msg`Delete this skeet?`)} 1004 description={_( 1005 - msg`If you remove this skeet, you won't be able to recover it.`, 1006 )} 1007 onConfirm={onDeletePost} 1008 confirmButtonCta={_(msg`Delete`)} ··· 1011 1012 <Prompt.Basic 1013 control={hidePromptControl} 1014 - title={isReply ? _(msg`Hide this reply?`) : _(msg`Hide this skeet?`)} 1015 description={_( 1016 - msg`This skeet will be hidden from feeds and threads. This cannot be undone.`, 1017 )} 1018 onConfirm={onHidePost} 1019 confirmButtonCta={_(msg`Hide`)} ··· 1036 1037 <Prompt.Basic 1038 control={quotePostDetachConfirmControl} 1039 - title={_(msg`Detach quote skeet?`)} 1040 description={_( 1041 - msg`This will remove your skeet from this quote skeet for all users, and replace it with a placeholder.`, 1042 )} 1043 onConfirm={onToggleQuotePostAttachment} 1044 confirmButtonCta={_(msg`Yes, detach`)}

··· 47 import {useFeedFeedbackContext} from '#/state/feed-feedback' 48 import {useLanguagePrefs} from '#/state/preferences' 49 import {useHiddenPosts, useHiddenPostsApi} from '#/state/preferences' 50 + import {useTerminology} from '#/lib/hooks/useTerminology' 51 import {usePinnedPostMutation} from '#/state/queries/pinned-post' 52 import { 53 usePostDeleteMutation, ··· 189 postUri: post.uri, 190 rootPostUri: rootUri, 191 }) 192 + const terminology = useTerminology() 193 194 const href = useMemo(() => { 195 const urip = new AtUri(postUri) ··· 199 const onDeletePost = () => { 200 deletePostMutate({uri: postUri}).then( 201 () => { 202 + Toast.show(_(msg({message: `${_(terminology.post)} deleted`, context: 'toast'}))) 203 204 const route = getCurrentRoute(navigation.getState()) 205 if (route.name === 'PostThread') { ··· 219 }, 220 e => { 221 logger.error('Failed to delete post', {message: e}) 222 + Toast.show(_(msg`Failed to delete ${_(terminology.post)}, please try again`), 'xmark') 223 }, 224 ) 225 } ··· 477 }) 478 Toast.show( 479 isDetach 480 + ? _(msg`Quote ${_(terminology.post)} was successfully detached`) 481 + : _(msg`Quote ${_(terminology.post)} was re-attached`), 482 ) 483 } catch (e: any) { 484 Toast.show( ··· 669 <> 670 <Prompt.Basic 671 control={redraftPromptControl} 672 + title={_(msg`Redraft this ${_(terminology.post)}?`)} 673 description={_( 674 + msg`This will delete the original ${_(terminology.post)} and open the composer with its content.`, 675 )} 676 onConfirm={onConfirmRedraft} 677 confirmButtonCta={_(msg`Redraft`)} ··· 755 756 <Menu.Item 757 testID="postDropdownCopyTextBtn" 758 + label={_(msg`Copy ${_(terminology.post)} text`)} 759 onPress={onCopyPostText}> 760 + <Menu.ItemText>{_(msg`Copy ${_(terminology.post)} text`)}</Menu.ItemText> 761 <Menu.ItemIcon icon={ClipboardIcon} position="right" /> 762 </Menu.Item> 763 </> 764 ) : ( 765 <Menu.Item 766 testID="postDropdownSignInBtn" 767 + label={_(msg`Sign in to view ${_(terminology.post)}`)} 768 onPress={onSignIn}> 769 + <Menu.ItemText>{_(msg`Sign in to view ${_(terminology.post)}`)}</Menu.ItemText> 770 <Menu.ItemIcon icon={Eye} position="right" /> 771 </Menu.Item> 772 )} ··· 849 label={ 850 isReply 851 ? _(msg`Hide reply for me`) 852 + : _(msg`Hide ${_(terminology.post)} for me`) 853 } 854 onPress={() => hidePromptControl.open()}> 855 <Menu.ItemText> 856 {isReply 857 ? _(msg`Hide reply for me`) 858 + : _(msg`Hide ${_(terminology.post)} for me`)} 859 </Menu.ItemText> 860 <Menu.ItemIcon icon={EyeSlash} position="right" /> 861 </Menu.Item> ··· 957 958 <Menu.Item 959 testID="postDropdownReportBtn" 960 + label={_(msg`Report ${_(terminology.post)}`)} 961 onPress={() => reportDialogControl.open()}> 962 + <Menu.ItemText>{_(msg`Report ${_(terminology.post)}`)}</Menu.ItemText> 963 <Menu.ItemIcon icon={Warning} position="right" /> 964 </Menu.Item> 965 </> ··· 988 </Menu.Item> 989 <Menu.Item 990 testID="postDropdownDeleteBtn" 991 + label={_(msg`Delete ${_(terminology.post)}`)} 992 onPress={() => deletePromptControl.open()}> 993 + <Menu.ItemText>{_(msg`Delete ${_(terminology.post)}`)}</Menu.ItemText> 994 <Menu.ItemIcon icon={Trash} position="right" /> 995 </Menu.Item> 996 </> ··· 1002 1003 <Prompt.Basic 1004 control={deletePromptControl} 1005 + title={_(msg`Delete this ${_(terminology.post)}?`)} 1006 description={_( 1007 + msg`If you remove this ${_(terminology.post)}, you won't be able to recover it.`, 1008 )} 1009 onConfirm={onDeletePost} 1010 confirmButtonCta={_(msg`Delete`)} ··· 1013 1014 <Prompt.Basic 1015 control={hidePromptControl} 1016 + title={isReply ? _(msg`Hide this reply?`) : _(msg`Hide this ${_(terminology.post)}?`)} 1017 description={_( 1018 + msg`This ${_(terminology.post)} will be hidden from feeds and threads. This cannot be undone.`, 1019 )} 1020 onConfirm={onHidePost} 1021 confirmButtonCta={_(msg`Hide`)} ··· 1038 1039 <Prompt.Basic 1040 control={quotePostDetachConfirmControl} 1041 + title={_(msg`Detach quote ${_(terminology.post)}?`)} 1042 description={_( 1043 + msg`This will remove your ${_(terminology.post)} from this quote ${_(terminology.post)} for all users, and replace it with a placeholder.`, 1044 )} 1045 onConfirm={onToggleQuotePostAttachment} 1046 confirmButtonCta={_(msg`Yes, detach`)}

+3 -1

src/components/PostControls/PostMenu/index.tsx

··· 10 import {useLingui} from '@lingui/react' 11 12 import {type Shadow} from '#/state/cache/post-shadow' 0 13 import {EventStopper} from '#/view/com/util/EventStopper' 14 import {DotGrid_Stroke2_Corner0_Rounded as DotsHorizontal} from '#/components/icons/DotGrid' 15 import {useMenuControl} from '#/components/Menu' ··· 43 hitSlop?: Insets 44 }): React.ReactNode => { 45 const {_} = useLingui() 0 46 47 const menuControl = useMenuControl() 48 const [hasBeenOpen, setHasBeenOpen] = useState(false) ··· 61 return ( 62 <EventStopper onKeyDown={false}> 63 <Menu.Root control={lazyMenuControl}> 64 - <Menu.Trigger label={_(msg`Open skeet options menu`)}> 65 {({props}) => { 66 return ( 67 <PostControlButton

··· 10 import {useLingui} from '@lingui/react' 11 12 import {type Shadow} from '#/state/cache/post-shadow' 13 + import {useTerminology} from '#/lib/hooks/useTerminology' 14 import {EventStopper} from '#/view/com/util/EventStopper' 15 import {DotGrid_Stroke2_Corner0_Rounded as DotsHorizontal} from '#/components/icons/DotGrid' 16 import {useMenuControl} from '#/components/Menu' ··· 44 hitSlop?: Insets 45 }): React.ReactNode => { 46 const {_} = useLingui() 47 + const terminology = useTerminology() 48 49 const menuControl = useMenuControl() 50 const [hasBeenOpen, setHasBeenOpen] = useState(false) ··· 63 return ( 64 <EventStopper onKeyDown={false}> 65 <Menu.Root control={lazyMenuControl}> 66 + <Menu.Trigger label={_(msg`Open ${_(terminology.post)} options menu`)}> 67 {({props}) => { 68 return ( 69 <PostControlButton

+54 -10

src/components/PostControls/RepostButton.tsx

··· 4 import {useLingui} from '@lingui/react' 5 6 import {useHaptics} from '#/lib/haptics' 0 0 7 import {useRequireAuth} from '#/state/session' 8 import {atoms as a, useTheme} from '#/alf' 9 import {Button, ButtonText} from '#/components/Button' ··· 37 }: Props): React.ReactNode => { 38 const t = useTheme() 39 const {_} = useLingui() 0 40 const requireAuth = useRequireAuth() 41 const dialogControl = Dialog.useDialogControl() 42 const formatPostStatCount = useFormatPostStatCount() ··· 121 }): React.ReactNode => { 122 const t = useTheme() 123 const {_} = useLingui() 0 124 const playHaptic = useHaptics() 125 const control = Dialog.useDialogContext() 126 ··· 142 const onPressClose = useCallback(() => control.close(), [control]) 143 144 return ( 145 - <Dialog.ScrollableInner label={_(msg`Reskeet or quote skeet`)}> 0 0 0 0 146 <View style={a.gap_xl}> 147 <View style={a.gap_xs}> 148 <Button 149 style={[a.justify_start, a.px_md, a.gap_sm]} 150 label={ 151 isReposted 152 - ? _(msg`Remove reskeet`) 153 - : _(msg({message: `Reskeet`, context: 'action'})) 0 0 0 0 0 0 0 0 154 } 155 onPress={onPressRepost} 156 size="large" ··· 159 <RepostIcon size="lg" fill={t.palette.primary_500} /> 160 <Text style={[a.font_semi_bold, a.text_xl]}> 161 {isReposted ? ( 162 - <Trans>Remove reskeet</Trans> 0 0 0 0 163 ) : ( 164 - <Trans context="action">Reskeet</Trans> 0 0 0 0 165 )} 166 </Text> 167 </Button> ··· 171 style={[a.justify_start, a.px_md, a.gap_sm]} 172 label={ 173 embeddingDisabled 174 - ? _(msg`Quote skeets disabled`) 175 - : _(msg`Quote skeet`) 0 0 0 0 0 0 0 0 176 } 177 onPress={onPressQuote} 178 size="large" ··· 193 embeddingDisabled && t.atoms.text_contrast_low, 194 ]}> 195 {embeddingDisabled ? ( 196 - <Trans>Quote skeets disabled</Trans> 0 0 0 0 197 ) : ( 198 - <Trans>Quote skeet</Trans> 0 0 0 0 199 )} 200 </Text> 201 </Button> 202 </View> 203 <Button 204 - label={_(msg`Cancel quote skeet`)} 0 0 0 0 205 onPress={onPressClose} 206 size="large" 207 color="secondary">

··· 4 import {useLingui} from '@lingui/react' 5 6 import {useHaptics} from '#/lib/haptics' 7 + import {getTerminology, TERMINOLOGY} from '#/lib/strings/terminology' 8 + import {useTerminologyPreference} from '#/state/preferences' 9 import {useRequireAuth} from '#/state/session' 10 import {atoms as a, useTheme} from '#/alf' 11 import {Button, ButtonText} from '#/components/Button' ··· 39 }: Props): React.ReactNode => { 40 const t = useTheme() 41 const {_} = useLingui() 42 + const terminologyPreference = useTerminologyPreference() 43 const requireAuth = useRequireAuth() 44 const dialogControl = Dialog.useDialogControl() 45 const formatPostStatCount = useFormatPostStatCount() ··· 124 }): React.ReactNode => { 125 const t = useTheme() 126 const {_} = useLingui() 127 + const terminologyPreference = useTerminologyPreference() 128 const playHaptic = useHaptics() 129 const control = Dialog.useDialogContext() 130 ··· 146 const onPressClose = useCallback(() => control.close(), [control]) 147 148 return ( 149 + <Dialog.ScrollableInner label={_(getTerminology(terminologyPreference, { 150 + skeet: msg`Reskeet or quote skeet`, 151 + post: msg`Repost or quote post`, 152 + spell: msg`Respell or quote spell`, 153 + }))}> 154 <View style={a.gap_xl}> 155 <View style={a.gap_xs}> 156 <Button 157 style={[a.justify_start, a.px_md, a.gap_sm]} 158 label={ 159 isReposted 160 + ? _(getTerminology(terminologyPreference, { 161 + skeet: msg`Remove reskeet`, 162 + post: msg`Remove repost`, 163 + spell: msg`Remove respell`, 164 + })) 165 + : _(getTerminology(terminologyPreference, { 166 + skeet: msg({message: `Reskeet`, context: 'action'}), 167 + post: msg({message: `Repost`, context: 'action'}), 168 + spell: msg({message: `Respell`, context: 'action'}), 169 + })) 170 } 171 onPress={onPressRepost} 172 size="large" ··· 175 <RepostIcon size="lg" fill={t.palette.primary_500} /> 176 <Text style={[a.font_semi_bold, a.text_xl]}> 177 {isReposted ? ( 178 + <Trans>{_(getTerminology(terminologyPreference, { 179 + skeet: msg`Remove reskeet`, 180 + post: msg`Remove repost`, 181 + spell: msg`Remove respell`, 182 + }))}</Trans> 183 ) : ( 184 + <Trans>{_(getTerminology(terminologyPreference, { 185 + skeet: msg({message: `Reskeet`, context: 'action'}), 186 + post: msg({message: `Repost`, context: 'action'}), 187 + spell: msg({message: `Respell`, context: 'action'}), 188 + }))}</Trans> 189 )} 190 </Text> 191 </Button> ··· 195 style={[a.justify_start, a.px_md, a.gap_sm]} 196 label={ 197 embeddingDisabled 198 + ? _(getTerminology(terminologyPreference, { 199 + skeet: msg`Quote skeets disabled`, 200 + post: msg`Quote posts disabled`, 201 + spell: msg`Quote spells disabled`, 202 + })) 203 + : _(getTerminology(terminologyPreference, { 204 + skeet: msg`Quote skeet`, 205 + post: msg`Quote post`, 206 + spell: msg`Quote spell`, 207 + })) 208 } 209 onPress={onPressQuote} 210 size="large" ··· 225 embeddingDisabled && t.atoms.text_contrast_low, 226 ]}> 227 {embeddingDisabled ? ( 228 + <Trans>{_(getTerminology(terminologyPreference, { 229 + skeet: msg`Quote skeets disabled`, 230 + post: msg`Quote posts disabled`, 231 + spell: msg`Quote spells disabled`, 232 + }))}</Trans> 233 ) : ( 234 + <Trans>{_(getTerminology(terminologyPreference, { 235 + skeet: msg`Quote skeet`, 236 + post: msg`Quote post`, 237 + spell: msg`Quote spell`, 238 + }))}</Trans> 239 )} 240 </Text> 241 </Button> 242 </View> 243 <Button 244 + label={_(getTerminology(terminologyPreference, { 245 + skeet: msg`Cancel quote skeet`, 246 + post: msg`Cancel quote post`, 247 + spell: msg`Cancel quote spell`, 248 + }))} 249 onPress={onPressClose} 250 size="large" 251 color="secondary">

+53 -10

src/components/PostControls/RepostButton.web.tsx

··· 1 import {msg} from '@lingui/macro' 2 import {useLingui} from '@lingui/react' 3 0 0 4 import {useRequireAuth} from '#/state/session' 5 import {useSession} from '#/state/session' 6 import {EventStopper} from '#/view/com/util/EventStopper' ··· 34 }: Props) => { 35 const t = useTheme() 36 const {_} = useLingui() 0 37 const {hasSession} = useSession() 38 const requireAuth = useRequireAuth() 39 const formatPostStatCount = useFormatPostStatCount() ··· 41 return hasSession ? ( 42 <EventStopper onKeyDown={false}> 43 <Menu.Root> 44 - <Menu.Trigger label={_(msg`Repost or quote post`)}> 0 0 0 0 45 {({props}) => { 46 return ( 47 <PostControlButton ··· 65 <Menu.Item 66 label={ 67 isReposted 68 - ? _(msg`Undo reskeet`) 69 - : _(msg({message: `Reskeet`, context: `action`})) 0 0 0 0 0 0 0 0 70 } 71 testID="repostDropdownRepostBtn" 72 onPress={onRepost}> 73 <Menu.ItemText> 74 {isReposted 75 - ? _(msg`Undo reskeet`) 76 - : _(msg({message: `Reskeet`, context: `action`}))} 0 0 0 0 0 0 0 0 77 </Menu.ItemText> 78 <Menu.ItemIcon icon={Repost} position="right" /> 79 </Menu.Item> ··· 81 disabled={embeddingDisabled} 82 label={ 83 embeddingDisabled 84 - ? _(msg`Quote skeets disabled`) 85 - : _(msg`Quote skeet`) 0 0 0 0 0 0 0 0 86 } 87 testID="repostDropdownQuoteBtn" 88 onPress={onQuote}> 89 <Menu.ItemText> 90 {embeddingDisabled 91 - ? _(msg`Quote skeets disabled`) 92 - : _(msg`Quote skeet`)} 0 0 0 0 0 0 0 0 93 </Menu.ItemText> 94 <Menu.ItemIcon icon={Quote} position="right" /> 95 </Menu.Item> ··· 101 onPress={() => requireAuth(() => {})} 102 active={isReposted} 103 activeColor={t.palette.positive_500} 104 - label={_(msg`Reskeet or quote skeet`)} 0 0 0 0 105 big={big}> 106 <PostControlButtonIcon icon={Repost} /> 107 {typeof repostCount !== 'undefined' && repostCount > 0 && (

··· 1 import {msg} from '@lingui/macro' 2 import {useLingui} from '@lingui/react' 3 4 + import {getTerminology} from '#/lib/strings/terminology' 5 + import {useTerminologyPreference} from '#/state/preferences' 6 import {useRequireAuth} from '#/state/session' 7 import {useSession} from '#/state/session' 8 import {EventStopper} from '#/view/com/util/EventStopper' ··· 36 }: Props) => { 37 const t = useTheme() 38 const {_} = useLingui() 39 + const terminologyPreference = useTerminologyPreference() 40 const {hasSession} = useSession() 41 const requireAuth = useRequireAuth() 42 const formatPostStatCount = useFormatPostStatCount() ··· 44 return hasSession ? ( 45 <EventStopper onKeyDown={false}> 46 <Menu.Root> 47 + <Menu.Trigger label={_(getTerminology(terminologyPreference, { 48 + skeet: msg`Reskeet or quote skeet`, 49 + post: msg`Repost or quote post`, 50 + spell: msg`Respell or quote spell`, 51 + }))}> 52 {({props}) => { 53 return ( 54 <PostControlButton ··· 72 <Menu.Item 73 label={ 74 isReposted 75 + ? _(getTerminology(terminologyPreference, { 76 + skeet: msg`Undo reskeet`, 77 + post: msg`Undo repost`, 78 + spell: msg`Undo respell`, 79 + })) 80 + : _(getTerminology(terminologyPreference, { 81 + skeet: msg({message: `Reskeet`, context: `action`}), 82 + post: msg({message: `Repost`, context: `action`}), 83 + spell: msg({message: `Respell`, context: `action`}), 84 + })) 85 } 86 testID="repostDropdownRepostBtn" 87 onPress={onRepost}> 88 <Menu.ItemText> 89 {isReposted 90 + ? _(getTerminology(terminologyPreference, { 91 + skeet: msg`Undo reskeet`, 92 + post: msg`Undo repost`, 93 + spell: msg`Undo respell`, 94 + })) 95 + : _(getTerminology(terminologyPreference, { 96 + skeet: msg({message: `Reskeet`, context: `action`}), 97 + post: msg({message: `Repost`, context: `action`}), 98 + spell: msg({message: `Respell`, context: `action`}), 99 + }))} 100 </Menu.ItemText> 101 <Menu.ItemIcon icon={Repost} position="right" /> 102 </Menu.Item> ··· 104 disabled={embeddingDisabled} 105 label={ 106 embeddingDisabled 107 + ? _(getTerminology(terminologyPreference, { 108 + skeet: msg`Quote skeets disabled`, 109 + post: msg`Quote posts disabled`, 110 + spell: msg`Quote spells disabled`, 111 + })) 112 + : _(getTerminology(terminologyPreference, { 113 + skeet: msg`Quote skeet`, 114 + post: msg`Quote post`, 115 + spell: msg`Quote spell`, 116 + })) 117 } 118 testID="repostDropdownQuoteBtn" 119 onPress={onQuote}> 120 <Menu.ItemText> 121 {embeddingDisabled 122 + ? _(getTerminology(terminologyPreference, { 123 + skeet: msg`Quote skeets disabled`, 124 + post: msg`Quote posts disabled`, 125 + spell: msg`Quote spells disabled`, 126 + })) 127 + : _(getTerminology(terminologyPreference, { 128 + skeet: msg`Quote skeet`, 129 + post: msg`Quote post`, 130 + spell: msg`Quote spell`, 131 + }))} 132 </Menu.ItemText> 133 <Menu.ItemIcon icon={Quote} position="right" /> 134 </Menu.Item> ··· 140 onPress={() => requireAuth(() => {})} 141 active={isReposted} 142 activeColor={t.palette.positive_500} 143 + label={_(getTerminology(terminologyPreference, { 144 + skeet: msg`Reskeet or quote skeet`, 145 + post: msg`Repost or quote post`, 146 + spell: msg`Respell or quote spell`, 147 + }))} 148 big={big}> 149 <PostControlButtonIcon icon={Repost} /> 150 {typeof repostCount !== 'undefined' && repostCount > 0 && (

+48 -9

src/components/PostControls/ShareMenu/ShareMenuItems.tsx

··· 9 import {makeProfileLink} from '#/lib/routes/links' 10 import {type NavigationProp} from '#/lib/routes/types' 11 import {shareText, shareUrl} from '#/lib/sharing' 0 12 import {toShareUrl, toShareUrlBsky} from '#/lib/strings/url-helpers' 13 import {logger} from '#/logger' 14 import {isIOS} from '#/platform/detection' 15 import {useProfileShadow} from '#/state/cache/profile-shadow' 0 16 import {useShowExternalShareButtons} from '#/state/preferences/external-share-buttons' 17 import {useSession} from '#/state/session' 18 import * as Toast from '#/view/com/util/Toast' ··· 37 }: ShareMenuItemsProps): React.ReactNode => { 38 const {hasSession} = useSession() 39 const {_} = useLingui() 0 40 const navigation = useNavigation<NavigationProp>() 41 const sendViaChatControl = useDialogControl() 42 const [devModeEnabled] = useDevMode() ··· 154 {isBridgedPost && ( 155 <Menu.Item 156 testID="postDropdownOpenOriginalPost" 157 - label={_(msg`Open original post`)} 0 0 0 0 158 onPress={onOpenOriginalPost}> 159 <Menu.ItemText> 160 - <Trans>Open original skeet</Trans> 0 0 0 0 161 </Menu.ItemText> 162 <Menu.ItemIcon icon={ExternalIcon} position="right" /> 163 </Menu.Item> ··· 165 166 <Menu.Item 167 testID="postDropdownOpenInPdsls" 168 - label={_(msg`Open post in PDSls`)} 0 0 0 0 169 onPress={onOpenPostInPdsls}> 170 <Menu.ItemText> 171 - <Trans>Open skeet in PDSls</Trans> 0 0 0 0 172 </Menu.ItemText> 173 <Menu.ItemIcon icon={ExternalIcon} position="right" /> 174 </Menu.Item> ··· 198 199 <Menu.Item 200 testID="postDropdownShareBtn" 201 - label={_(msg`Copy link to post`)} 0 0 0 0 202 onPress={onCopyLink}> 203 <Menu.ItemText> 204 - <Trans>Copy link to skeet</Trans> 0 0 0 0 205 </Menu.ItemText> 206 <Menu.ItemIcon icon={ChainLinkIcon} position="right" /> 207 </Menu.Item> ··· 223 <Admonition 224 type="warning" 225 style={[a.flex_1, a.border_0, a.p_0, a.bg_transparent]}> 226 - <Trans>This skeet is only visible to logged-in users.</Trans> 0 0 0 0 227 </Admonition> 228 </Menu.ContainerItem> 229 </Menu.Group> ··· 233 <Menu.Group> 234 <Menu.Item 235 testID="postAtUriShareBtn" 236 - label={_(msg`Share post at:// URI`)} 0 0 0 0 237 onPress={onShareATURI}> 238 <Menu.ItemText> 239 - <Trans>Share skeet at:// URI</Trans> 0 0 0 0 240 </Menu.ItemText> 241 <Menu.ItemIcon icon={ClipboardIcon} position="right" /> 242 </Menu.Item>

··· 9 import {makeProfileLink} from '#/lib/routes/links' 10 import {type NavigationProp} from '#/lib/routes/types' 11 import {shareText, shareUrl} from '#/lib/sharing' 12 + import {getTerminology, TERMINOLOGY} from '#/lib/strings/terminology' 13 import {toShareUrl, toShareUrlBsky} from '#/lib/strings/url-helpers' 14 import {logger} from '#/logger' 15 import {isIOS} from '#/platform/detection' 16 import {useProfileShadow} from '#/state/cache/profile-shadow' 17 + import {useTerminologyPreference} from '#/state/preferences' 18 import {useShowExternalShareButtons} from '#/state/preferences/external-share-buttons' 19 import {useSession} from '#/state/session' 20 import * as Toast from '#/view/com/util/Toast' ··· 39 }: ShareMenuItemsProps): React.ReactNode => { 40 const {hasSession} = useSession() 41 const {_} = useLingui() 42 + const terminologyPreference = useTerminologyPreference() 43 const navigation = useNavigation<NavigationProp>() 44 const sendViaChatControl = useDialogControl() 45 const [devModeEnabled] = useDevMode() ··· 157 {isBridgedPost && ( 158 <Menu.Item 159 testID="postDropdownOpenOriginalPost" 160 + label={_(getTerminology(terminologyPreference, { 161 + skeet: msg`Open original skeet`, 162 + post: msg`Open original post`, 163 + spell: msg`Open original spell`, 164 + }))} 165 onPress={onOpenOriginalPost}> 166 <Menu.ItemText> 167 + <Trans>{_(getTerminology(terminologyPreference, { 168 + skeet: msg`Open original skeet`, 169 + post: msg`Open original post`, 170 + spell: msg`Open original spell`, 171 + }))}</Trans> 172 </Menu.ItemText> 173 <Menu.ItemIcon icon={ExternalIcon} position="right" /> 174 </Menu.Item> ··· 176 177 <Menu.Item 178 testID="postDropdownOpenInPdsls" 179 + label={_(getTerminology(terminologyPreference, { 180 + skeet: msg`Open skeet in PDSls`, 181 + post: msg`Open post in PDSls`, 182 + spell: msg`Open spell in PDSls`, 183 + }))} 184 onPress={onOpenPostInPdsls}> 185 <Menu.ItemText> 186 + <Trans>{_(getTerminology(terminologyPreference, { 187 + skeet: msg`Open skeet in PDSls`, 188 + post: msg`Open post in PDSls`, 189 + spell: msg`Open spell in PDSls`, 190 + }))}</Trans> 191 </Menu.ItemText> 192 <Menu.ItemIcon icon={ExternalIcon} position="right" /> 193 </Menu.Item> ··· 217 218 <Menu.Item 219 testID="postDropdownShareBtn" 220 + label={_(getTerminology(terminologyPreference, { 221 + skeet: msg`Copy link to skeet`, 222 + post: msg`Copy link to post`, 223 + spell: msg`Copy link to spell`, 224 + }))} 225 onPress={onCopyLink}> 226 <Menu.ItemText> 227 + <Trans>{_(getTerminology(terminologyPreference, { 228 + skeet: msg`Copy link to skeet`, 229 + post: msg`Copy link to post`, 230 + spell: msg`Copy link to spell`, 231 + }))}</Trans> 232 </Menu.ItemText> 233 <Menu.ItemIcon icon={ChainLinkIcon} position="right" /> 234 </Menu.Item> ··· 250 <Admonition 251 type="warning" 252 style={[a.flex_1, a.border_0, a.p_0, a.bg_transparent]}> 253 + <Trans>{_(getTerminology(terminologyPreference, { 254 + skeet: msg`This skeet is only visible to logged-in users.`, 255 + post: msg`This post is only visible to logged-in users.`, 256 + spell: msg`This spell is only visible to logged-in users.`, 257 + }))}</Trans> 258 </Admonition> 259 </Menu.ContainerItem> 260 </Menu.Group> ··· 264 <Menu.Group> 265 <Menu.Item 266 testID="postAtUriShareBtn" 267 + label={_(getTerminology(terminologyPreference, { 268 + skeet: msg`Share skeet at:// URI`, 269 + post: msg`Share post at:// URI`, 270 + spell: msg`Share spell at:// URI`, 271 + }))} 272 onPress={onShareATURI}> 273 <Menu.ItemText> 274 + <Trans>{_(getTerminology(terminologyPreference, { 275 + skeet: msg`Share skeet at:// URI`, 276 + post: msg`Share post at:// URI`, 277 + spell: msg`Share spell at:// URI`, 278 + }))}</Trans> 279 </Menu.ItemText> 280 <Menu.ItemIcon icon={ClipboardIcon} position="right" /> 281 </Menu.Item>

+58 -13

src/components/PostControls/ShareMenu/ShareMenuItems.web.tsx

··· 8 import {makeProfileLink} from '#/lib/routes/links' 9 import {type NavigationProp} from '#/lib/routes/types' 10 import {shareText, shareUrl} from '#/lib/sharing' 0 11 import {toShareUrl, toShareUrlBsky} from '#/lib/strings/url-helpers' 12 import {logger} from '#/logger' 13 import {isWeb} from '#/platform/detection' 14 import {useProfileShadow} from '#/state/cache/profile-shadow' 0 15 import {useShowExternalShareButtons} from '#/state/preferences/external-share-buttons' 16 import {useSession} from '#/state/session' 17 import {useBreakpoints} from '#/alf' ··· 37 const {hasSession} = useSession() 38 const {gtMobile} = useBreakpoints() 39 const {_} = useLingui() 0 40 const navigation = useNavigation<NavigationProp>() 41 const embedPostControl = useDialogControl() 42 const sendViaChatControl = useDialogControl() ··· 109 <Menu.Group> 110 <Menu.Item 111 testID="postDropdownShareBtn" 112 - label={_(msg`Copy link to post`)} 0 0 0 0 113 onPress={onCopyLink}> 114 <Menu.ItemText> 115 - <Trans>Copy link to skeet</Trans> 0 0 0 0 116 </Menu.ItemText> 117 <Menu.ItemIcon icon={ChainLinkIcon} position="right" /> 118 </Menu.Item> ··· 136 {showExternalShareButtons && isBridgedPost && ( 137 <Menu.Item 138 testID="postDropdownOpenOriginalPost" 139 - label={_(msg`Open original post`)} 0 0 0 0 140 onPress={onOpenOriginalPost}> 141 <Menu.ItemText> 142 - <Trans>Open original skeet</Trans> 0 0 0 0 143 </Menu.ItemText> 144 <Menu.ItemIcon icon={ExternalIcon} position="right" /> 145 </Menu.Item> ··· 148 {showExternalShareButtons && ( 149 <Menu.Item 150 testID="postDropdownOpenInPdsls" 151 - label={_(msg`Open post in PDSls`)} 0 0 0 0 152 onPress={onOpenPostInPdsls}> 153 <Menu.ItemText> 154 - <Trans>Open skeet in PDSls</Trans> 0 0 0 0 155 </Menu.ItemText> 156 <Menu.ItemIcon icon={ExternalIcon} position="right" /> 157 </Menu.Item> ··· 175 {canEmbed && ( 176 <Menu.Item 177 testID="postDropdownEmbedBtn" 178 - label={_(msg`Embed post`)} 0 0 0 0 179 onPress={() => { 180 logger.metric('share:press:embed', {}, {statsig: true}) 181 embedPostControl.open() 182 }}> 183 - <Menu.ItemText>{_(msg`Embed skeet`)}</Menu.ItemText> 0 0 0 0 184 <Menu.ItemIcon icon={CodeBracketsIcon} position="right" /> 185 </Menu.Item> 186 )} ··· 190 {hasSession && <Menu.Divider />} 191 {copyLinkItem} 192 <Menu.LabelText style={{maxWidth: 220}}> 193 - <Trans> 194 - Note: This skeet is only visible to logged-in users. 195 - </Trans> 0 0 196 </Menu.LabelText> 197 </> 198 )} ··· 202 <Menu.Divider /> 203 <Menu.Item 204 testID="postAtUriShareBtn" 205 - label={_(msg`Copy post at:// URI`)} 0 0 0 0 206 onPress={onShareATURI}> 207 <Menu.ItemText> 208 - <Trans>Copy skeet at:// URI</Trans> 0 0 0 0 209 </Menu.ItemText> 210 <Menu.ItemIcon icon={ClipboardIcon} position="right" /> 211 </Menu.Item>

··· 8 import {makeProfileLink} from '#/lib/routes/links' 9 import {type NavigationProp} from '#/lib/routes/types' 10 import {shareText, shareUrl} from '#/lib/sharing' 11 + import {getTerminology, TERMINOLOGY} from '#/lib/strings/terminology' 12 import {toShareUrl, toShareUrlBsky} from '#/lib/strings/url-helpers' 13 import {logger} from '#/logger' 14 import {isWeb} from '#/platform/detection' 15 import {useProfileShadow} from '#/state/cache/profile-shadow' 16 + import {useTerminologyPreference} from '#/state/preferences' 17 import {useShowExternalShareButtons} from '#/state/preferences/external-share-buttons' 18 import {useSession} from '#/state/session' 19 import {useBreakpoints} from '#/alf' ··· 39 const {hasSession} = useSession() 40 const {gtMobile} = useBreakpoints() 41 const {_} = useLingui() 42 + const terminologyPreference = useTerminologyPreference() 43 const navigation = useNavigation<NavigationProp>() 44 const embedPostControl = useDialogControl() 45 const sendViaChatControl = useDialogControl() ··· 112 <Menu.Group> 113 <Menu.Item 114 testID="postDropdownShareBtn" 115 + label={_(getTerminology(terminologyPreference, { 116 + skeet: msg`Copy link to skeet`, 117 + post: msg`Copy link to post`, 118 + spell: msg`Copy link to spell`, 119 + }))} 120 onPress={onCopyLink}> 121 <Menu.ItemText> 122 + <Trans>{_(getTerminology(terminologyPreference, { 123 + skeet: msg`Copy link to skeet`, 124 + post: msg`Copy link to post`, 125 + spell: msg`Copy link to spell`, 126 + }))}</Trans> 127 </Menu.ItemText> 128 <Menu.ItemIcon icon={ChainLinkIcon} position="right" /> 129 </Menu.Item> ··· 147 {showExternalShareButtons && isBridgedPost && ( 148 <Menu.Item 149 testID="postDropdownOpenOriginalPost" 150 + label={_(getTerminology(terminologyPreference, { 151 + skeet: msg`Open original skeet`, 152 + post: msg`Open original post`, 153 + spell: msg`Open original spell`, 154 + }))} 155 onPress={onOpenOriginalPost}> 156 <Menu.ItemText> 157 + <Trans>{_(getTerminology(terminologyPreference, { 158 + skeet: msg`Open original skeet`, 159 + post: msg`Open original post`, 160 + spell: msg`Open original spell`, 161 + }))}</Trans> 162 </Menu.ItemText> 163 <Menu.ItemIcon icon={ExternalIcon} position="right" /> 164 </Menu.Item> ··· 167 {showExternalShareButtons && ( 168 <Menu.Item 169 testID="postDropdownOpenInPdsls" 170 + label={_(getTerminology(terminologyPreference, { 171 + skeet: msg`Open skeet in PDSls`, 172 + post: msg`Open post in PDSls`, 173 + spell: msg`Open spell in PDSls`, 174 + }))} 175 onPress={onOpenPostInPdsls}> 176 <Menu.ItemText> 177 + <Trans>{_(getTerminology(terminologyPreference, { 178 + skeet: msg`Open skeet in PDSls`, 179 + post: msg`Open post in PDSls`, 180 + spell: msg`Open spell in PDSls`, 181 + }))}</Trans> 182 </Menu.ItemText> 183 <Menu.ItemIcon icon={ExternalIcon} position="right" /> 184 </Menu.Item> ··· 202 {canEmbed && ( 203 <Menu.Item 204 testID="postDropdownEmbedBtn" 205 + label={_(getTerminology(terminologyPreference, { 206 + skeet: msg`Embed skeet`, 207 + post: msg`Embed post`, 208 + spell: msg`Embed spell`, 209 + }))} 210 onPress={() => { 211 logger.metric('share:press:embed', {}, {statsig: true}) 212 embedPostControl.open() 213 }}> 214 + <Menu.ItemText>{_(getTerminology(terminologyPreference, { 215 + skeet: msg`Embed skeet`, 216 + post: msg`Embed post`, 217 + spell: msg`Embed spell`, 218 + }))}</Menu.ItemText> 219 <Menu.ItemIcon icon={CodeBracketsIcon} position="right" /> 220 </Menu.Item> 221 )} ··· 225 {hasSession && <Menu.Divider />} 226 {copyLinkItem} 227 <Menu.LabelText style={{maxWidth: 220}}> 228 + <Trans>{_(getTerminology(terminologyPreference, { 229 + skeet: msg`Note: This skeet is only visible to logged-in users.`, 230 + post: msg`Note: This post is only visible to logged-in users.`, 231 + spell: msg`Note: This spell is only visible to logged-in users.`, 232 + }))}</Trans> 233 </Menu.LabelText> 234 </> 235 )} ··· 239 <Menu.Divider /> 240 <Menu.Item 241 testID="postAtUriShareBtn" 242 + label={_(getTerminology(terminologyPreference, { 243 + skeet: msg`Copy skeet at:// URI`, 244 + post: msg`Copy post at:// URI`, 245 + spell: msg`Copy spell at:// URI`, 246 + }))} 247 onPress={onShareATURI}> 248 <Menu.ItemText> 249 + <Trans>{_(getTerminology(terminologyPreference, { 250 + skeet: msg`Copy skeet at:// URI`, 251 + post: msg`Copy post at:// URI`, 252 + spell: msg`Copy spell at:// URI`, 253 + }))}</Trans> 254 </Menu.ItemText> 255 <Menu.ItemIcon icon={ClipboardIcon} position="right" /> 256 </Menu.Item>

+30 -8

src/components/WhoCanReply.tsx

··· 17 18 import {HITSLOP_10} from '#/lib/constants' 19 import {makeListLink, makeProfileLink} from '#/lib/routes/links' 0 0 20 import {logger} from '#/logger' 21 import {isNative} from '#/platform/detection' 22 import { ··· 212 embeddingDisabled: boolean 213 }) { 214 const {_} = useLingui() 0 215 216 return ( 217 <Dialog.Outer control={control} nativeOptions={{preventExpansion: true}}> ··· 221 style={web({maxWidth: 400})}> 222 <View style={[a.gap_sm]}> 223 <Text style={[a.font_semi_bold, a.text_xl, a.pb_sm]}> 224 - <Trans>Who can interact with this skeet?</Trans> 0 0 0 0 225 </Text> 226 <Rules 227 post={post} ··· 258 embeddingDisabled: boolean 259 }) { 260 const t = useTheme() 0 0 261 262 return ( 263 <> ··· 269 t.atoms.text_contrast_medium, 270 ]}> 271 {settings.length === 0 ? ( 272 - <Trans> 273 - This skeet has an unknown type of threadgate on it. Your app may be 274 - out of date. 275 - </Trans> 0 276 ) : settings[0].type === 'everybody' ? ( 277 - <Trans>Everybody can reply to this skeet.</Trans> 0 0 0 0 278 ) : settings[0].type === 'nobody' ? ( 279 - <Trans>Replies to this skeet are disabled.</Trans> 0 0 0 0 280 ) : ( 281 <Trans> 282 Only{' '} ··· 298 a.flex_wrap, 299 t.atoms.text_contrast_medium, 300 ]}> 301 - <Trans>No one but the author can quote this skeet.</Trans> 0 0 0 0 302 </Text> 303 )} 304 </>

··· 17 18 import {HITSLOP_10} from '#/lib/constants' 19 import {makeListLink, makeProfileLink} from '#/lib/routes/links' 20 + import {getTerminology} from '#/lib/strings/terminology' 21 + import {useTerminologyPreference} from '#/state/preferences' 22 import {logger} from '#/logger' 23 import {isNative} from '#/platform/detection' 24 import { ··· 214 embeddingDisabled: boolean 215 }) { 216 const {_} = useLingui() 217 + const terminologyPreference = useTerminologyPreference() 218 219 return ( 220 <Dialog.Outer control={control} nativeOptions={{preventExpansion: true}}> ··· 224 style={web({maxWidth: 400})}> 225 <View style={[a.gap_sm]}> 226 <Text style={[a.font_semi_bold, a.text_xl, a.pb_sm]}> 227 + <Trans>{_(getTerminology(terminologyPreference, { 228 + skeet: msg`Who can interact with this skeet?`, 229 + post: msg`Who can interact with this post?`, 230 + spell: msg`Who can interact with this spell?`, 231 + }))}</Trans> 232 </Text> 233 <Rules 234 post={post} ··· 265 embeddingDisabled: boolean 266 }) { 267 const t = useTheme() 268 + const {_} = useLingui() 269 + const terminologyPreference = useTerminologyPreference() 270 271 return ( 272 <> ··· 278 t.atoms.text_contrast_medium, 279 ]}> 280 {settings.length === 0 ? ( 281 + <Trans>{_(getTerminology(terminologyPreference, { 282 + skeet: msg`This skeet has an unknown type of threadgate on it. Your app may be out of date.`, 283 + post: msg`This post has an unknown type of threadgate on it. Your app may be out of date.`, 284 + spell: msg`This spell has an unknown type of threadgate on it. Your app may be out of date.`, 285 + }))}</Trans> 286 ) : settings[0].type === 'everybody' ? ( 287 + <Trans>{_(getTerminology(terminologyPreference, { 288 + skeet: msg`Everybody can reply to this skeet.`, 289 + post: msg`Everybody can reply to this post.`, 290 + spell: msg`Everybody can reply to this spell.`, 291 + }))}</Trans> 292 ) : settings[0].type === 'nobody' ? ( 293 + <Trans>{_(getTerminology(terminologyPreference, { 294 + skeet: msg`Replies to this skeet are disabled.`, 295 + post: msg`Replies to this post are disabled.`, 296 + spell: msg`Replies to this spell are disabled.`, 297 + }))}</Trans> 298 ) : ( 299 <Trans> 300 Only{' '} ··· 316 a.flex_wrap, 317 t.atoms.text_contrast_medium, 318 ]}> 319 + <Trans>{_(getTerminology(terminologyPreference, { 320 + skeet: msg`No one but the author can quote this skeet.`, 321 + post: msg`No one but the author can quote this post.`, 322 + spell: msg`No one but the author can quote this spell.`, 323 + }))}</Trans> 324 </Text> 325 )} 326 </>

+18 -6

src/components/dialogs/Embed.tsx

··· 6 7 import {EMBED_SCRIPT} from '#/lib/constants' 8 import {niceDate} from '#/lib/strings/time' 0 0 9 import {toShareUrl} from '#/lib/strings/url-helpers' 10 import {atoms as a, useTheme} from '#/alf' 11 import {Button, ButtonIcon, ButtonText} from '#/components/Button' ··· 51 }: Omit<EmbedDialogProps, 'control'>) { 52 const t = useTheme() 53 const {_, i18n} = useLingui() 0 54 const [copied, setCopied] = useState(false) 55 const [showCustomisation, setShowCustomisation] = useState(false) 56 const [colorMode, setColorMode] = useState<ColorModeValues>('system') ··· 101 }, [i18n, postUri, postCid, record, timestamp, postAuthor, colorMode]) 102 103 return ( 104 - <Dialog.Inner label={_(msg`Embed post`)} style={[{maxWidth: 500}]}> 0 0 0 0 105 <View style={[a.gap_lg]}> 106 <View style={[a.gap_sm]}> 107 <Text style={[a.text_2xl, a.font_bold]}> 108 - <Trans>Embed skeet</Trans> 0 0 0 0 109 </Text> 110 <Text 111 style={[a.text_md, t.atoms.text_contrast_medium, a.leading_normal]}> 112 - <Trans> 113 - Embed this skeet in your website. Simply copy the following snippet 114 - and paste it into the HTML code of your website. 115 - </Trans> 0 116 </Text> 117 </View> 118 <View

··· 6 7 import {EMBED_SCRIPT} from '#/lib/constants' 8 import {niceDate} from '#/lib/strings/time' 9 + import {getTerminology} from '#/lib/strings/terminology' 10 + import {useTerminologyPreference} from '#/state/preferences' 11 import {toShareUrl} from '#/lib/strings/url-helpers' 12 import {atoms as a, useTheme} from '#/alf' 13 import {Button, ButtonIcon, ButtonText} from '#/components/Button' ··· 53 }: Omit<EmbedDialogProps, 'control'>) { 54 const t = useTheme() 55 const {_, i18n} = useLingui() 56 + const terminologyPreference = useTerminologyPreference() 57 const [copied, setCopied] = useState(false) 58 const [showCustomisation, setShowCustomisation] = useState(false) 59 const [colorMode, setColorMode] = useState<ColorModeValues>('system') ··· 104 }, [i18n, postUri, postCid, record, timestamp, postAuthor, colorMode]) 105 106 return ( 107 + <Dialog.Inner label={_(getTerminology(terminologyPreference, { 108 + skeet: msg`Embed skeet`, 109 + post: msg`Embed post`, 110 + spell: msg`Embed spell`, 111 + }))} style={[{maxWidth: 500}]}> 112 <View style={[a.gap_lg]}> 113 <View style={[a.gap_sm]}> 114 <Text style={[a.text_2xl, a.font_bold]}> 115 + <Trans>{_(getTerminology(terminologyPreference, { 116 + skeet: msg`Embed skeet`, 117 + post: msg`Embed post`, 118 + spell: msg`Embed spell`, 119 + }))}</Trans> 120 </Text> 121 <Text 122 style={[a.text_md, t.atoms.text_contrast_medium, a.leading_normal]}> 123 + <Trans>{_(getTerminology(terminologyPreference, { 124 + skeet: msg`Embed this skeet in your website. Simply copy the following snippet and paste it into the HTML code of your website.`, 125 + post: msg`Embed this post in your website. Simply copy the following snippet and paste it into the HTML code of your website.`, 126 + spell: msg`Embed this spell in your website. Simply copy the following snippet and paste it into the HTML code of your website.`, 127 + }))}</Trans> 128 </Text> 129 </View> 130 <View

+3 -1

src/lib/api/index.ts

··· 24 25 import {isNetworkError} from '#/lib/strings/errors' 26 import {parseMarkdownLinks,shortenLinks, stripInvalidMentions} from '#/lib/strings/rich-text-manip' 0 27 import {logger} from '#/logger' 28 import {compressImage} from '#/state/gallery' 29 import { ··· 49 replyTo?: string 50 onStateChange?: (state: string) => void 51 langs?: string[] 0 52 } 53 54 export async function post( ··· 183 }) 184 if (isNetworkError(e)) { 185 throw new Error( 186 - t`Skeet failed to upload. Please check your Internet connection and try again.`, 187 ) 188 } else { 189 throw e

··· 24 25 import {isNetworkError} from '#/lib/strings/errors' 26 import {parseMarkdownLinks,shortenLinks, stripInvalidMentions} from '#/lib/strings/rich-text-manip' 27 + import {getTerminology, TERMINOLOGY} from '#/lib/strings/terminology' 28 import {logger} from '#/logger' 29 import {compressImage} from '#/state/gallery' 30 import { ··· 50 replyTo?: string 51 onStateChange?: (state: string) => void 52 langs?: string[] 53 + terminologyPreference?: string 54 } 55 56 export async function post( ··· 185 }) 186 if (isNetworkError(e)) { 187 throw new Error( 188 + getTerminology(opts.terminologyPreference || 'skeet', TERMINOLOGY.uploadFailed), 189 ) 190 } else { 191 throw e

+62

src/lib/hooks/useTerminology.ts

··· 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0

··· 1 + import {useMemo} from 'react' 2 + import {defineMessage} from '@lingui/macro' 3 + 4 + import {useTerminologyPreference} from '#/state/preferences' 5 + 6 + export type TerminologyKey = 7 + | 'post' 8 + | 'posts' 9 + | 'repost' 10 + | 'reposts' 11 + | 'reposted' 12 + | 'reposting' 13 + 14 + const terminologyMap = { 15 + skeet: { 16 + post: defineMessage({message: 'skeet'}), 17 + posts: defineMessage({message: 'skeets'}), 18 + repost: defineMessage({message: 'reskeet'}), 19 + reposts: defineMessage({message: 'reskeets'}), 20 + reposted: defineMessage({message: 'reskeeted'}), 21 + reposting: defineMessage({message: 'reskeeting'}), 22 + }, 23 + post: { 24 + post: defineMessage({message: 'post'}), 25 + posts: defineMessage({message: 'posts'}), 26 + repost: defineMessage({message: 'repost'}), 27 + reposts: defineMessage({message: 'reposts'}), 28 + reposted: defineMessage({message: 'reposted'}), 29 + reposting: defineMessage({message: 'reposting'}), 30 + }, 31 + spell: { 32 + post: defineMessage({message: 'spell'}), 33 + posts: defineMessage({message: 'spells'}), 34 + repost: defineMessage({message: 'respell'}), 35 + reposts: defineMessage({message: 'respells'}), 36 + reposted: defineMessage({message: 'respelled'}), 37 + reposting: defineMessage({message: 'respelling'}), 38 + }, 39 + } 40 + 41 + /** 42 + * Hook to get the correct terminology based on user preference 43 + * @returns An object with all terminology variants 44 + */ 45 + export function useTerminology() { 46 + const preference = useTerminologyPreference() 47 + 48 + return useMemo(() => { 49 + const selectedTerminology = preference || 'skeet' 50 + return terminologyMap[selectedTerminology] 51 + }, [preference]) 52 + } 53 + 54 + /** 55 + * Hook to get a specific terminology term 56 + * @param key - The terminology key to retrieve 57 + * @returns The localized terminology message 58 + */ 59 + export function useTerm(key: TerminologyKey) { 60 + const terminology = useTerminology() 61 + return terminology[key] 62 + }

+441

src/lib/strings/terminology.ts

··· 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0

··· 1 + import {msg} from '@lingui/macro' 2 + 3 + export type TerminologyPreference = 'skeet' | 'post' | 'spell' 4 + 5 + /** 6 + * Returns the appropriate terminology based on the user's preference 7 + * @param preference - The user's terminology preference ('skeet', 'post', or 'spell') 8 + * @param variants - An object with message descriptors for each terminology option 9 + * @returns The appropriate message descriptor based on the preference 10 + */ 11 + export function getTerminology<T extends {skeet: any; post: any; spell: any}>( 12 + preference: TerminologyPreference | undefined, 13 + variants: T, 14 + ): T[keyof T] { 15 + const pref = preference ?? 'skeet' 16 + return variants[pref] 17 + } 18 + 19 + /** 20 + * Common terminology variants used throughout the app 21 + */ 22 + export const TERMINOLOGY = { 23 + // Single post 24 + singular: { 25 + skeet: msg`skeet`, 26 + post: msg`post`, 27 + spell: msg`spell`, 28 + }, 29 + // Multiple posts 30 + plural: { 31 + skeet: msg`skeets`, 32 + post: msg`posts`, 33 + spell: msg`spells`, 34 + }, 35 + // "Skeet by @handle" 36 + byHandle: (handle: string) => ({ 37 + skeet: msg`Skeet by @${handle}`, 38 + post: msg`Post by @${handle}`, 39 + spell: msg`Spell by @${handle}`, 40 + }), 41 + // Repost terminology 42 + repost: { 43 + singular: { 44 + skeet: msg`reskeet`, 45 + post: msg`repost`, 46 + spell: msg`respell`, 47 + }, 48 + plural: { 49 + skeet: msg`reskeets`, 50 + post: msg`reposts`, 51 + spell: msg`respells`, 52 + }, 53 + pastTense: { 54 + skeet: msg`reskeeted`, 55 + post: msg`reposted`, 56 + spell: msg`respelled`, 57 + }, 58 + byLine: { 59 + skeet: msg`Reskeeted By`, 60 + post: msg`Reposted By`, 61 + spell: msg`Respelled By`, 62 + }, 63 + action: { 64 + skeet: msg`reskeet`, 65 + post: msg`repost`, 66 + spell: msg`respell`, 67 + }, 68 + }, 69 + // For metrics/counts 70 + metrics: { 71 + skeet: msg`skeets metrics`, 72 + post: msg`posts metrics`, 73 + spell: msg`spells metrics`, 74 + }, 75 + // For carousel 76 + carousel: { 77 + skeet: msg`Combine reskeets into a horizontal carousel`, 78 + post: msg`Combine reposts into a horizontal carousel`, 79 + spell: msg`Combine respells into a horizontal carousel`, 80 + }, 81 + // For notifications 82 + viaRepostNotification: { 83 + skeet: msg`Disable "via reskeet" notifications`, 84 + post: msg`Disable "via repost" notifications`, 85 + spell: msg`Disable "via respell" notifications`, 86 + }, 87 + viaRepostPrivacy: { 88 + skeet: msg`Forcefully disables the notifications other people receive when you like/reskeet a skeet someone else has reskeeted for privacy.`, 89 + post: msg`Forcefully disables the notifications other people receive when you like/repost a post someone else has reposted for privacy.`, 90 + spell: msg`Forcefully disables the notifications other people receive when you like/respell a spell someone else has respelled for privacy.`, 91 + }, 92 + // For external share buttons 93 + externalShareButtons: { 94 + skeet: msg`Show "Open original skeet" and "Open skeet in PDSls" buttons`, 95 + post: msg`Show "Open original post" and "Open post in PDSls" buttons`, 96 + spell: msg`Show "Open original spell" and "Open spell in PDSls" buttons`, 97 + }, 98 + // For metrics labels 99 + repostMetrics: { 100 + skeet: msg`Disable reskeets metrics`, 101 + post: msg`Disable reposts metrics`, 102 + spell: msg`Disable respells metrics`, 103 + }, 104 + // For deletion messages 105 + deleted: { 106 + skeet: msg`This skeet was deleted by its author`, 107 + post: msg`This post was deleted by its author`, 108 + spell: msg`This spell was deleted by its author`, 109 + }, 110 + deletedShort: { 111 + skeet: msg`Skeet has been deleted`, 112 + post: msg`Post has been deleted`, 113 + spell: msg`Spell has been deleted`, 114 + }, 115 + // For error messages 116 + notFound: { 117 + skeet: msg`Skeet not found`, 118 + post: msg`Post not found`, 119 + spell: msg`Spell not found`, 120 + }, 121 + blocked: { 122 + skeet: msg`Skeet blocked`, 123 + post: msg`Post blocked`, 124 + spell: msg`Spell blocked`, 125 + }, 126 + errorLoading: { 127 + skeet: msg`Error loading skeet`, 128 + post: msg`Error loading post`, 129 + spell: msg`Error loading spell`, 130 + }, 131 + // For success messages 132 + sent: { 133 + skeet: msg`Your skeet was sent`, 134 + post: msg`Your post was sent`, 135 + spell: msg`Your spell was sent`, 136 + }, 137 + sentPlural: { 138 + skeet: msg`Your skeets were sent`, 139 + post: msg`Your posts were sent`, 140 + spell: msg`Your spells were sent`, 141 + }, 142 + pinned: { 143 + skeet: msg`Skeet pinned`, 144 + post: msg`Post pinned`, 145 + spell: msg`Spell pinned`, 146 + }, 147 + unpinned: { 148 + skeet: msg`Skeet unpinned`, 149 + post: msg`Post unpinned`, 150 + spell: msg`Spell unpinned`, 151 + }, 152 + failedToPin: { 153 + skeet: msg`Failed to pin skeet`, 154 + post: msg`Failed to pin post`, 155 + spell: msg`Failed to pin spell`, 156 + }, 157 + // For composer 158 + addAnother: { 159 + skeet: msg`Add another skeet`, 160 + post: msg`Add another post`, 161 + spell: msg`Add another spell`, 162 + }, 163 + anythingBut: { 164 + skeet: msg`Anything but skeet`, 165 + post: msg`Anything but post`, 166 + spell: msg`Anything but spell`, 167 + }, 168 + delete: { 169 + skeet: msg`Delete skeet`, 170 + post: msg`Delete post`, 171 + spell: msg`Delete spell`, 172 + }, 173 + discard: { 174 + skeet: msg`Discard skeet?`, 175 + post: msg`Discard post?`, 176 + spell: msg`Discard spell?`, 177 + }, 178 + discardConfirm: { 179 + skeet: msg`Are you sure you'd like to discard this skeet?`, 180 + post: msg`Are you sure you'd like to discard this post?`, 181 + spell: msg`Are you sure you'd like to discard this spell?`, 182 + }, 183 + view: { 184 + skeet: msg`View skeet`, 185 + post: msg`View post`, 186 + spell: msg`View spell`, 187 + }, 188 + // For composer actions 189 + composeNew: { 190 + skeet: msg`Compose new skeet`, 191 + post: msg`Compose new post`, 192 + spell: msg`Compose new spell`, 193 + }, 194 + newAction: { 195 + skeet: msg`New Skeet`, 196 + post: msg`New Post`, 197 + spell: msg`New Spell`, 198 + }, 199 + postAll: { 200 + skeet: msg`Skeet All`, 201 + post: msg`Post All`, 202 + spell: msg`Spell All`, 203 + }, 204 + postSingle: { 205 + skeet: msg`Skeet`, 206 + post: msg`Post`, 207 + spell: msg`Spell`, 208 + }, 209 + // For language selection 210 + selectLanguage: { 211 + skeet: msg`Select skeet language`, 212 + post: msg`Select post language`, 213 + spell: msg`Select spell language`, 214 + }, 215 + chooseLanguages: { 216 + skeet: msg`Choose Skeet Languages`, 217 + post: msg`Choose Post Languages`, 218 + spell: msg`Choose Spell Languages`, 219 + }, 220 + languageDescription: { 221 + skeet: msg`Select up to 3 languages used in this skeet`, 222 + post: msg`Select up to 3 languages used in this post`, 223 + spell: msg`Select up to 3 languages used in this spell`, 224 + }, 225 + replyingLanguage: (langs: string) => ({ 226 + skeet: msg`The skeet you're replying to was marked as being written in ${langs}`, 227 + post: msg`The post you're replying to was marked as being written in ${langs}`, 228 + spell: msg`The spell you're replying to was marked as being written in ${langs}`, 229 + }), 230 + // For interaction settings 231 + interactionSettings: { 232 + skeet: msg`Skeet interaction settings`, 233 + post: msg`Post interaction settings`, 234 + spell: msg`Spell interaction settings`, 235 + }, 236 + editInteractionSettings: { 237 + skeet: msg`Edit skeet interaction settings`, 238 + post: msg`Edit post interaction settings`, 239 + spell: msg`Edit spell interaction settings`, 240 + }, 241 + whoCanInteract: { 242 + skeet: msg`Who can interact with this skeet?`, 243 + post: msg`Who can interact with this post?`, 244 + spell: msg`Who can interact with this spell?`, 245 + }, 246 + // For embedding 247 + embed: { 248 + skeet: msg`Embed skeet`, 249 + post: msg`Embed post`, 250 + spell: msg`Embed spell`, 251 + }, 252 + embedDescription: { 253 + skeet: msg`Embed this skeet in your website. Simply copy the following snippet and paste it into the HTML code of your website.`, 254 + post: msg`Embed this post in your website. Simply copy the following snippet and paste it into the HTML code of your website.`, 255 + spell: msg`Embed this spell in your website. Simply copy the following snippet and paste it into the HTML code of your website.`, 256 + }, 257 + // For sharing 258 + copyLink: { 259 + skeet: msg`Copy link to skeet`, 260 + post: msg`Copy link to post`, 261 + spell: msg`Copy link to spell`, 262 + }, 263 + shareUri: { 264 + skeet: msg`Share skeet at:// URI`, 265 + post: msg`Share post at:// URI`, 266 + spell: msg`Share spell at:// URI`, 267 + }, 268 + copyUri: { 269 + skeet: msg`Copy skeet at:// URI`, 270 + post: msg`Copy post at:// URI`, 271 + spell: msg`Copy spell at:// URI`, 272 + }, 273 + sendTo: { 274 + skeet: msg`Send skeet to...`, 275 + post: msg`Send post to...`, 276 + spell: msg`Send spell to...`, 277 + }, 278 + openOriginal: { 279 + skeet: msg`Open original skeet`, 280 + post: msg`Open original post`, 281 + spell: msg`Open original spell`, 282 + }, 283 + openInPDSls: { 284 + skeet: msg`Open skeet in PDSls`, 285 + post: msg`Open post in PDSls`, 286 + spell: msg`Open spell in PDSls`, 287 + }, 288 + // For reporting 289 + report: { 290 + skeet: msg`Report this skeet`, 291 + post: msg`Report this post`, 292 + spell: msg`Report this spell`, 293 + }, 294 + reportWhy: { 295 + skeet: msg`Why should this skeet be reviewed?`, 296 + post: msg`Why should this post be reviewed?`, 297 + spell: msg`Why should this spell be reviewed?`, 298 + }, 299 + // For search and browse 300 + search: { 301 + skeet: msg`Search skeets`, 302 + post: msg`Search posts`, 303 + spell: msg`Search spells`, 304 + }, 305 + searchProfile: (handle: string) => ({ 306 + skeet: msg`Search @${handle}'s skeets`, 307 + post: msg`Search @${handle}'s posts`, 308 + spell: msg`Search @${handle}'s spells`, 309 + }), 310 + searchMy: { 311 + skeet: msg`Search my skeets`, 312 + post: msg`Search my posts`, 313 + spell: msg`Search my spells`, 314 + }, 315 + browse: (tag: string) => ({ 316 + skeet: msg`Browse skeets about ${tag}`, 317 + post: msg`Browse posts about ${tag}`, 318 + spell: msg`Browse spells about ${tag}`, 319 + }), 320 + browseTagged: (tag: string) => ({ 321 + skeet: msg`Browse skeets tagged with ${tag}`, 322 + post: msg`Browse posts tagged with ${tag}`, 323 + spell: msg`Browse spells tagged with ${tag}`, 324 + }), 325 + seeTag: (tag: string) => ({ 326 + skeet: msg`See ${tag} skeets`, 327 + post: msg`See ${tag} posts`, 328 + spell: msg`See ${tag} spells`, 329 + }), 330 + seeTagByUser: (tag: string) => ({ 331 + skeet: msg`See ${tag} skeets by user`, 332 + post: msg`See ${tag} posts by user`, 333 + spell: msg`See ${tag} spells by user`, 334 + }), 335 + // For loading and errors 336 + loadNew: { 337 + skeet: msg`Load new skeets`, 338 + post: msg`Load new posts`, 339 + spell: msg`Load new spells`, 340 + }, 341 + fetchError: { 342 + skeet: msg`There was an issue fetching skeets. Tap here to try again.`, 343 + post: msg`There was an issue fetching posts. Tap here to try again.`, 344 + spell: msg`There was an issue fetching spells. Tap here to try again.`, 345 + }, 346 + uploadFailed: { 347 + skeet: msg`Skeet failed to upload. Please check your Internet connection and try again.`, 348 + post: msg`Post failed to upload. Please check your Internet connection and try again.`, 349 + spell: msg`Spell failed to upload. Please check your Internet connection and try again.`, 350 + }, 351 + // For feeds and filtering 352 + ranOut: { 353 + skeet: msg`We ran out of skeets from your follows. Here's the latest from`, 354 + post: msg`We ran out of posts from your follows. Here's the latest from`, 355 + spell: msg`We ran out of spells from your follows. Here's the latest from`, 356 + }, 357 + // For quote posts 358 + quoteAction: { 359 + skeet: msg`Quote skeet`, 360 + post: msg`Quote post`, 361 + spell: msg`Quote spell`, 362 + }, 363 + quoteDisabled: { 364 + skeet: msg`Quote skeets disabled`, 365 + post: msg`Quote posts disabled`, 366 + spell: msg`Quote spells disabled`, 367 + }, 368 + allowQuote: { 369 + skeet: msg`Allow quote skeets`, 370 + post: msg`Allow quote posts`, 371 + spell: msg`Allow quote spells`, 372 + }, 373 + quoteAuthorDisabled: { 374 + skeet: msg`This skeet's author has disabled quote skeets.`, 375 + post: msg`This post's author has disabled quote posts.`, 376 + spell: msg`This spell's author has disabled quote spells.`, 377 + }, 378 + cancelQuote: { 379 + skeet: msg`Cancel quote skeet`, 380 + post: msg`Cancel quote post`, 381 + spell: msg`Cancel quote spell`, 382 + }, 383 + noQuoteYet: { 384 + skeet: msg`No one but the author can quote this skeet.`, 385 + post: msg`No one but the author can quote this post.`, 386 + spell: msg`No one but the author can quote this spell.`, 387 + }, 388 + // For reply settings 389 + repliesDisabled: { 390 + skeet: msg`Replies to this skeet are disabled.`, 391 + post: msg`Replies to this post are disabled.`, 392 + spell: msg`Replies to this spell are disabled.`, 393 + }, 394 + everyoneCanReply: { 395 + skeet: msg`Everybody can reply to this skeet.`, 396 + post: msg`Everybody can reply to this post.`, 397 + spell: msg`Everybody can reply to this spell.`, 398 + }, 399 + unknownThreadgate: { 400 + skeet: msg`This skeet has an unknown type of threadgate on it. Your app may be out of date.`, 401 + post: msg`This post has an unknown type of threadgate on it. Your app may be out of date.`, 402 + spell: msg`This spell has an unknown type of threadgate on it. Your app may be out of date.`, 403 + }, 404 + // For replies 405 + repliedTo: { 406 + skeet: msg`Replied to a skeet`, 407 + post: msg`Replied to a post`, 408 + spell: msg`Replied to a spell`, 409 + }, 410 + repliedToBlocked: { 411 + skeet: msg`Replied to a blocked skeet`, 412 + post: msg`Replied to a blocked post`, 413 + spell: msg`Replied to a blocked spell`, 414 + }, 415 + replyWasDeleted: { 416 + skeet: msg`We're sorry! The skeet you are replying to has been deleted.`, 417 + post: msg`We're sorry! The post you are replying to has been deleted.`, 418 + spell: msg`We're sorry! The spell you are replying to has been deleted.`, 419 + }, 420 + sortReplies: { 421 + skeet: msg`Sort replies to the same skeet by:`, 422 + post: msg`Sort replies to the same post by:`, 423 + spell: msg`Sort replies to the same spell by:`, 424 + }, 425 + showRepliesTree: { 426 + skeet: msg`Show skeet replies in a threaded tree view`, 427 + post: msg`Show post replies in a threaded tree view`, 428 + spell: msg`Show spell replies in a threaded tree view`, 429 + }, 430 + // For visibility 431 + onlyLoggedIn: { 432 + skeet: msg`This skeet is only visible to logged-in users.`, 433 + post: msg`This post is only visible to logged-in users.`, 434 + spell: msg`This spell is only visible to logged-in users.`, 435 + }, 436 + noteOnlyLoggedIn: { 437 + skeet: msg`Note: This skeet is only visible to logged-in users.`, 438 + post: msg`Note: This post is only visible to logged-in users.`, 439 + spell: msg`Note: This spell is only visible to logged-in users.`, 440 + }, 441 + }

+25 -4

src/screens/Bookmarks/index.tsx

··· 16 import {useCleanError} from '#/lib/hooks/useCleanError' 17 import {useInitialNumToRender} from '#/lib/hooks/useInitialNumToRender' 18 import {usePostViewTracking} from '#/lib/hooks/usePostViewTracking' 0 19 import { 20 type CommonNavigatorParams, 21 type NativeStackScreenProps, 22 } from '#/lib/routes/types' 23 import {logger} from '#/logger' 24 import {isIOS} from '#/platform/detection' 0 25 import {useBookmarkMutation} from '#/state/queries/bookmarks/useBookmarkMutation' 26 import {useBookmarksQuery} from '#/state/queries/bookmarks/useBookmarksQuery' 27 import {useSetMinimalShellMode} from '#/state/shell' ··· 42 type Props = NativeStackScreenProps<CommonNavigatorParams, 'Bookmarks'> 43 44 export function BookmarksScreen({}: Props) { 0 0 45 const setMinimalShellMode = useSetMinimalShellMode() 46 47 useFocusEffect( ··· 57 <Layout.Header.BackButton /> 58 <Layout.Header.Content> 59 <Layout.Header.TitleText> 60 - <Trans>Saved Skeets</Trans> 0 0 0 0 61 </Layout.Header.TitleText> 62 </Layout.Header.Content> 63 <Layout.Header.Slot /> ··· 209 }) { 210 const t = useTheme() 211 const {_} = useLingui() 0 212 const {mutateAsync: bookmark} = useBookmarkMutation() 213 const cleanError = useCleanError() 214 215 const remove = async () => { 216 try { 217 await bookmark({action: 'delete', uri: post.uri}) 218 - toast.show(_(msg`Removed from saved skeets`), { 0 0 0 0 219 type: 'info', 220 }) 221 } catch (e: any) { ··· 253 a.italic, 254 t.atoms.text_contrast_medium, 255 ]}> 256 - <Trans>This skeet was deleted by its author</Trans> 0 0 0 0 257 </Text> 258 </View> 259 <Button 260 - label={_(msg`Remove from saved skeets`)} 0 0 0 0 261 size="tiny" 262 color="secondary" 263 onPress={remove}>

··· 16 import {useCleanError} from '#/lib/hooks/useCleanError' 17 import {useInitialNumToRender} from '#/lib/hooks/useInitialNumToRender' 18 import {usePostViewTracking} from '#/lib/hooks/usePostViewTracking' 19 + import {getTerminology} from '#/lib/strings/terminology' 20 import { 21 type CommonNavigatorParams, 22 type NativeStackScreenProps, 23 } from '#/lib/routes/types' 24 import {logger} from '#/logger' 25 import {isIOS} from '#/platform/detection' 26 + import {useTerminologyPreference} from '#/state/preferences' 27 import {useBookmarkMutation} from '#/state/queries/bookmarks/useBookmarkMutation' 28 import {useBookmarksQuery} from '#/state/queries/bookmarks/useBookmarksQuery' 29 import {useSetMinimalShellMode} from '#/state/shell' ··· 44 type Props = NativeStackScreenProps<CommonNavigatorParams, 'Bookmarks'> 45 46 export function BookmarksScreen({}: Props) { 47 + const {_} = useLingui() 48 + const terminologyPreference = useTerminologyPreference() 49 const setMinimalShellMode = useSetMinimalShellMode() 50 51 useFocusEffect( ··· 61 <Layout.Header.BackButton /> 62 <Layout.Header.Content> 63 <Layout.Header.TitleText> 64 + <Trans>{_(getTerminology(terminologyPreference, { 65 + skeet: msg`Saved Skeets`, 66 + post: msg`Saved Posts`, 67 + spell: msg`Saved Spells`, 68 + }))}</Trans> 69 </Layout.Header.TitleText> 70 </Layout.Header.Content> 71 <Layout.Header.Slot /> ··· 217 }) { 218 const t = useTheme() 219 const {_} = useLingui() 220 + const terminologyPreference = useTerminologyPreference() 221 const {mutateAsync: bookmark} = useBookmarkMutation() 222 const cleanError = useCleanError() 223 224 const remove = async () => { 225 try { 226 await bookmark({action: 'delete', uri: post.uri}) 227 + toast.show(_(getTerminology(terminologyPreference, { 228 + skeet: msg`Removed from saved skeets`, 229 + post: msg`Removed from saved posts`, 230 + spell: msg`Removed from saved spells`, 231 + })), { 232 type: 'info', 233 }) 234 } catch (e: any) { ··· 266 a.italic, 267 t.atoms.text_contrast_medium, 268 ]}> 269 + <Trans>{_(getTerminology(terminologyPreference, { 270 + skeet: msg`This skeet was deleted by its author`, 271 + post: msg`This post was deleted by its author`, 272 + spell: msg`This spell was deleted by its author`, 273 + }))}</Trans> 274 </Text> 275 </View> 276 <Button 277 + label={_(getTerminology(terminologyPreference, { 278 + skeet: msg`Remove from saved skeets`, 279 + post: msg`Remove from saved posts`, 280 + spell: msg`Remove from saved spells`, 281 + }))} 282 size="tiny" 283 color="secondary" 284 onPress={remove}>

+5 -1

src/screens/Post/PostLikedBy.tsx

··· 4 import {useFocusEffect} from '@react-navigation/native' 5 6 import {useSetTitle} from '#/lib/hooks/useSetTitle' 0 7 import { 8 type CommonNavigatorParams, 9 type NativeStackScreenProps, ··· 20 export const PostLikedByScreen = ({route}: Props) => { 21 const {_} = useLingui() 22 const setMinimalShellMode = useSetMinimalShellMode() 0 23 const {name, rkey} = route.params 24 const uri = makeRecordUri(name, 'app.bsky.feed.post', rkey) 25 const {data: post} = usePostQuery(uri) ··· 27 const {data: resolvedDid} = useResolveDidQuery(name) 28 const {data: profile} = useProfileQuery({did: resolvedDid}) 29 30 - useSetTitle(profile ? _(msg`Skeet by @${profile.handle}`) : undefined) 0 0 31 32 let likeCount 33 if (post) {

··· 4 import {useFocusEffect} from '@react-navigation/native' 5 6 import {useSetTitle} from '#/lib/hooks/useSetTitle' 7 + import {useTerminology} from '#/lib/hooks/useTerminology' 8 import { 9 type CommonNavigatorParams, 10 type NativeStackScreenProps, ··· 21 export const PostLikedByScreen = ({route}: Props) => { 22 const {_} = useLingui() 23 const setMinimalShellMode = useSetMinimalShellMode() 24 + const terminology = useTerminology() 25 const {name, rkey} = route.params 26 const uri = makeRecordUri(name, 'app.bsky.feed.post', rkey) 27 const {data: post} = usePostQuery(uri) ··· 29 const {data: resolvedDid} = useResolveDidQuery(name) 30 const {data: profile} = useProfileQuery({did: resolvedDid}) 31 32 + useSetTitle( 33 + profile ? `${_(terminology.post)} ${_(msg`by`)} @${profile.handle}` : undefined, 34 + ) 35 36 let likeCount 37 if (post) {

+5 -1

src/screens/Post/PostQuotes.tsx

··· 4 import {useFocusEffect} from '@react-navigation/native' 5 6 import {useSetTitle} from '#/lib/hooks/useSetTitle' 0 7 import { 8 type CommonNavigatorParams, 9 type NativeStackScreenProps, ··· 20 export const PostQuotesScreen = ({route}: Props) => { 21 const {_} = useLingui() 22 const setMinimalShellMode = useSetMinimalShellMode() 0 23 const {name, rkey} = route.params 24 const uri = makeRecordUri(name, 'app.bsky.feed.post', rkey) 25 const {data: post} = usePostQuery(uri) ··· 27 const {data: resolvedDid} = useResolveDidQuery(name) 28 const {data: profile} = useProfileQuery({did: resolvedDid}) 29 30 - useSetTitle(profile ? _(msg`Skeet by @${profile.handle}`) : undefined) 0 0 31 32 let quoteCount 33 if (post) {

··· 4 import {useFocusEffect} from '@react-navigation/native' 5 6 import {useSetTitle} from '#/lib/hooks/useSetTitle' 7 + import {useTerminology} from '#/lib/hooks/useTerminology' 8 import { 9 type CommonNavigatorParams, 10 type NativeStackScreenProps, ··· 21 export const PostQuotesScreen = ({route}: Props) => { 22 const {_} = useLingui() 23 const setMinimalShellMode = useSetMinimalShellMode() 24 + const terminology = useTerminology() 25 const {name, rkey} = route.params 26 const uri = makeRecordUri(name, 'app.bsky.feed.post', rkey) 27 const {data: post} = usePostQuery(uri) ··· 29 const {data: resolvedDid} = useResolveDidQuery(name) 30 const {data: profile} = useProfileQuery({did: resolvedDid}) 31 32 + useSetTitle( 33 + profile ? `${_(terminology.post)} ${_(msg`by`)} @${profile.handle}` : undefined, 34 + ) 35 36 let quoteCount 37 if (post) {

+8 -4

src/screens/Post/PostRepostedBy.tsx

··· 4 import {useFocusEffect} from '@react-navigation/native' 5 6 import {useSetTitle} from '#/lib/hooks/useSetTitle' 0 7 import { 8 type CommonNavigatorParams, 9 type NativeStackScreenProps, ··· 19 type Props = NativeStackScreenProps<CommonNavigatorParams, 'PostRepostedBy'> 20 export const PostRepostedByScreen = ({route}: Props) => { 21 const {_} = useLingui() 0 22 const {name, rkey} = route.params 23 const uri = makeRecordUri(name, 'app.bsky.feed.post', rkey) 24 const setMinimalShellMode = useSetMinimalShellMode() ··· 27 const {data: resolvedDid} = useResolveDidQuery(name) 28 const {data: profile} = useProfileQuery({did: resolvedDid}) 29 30 - useSetTitle(profile ? _(msg`Skeet by @${profile.handle}`) : undefined) 0 0 31 32 let quoteCount 33 if (post) { ··· 48 {post && ( 49 <> 50 <Layout.Header.TitleText> 51 - <Trans>Reskeeted By</Trans> 52 </Layout.Header.TitleText> 53 <Layout.Header.SubtitleText> 54 <Plural 55 value={quoteCount ?? 0} 56 - one="# reskeet" 57 - other="# reskeets" 58 /> 59 </Layout.Header.SubtitleText> 60 </>

··· 4 import {useFocusEffect} from '@react-navigation/native' 5 6 import {useSetTitle} from '#/lib/hooks/useSetTitle' 7 + import {useTerminology} from '#/lib/hooks/useTerminology' 8 import { 9 type CommonNavigatorParams, 10 type NativeStackScreenProps, ··· 20 type Props = NativeStackScreenProps<CommonNavigatorParams, 'PostRepostedBy'> 21 export const PostRepostedByScreen = ({route}: Props) => { 22 const {_} = useLingui() 23 + const terminology = useTerminology() 24 const {name, rkey} = route.params 25 const uri = makeRecordUri(name, 'app.bsky.feed.post', rkey) 26 const setMinimalShellMode = useSetMinimalShellMode() ··· 29 const {data: resolvedDid} = useResolveDidQuery(name) 30 const {data: profile} = useProfileQuery({did: resolvedDid}) 31 32 + useSetTitle( 33 + profile ? `${_(terminology.post)} ${_(msg`by`)} @${profile.handle}` : undefined, 34 + ) 35 36 let quoteCount 37 if (post) { ··· 52 {post && ( 53 <> 54 <Layout.Header.TitleText> 55 + <Trans>{_(terminology.reposted)} By</Trans> 56 </Layout.Header.TitleText> 57 <Layout.Header.SubtitleText> 58 <Plural 59 value={quoteCount ?? 0} 60 + one={_(terminology.repost)} 61 + other={_(terminology.reposts)} 62 /> 63 </Layout.Header.SubtitleText> 64 </>

+6 -3

src/screens/PostThread/components/ThreadError.tsx

··· 4 import {useLingui} from '@lingui/react' 5 6 import {useCleanError} from '#/lib/hooks/useCleanError' 0 0 7 import {OUTER_SPACE} from '#/screens/PostThread/const' 8 import {atoms as a, useTheme} from '#/alf' 9 import {Button, ButtonIcon, ButtonText} from '#/components/Button' ··· 20 }) { 21 const t = useTheme() 22 const {_} = useLingui() 0 23 const cleanError = useCleanError() 24 25 const {title, message} = useMemo(() => { 26 - let title = _(msg`Error loading skeet`) 27 let message = _(msg`Something went wrong. Please try again in a moment.`) 28 29 const {raw, clean} = cleanError(error) 30 31 if (error.message.startsWith('Post not found')) { 32 - title = _(msg`Skeet not found`) 33 message = clean || raw || message 34 } 35 36 return {title, message} 37 - }, [_, error, cleanError]) 38 39 return ( 40 <Layout.Center>

··· 4 import {useLingui} from '@lingui/react' 5 6 import {useCleanError} from '#/lib/hooks/useCleanError' 7 + import {getTerminology, TERMINOLOGY} from '#/lib/strings/terminology' 8 + import {useTerminologyPreference} from '#/state/preferences' 9 import {OUTER_SPACE} from '#/screens/PostThread/const' 10 import {atoms as a, useTheme} from '#/alf' 11 import {Button, ButtonIcon, ButtonText} from '#/components/Button' ··· 22 }) { 23 const t = useTheme() 24 const {_} = useLingui() 25 + const terminologyPreference = useTerminologyPreference() 26 const cleanError = useCleanError() 27 28 const {title, message} = useMemo(() => { 29 + let title = _(getTerminology(terminologyPreference, TERMINOLOGY.errorLoading)) 30 let message = _(msg`Something went wrong. Please try again in a moment.`) 31 32 const {raw, clean} = cleanError(error) 33 34 if (error.message.startsWith('Post not found')) { 35 + title = _(getTerminology(terminologyPreference, TERMINOLOGY.notFound)) 36 message = clean || raw || message 37 } 38 39 return {title, message} 40 + }, [_, error, cleanError, terminologyPreference]) 41 42 return ( 43 <Layout.Center>

+14 -15

src/screens/PostThread/components/ThreadItemAnchor.tsx

··· 11 import {useLingui} from '@lingui/react' 12 13 import {useActorStatus} from '#/lib/actor-status' 0 14 import {useOpenComposer} from '#/lib/hooks/useOpenComposer' 15 import {useTranslate} from '#/lib/hooks/useTranslate' 16 import {makeProfileLink} from '#/lib/routes/links' ··· 102 103 function ThreadItemAnchorDeleted({isRoot}: {isRoot: boolean}) { 104 const t = useTheme() 0 0 105 106 return ( 107 <> ··· 136 </View> 137 <Text 138 style={[a.text_md, a.font_semi_bold, t.atoms.text_contrast_medium]}> 139 - <Trans>Skeet has been deleted</Trans> 140 </Text> 141 </View> 142 </View> ··· 187 const {currentAccount, hasSession} = useSession() 188 const feedFeedback = useFeedFeedback(postSource?.feedSourceInfo, hasSession) 189 const formatPostStatCount = useFormatPostStatCount() 0 190 191 const post = postShadow 192 const record = item.value.post.record ··· 446 {post.repostCount != null && 447 post.repostCount !== 0 && 448 !disableRepostsMetrics ? ( 449 - <Link to={repostsHref} label={_(msg`Reskeets of this skeet`)}> 450 <Text 451 testID="repostCount-expanded" 452 style={[a.text_md, t.atoms.text_contrast_medium]}> 453 <Text style={[a.text_md, a.font_semi_bold, t.atoms.text]}> 454 {formatPostStatCount(post.repostCount)} 455 </Text>{' '} 456 - <Plural 457 - value={post.repostCount} 458 - one="reskeet" 459 - other="reskeets" 460 - /> 461 </Text> 462 </Link> 463 ) : null} ··· 465 post.quoteCount !== 0 && 466 !post.viewer?.embeddingDisabled && 467 !disableQuotesMetrics ? ( 468 - <Link to={quotesHref} label={_(msg`Quotes of this skeet`)}> 469 <Text 470 testID="quoteCount-expanded" 471 style={[a.text_md, t.atoms.text_contrast_medium]}> ··· 483 {post.likeCount != null && 484 post.likeCount !== 0 && 485 !disableLikesMetrics ? ( 486 - <Link to={likesHref} label={_(msg`Likes on this skeet`)}> 487 <Text 488 testID="likeCount-expanded" 489 style={[a.text_md, t.atoms.text_contrast_medium]}> ··· 623 const {_, i18n} = useLingui() 624 const control = Prompt.usePromptControl() 625 const enableSquareButtons = useEnableSquareButtons() 0 626 627 const indexedAt = new Date(post.indexedAt) 628 const createdAt = bsky.dangerousIsType<AppBskyFeedPost.Record>( ··· 643 return ( 644 <> 645 <Button 646 - label={_(msg`Archived post`)} 647 - accessibilityHint={_( 648 - msg`Shows information about when this skeet was created`, 649 - )} 650 onPress={e => { 651 e.preventDefault() 652 e.stopPropagation() ··· 682 683 <Prompt.Outer control={control}> 684 <Prompt.TitleText> 685 - <Trans>Archived post</Trans> 686 </Prompt.TitleText> 687 <Prompt.DescriptionText> 688 <Trans> 689 - This skeet claims to have been created on{' '} 690 <RNText style={[a.font_semi_bold]}> 691 {niceDate(i18n, createdAt)} 692 </RNText>

··· 11 import {useLingui} from '@lingui/react' 12 13 import {useActorStatus} from '#/lib/actor-status' 14 + import {useTerminology} from '#/lib/hooks/useTerminology' 15 import {useOpenComposer} from '#/lib/hooks/useOpenComposer' 16 import {useTranslate} from '#/lib/hooks/useTranslate' 17 import {makeProfileLink} from '#/lib/routes/links' ··· 103 104 function ThreadItemAnchorDeleted({isRoot}: {isRoot: boolean}) { 105 const t = useTheme() 106 + const {_} = useLingui() 107 + const terminology = useTerminology() 108 109 return ( 110 <> ··· 139 </View> 140 <Text 141 style={[a.text_md, a.font_semi_bold, t.atoms.text_contrast_medium]}> 142 + <Trans>{_(terminology.post)} has been deleted</Trans> 143 </Text> 144 </View> 145 </View> ··· 190 const {currentAccount, hasSession} = useSession() 191 const feedFeedback = useFeedFeedback(postSource?.feedSourceInfo, hasSession) 192 const formatPostStatCount = useFormatPostStatCount() 193 + const terminology = useTerminology() 194 195 const post = postShadow 196 const record = item.value.post.record ··· 450 {post.repostCount != null && 451 post.repostCount !== 0 && 452 !disableRepostsMetrics ? ( 453 + <Link to={repostsHref} label={_(msg`${_(terminology.reposts)} of this ${_(terminology.post)}`)}> 454 <Text 455 testID="repostCount-expanded" 456 style={[a.text_md, t.atoms.text_contrast_medium]}> 457 <Text style={[a.text_md, a.font_semi_bold, t.atoms.text]}> 458 {formatPostStatCount(post.repostCount)} 459 </Text>{' '} 460 + {post.repostCount === 1 ? _(terminology.repost) : _(terminology.reposts)} 0 0 0 0 461 </Text> 462 </Link> 463 ) : null} ··· 465 post.quoteCount !== 0 && 466 !post.viewer?.embeddingDisabled && 467 !disableQuotesMetrics ? ( 468 + <Link to={quotesHref} label={_(msg`Quotes of this ${_(terminology.post)}`)}> 469 <Text 470 testID="quoteCount-expanded" 471 style={[a.text_md, t.atoms.text_contrast_medium]}> ··· 483 {post.likeCount != null && 484 post.likeCount !== 0 && 485 !disableLikesMetrics ? ( 486 + <Link to={likesHref} label={_(msg`Likes on this ${_(terminology.post)}`)}> 487 <Text 488 testID="likeCount-expanded" 489 style={[a.text_md, t.atoms.text_contrast_medium]}> ··· 623 const {_, i18n} = useLingui() 624 const control = Prompt.usePromptControl() 625 const enableSquareButtons = useEnableSquareButtons() 626 + const terminology = useTerminology() 627 628 const indexedAt = new Date(post.indexedAt) 629 const createdAt = bsky.dangerousIsType<AppBskyFeedPost.Record>( ··· 644 return ( 645 <> 646 <Button 647 + label={`${_(msg`Archived`)} ${_(terminology.post)}`} 648 + accessibilityHint={`${_(msg`Shows information about when this`)} ${_(terminology.post)} ${_(msg`was created`)}`} 0 0 649 onPress={e => { 650 e.preventDefault() 651 e.stopPropagation() ··· 681 682 <Prompt.Outer control={control}> 683 <Prompt.TitleText> 684 + <Trans>Archived {_(terminology.post)}</Trans> 685 </Prompt.TitleText> 686 <Prompt.DescriptionText> 687 <Trans> 688 + This {_(terminology.post)} claims to have been created on{' '} 689 <RNText style={[a.font_semi_bold]}> 690 {niceDate(i18n, createdAt)} 691 </RNText>

+6 -1

src/screens/PostThread/components/ThreadItemPost.tsx

··· 7 RichText as RichTextAPI, 8 } from '@atproto/api' 9 import {Trans} from '@lingui/macro' 0 10 11 import {useActorStatus} from '#/lib/actor-status' 12 import {MAX_POST_LINES} from '#/lib/constants' 13 import {useOpenComposer} from '#/lib/hooks/useOpenComposer' 14 import {makeProfileLink} from '#/lib/routes/links' 15 import {countLines} from '#/lib/strings/helpers' 0 0 16 import { 17 POST_TOMBSTONE, 18 type Shadow, ··· 83 overrides, 84 }: Pick<ThreadItemPostProps, 'item' | 'overrides'>) { 85 const t = useTheme() 0 0 86 87 return ( 88 <ThreadItemPostOuterWrapper item={item} overrides={overrides}> ··· 109 </View> 110 <Text 111 style={[a.text_md, a.font_semi_bold, t.atoms.text_contrast_medium]}> 112 - <Trans>Skeet has been deleted</Trans> 113 </Text> 114 </View> 115

··· 7 RichText as RichTextAPI, 8 } from '@atproto/api' 9 import {Trans} from '@lingui/macro' 10 + import {useLingui} from '@lingui/react' 11 12 import {useActorStatus} from '#/lib/actor-status' 13 import {MAX_POST_LINES} from '#/lib/constants' 14 import {useOpenComposer} from '#/lib/hooks/useOpenComposer' 15 import {makeProfileLink} from '#/lib/routes/links' 16 import {countLines} from '#/lib/strings/helpers' 17 + import {getTerminology, TERMINOLOGY} from '#/lib/strings/terminology' 18 + import {useTerminologyPreference} from '#/state/preferences' 19 import { 20 POST_TOMBSTONE, 21 type Shadow, ··· 86 overrides, 87 }: Pick<ThreadItemPostProps, 'item' | 'overrides'>) { 88 const t = useTheme() 89 + const {_} = useLingui() 90 + const terminologyPreference = useTerminologyPreference() 91 92 return ( 93 <ThreadItemPostOuterWrapper item={item} overrides={overrides}> ··· 114 </View> 115 <Text 116 style={[a.text_md, a.font_semi_bold, t.atoms.text_contrast_medium]}> 117 + <Trans>{_(getTerminology(terminologyPreference, TERMINOLOGY.deletedShort))}</Trans> 118 </Text> 119 </View> 120

+6 -3

src/screens/PostThread/components/ThreadItemPostTombstone.tsx

··· 3 import {msg} from '@lingui/macro' 4 import {useLingui} from '@lingui/react' 5 0 0 6 import {LINEAR_AVI_WIDTH, OUTER_SPACE} from '#/screens/PostThread/const' 7 import {atoms as a, useTheme} from '#/alf' 8 import {PersonX_Stroke2_Corner0_Rounded as PersonXIcon} from '#/components/icons/Person' ··· 16 export function ThreadItemPostTombstone({type}: ThreadItemPostTombstoneProps) { 17 const t = useTheme() 18 const {_} = useLingui() 0 19 const {copy, Icon} = useMemo(() => { 20 switch (type) { 21 case 'blocked': 22 - return {copy: _(msg`Skeet blocked`), Icon: PersonXIcon} 23 case 'not-found': 24 default: 25 - return {copy: _(msg`Skeet not found`), Icon: TrashIcon} 26 } 27 - }, [_, type]) 28 29 return ( 30 <View

··· 3 import {msg} from '@lingui/macro' 4 import {useLingui} from '@lingui/react' 5 6 + import {getTerminology, TERMINOLOGY} from '#/lib/strings/terminology' 7 + import {useTerminologyPreference} from '#/state/preferences' 8 import {LINEAR_AVI_WIDTH, OUTER_SPACE} from '#/screens/PostThread/const' 9 import {atoms as a, useTheme} from '#/alf' 10 import {PersonX_Stroke2_Corner0_Rounded as PersonXIcon} from '#/components/icons/Person' ··· 18 export function ThreadItemPostTombstone({type}: ThreadItemPostTombstoneProps) { 19 const t = useTheme() 20 const {_} = useLingui() 21 + const terminologyPreference = useTerminologyPreference() 22 const {copy, Icon} = useMemo(() => { 23 switch (type) { 24 case 'blocked': 25 + return {copy: _(getTerminology(terminologyPreference, TERMINOLOGY.blocked)), Icon: PersonXIcon} 26 case 'not-found': 27 default: 28 + return {copy: _(getTerminology(terminologyPreference, TERMINOLOGY.notFound)), Icon: TrashIcon} 29 } 30 + }, [_, type, terminologyPreference]) 31 32 return ( 33 <View

+8 -1

src/screens/Profile/Header/Metrics.tsx

··· 4 import {useLingui} from '@lingui/react' 5 6 import {makeProfileLink} from '#/lib/routes/links' 0 7 import {type Shadow} from '#/state/cache/types' 0 8 import {useDisableFollowersMetrics} from '#/state/preferences/disable-followers-metrics' 9 import {useDisableFollowingMetrics} from '#/state/preferences/disable-following-metrics' 10 import {useDisablePostsMetrics} from '#/state/preferences/disable-posts-metrics' ··· 20 }) { 21 const t = useTheme() 22 const {_, i18n} = useLingui() 0 23 const following = formatCount(i18n, profile.followsCount || 0) 24 const followers = formatCount(i18n, profile.followersCount || 0) 25 const pluralizedFollowers = plural(profile.followersCount || 0, { ··· 70 <Text style={[a.font_semi_bold, t.atoms.text, a.text_md]}> 71 {formatCount(i18n, profile.postsCount || 0)}{' '} 72 <Text style={[t.atoms.text_contrast_medium, a.font_normal, a.text_md]}> 73 - {plural(profile.postsCount || 0, {one: 'skeet', other: 'skeets'})} 0 0 0 0 74 </Text> 75 </Text> 76 ) : null}

··· 4 import {useLingui} from '@lingui/react' 5 6 import {makeProfileLink} from '#/lib/routes/links' 7 + import {getTerminology} from '#/lib/strings/terminology' 8 import {type Shadow} from '#/state/cache/types' 9 + import {useTerminologyPreference} from '#/state/preferences' 10 import {useDisableFollowersMetrics} from '#/state/preferences/disable-followers-metrics' 11 import {useDisableFollowingMetrics} from '#/state/preferences/disable-following-metrics' 12 import {useDisablePostsMetrics} from '#/state/preferences/disable-posts-metrics' ··· 22 }) { 23 const t = useTheme() 24 const {_, i18n} = useLingui() 25 + const terminologyPreference = useTerminologyPreference() 26 const following = formatCount(i18n, profile.followsCount || 0) 27 const followers = formatCount(i18n, profile.followersCount || 0) 28 const pluralizedFollowers = plural(profile.followersCount || 0, { ··· 73 <Text style={[a.font_semi_bold, t.atoms.text, a.text_md]}> 74 {formatCount(i18n, profile.postsCount || 0)}{' '} 75 <Text style={[t.atoms.text_contrast_medium, a.font_normal, a.text_md]}> 76 + {_(getTerminology(terminologyPreference, { 77 + skeet: msg`${plural(profile.postsCount || 0, {one: 'skeet', other: 'skeets'})}`, 78 + post: msg`${plural(profile.postsCount || 0, {one: 'post', other: 'posts'})}`, 79 + spell: msg`${plural(profile.postsCount || 0, {one: 'spell', other: 'spells'})}`, 80 + }))} 81 </Text> 82 </Text> 83 ) : null}

+4 -1

src/screens/Profile/ProfileFeed/index.tsx

··· 16 import {type CommonNavigatorParams} from '#/lib/routes/types' 17 import {type NavigationProp} from '#/lib/routes/types' 18 import {makeRecordUri} from '#/lib/strings/url-helpers' 0 19 import {s} from '#/lib/styles' 20 import {isNative} from '#/platform/detection' 21 import {listenSoftReset} from '#/state/events' 22 import {FeedFeedbackProvider, useFeedFeedback} from '#/state/feed-feedback' 0 23 import { 24 type FeedSourceFeedInfo, 25 useFeedSourceInfoQuery, ··· 159 feedParams: FeedParams | undefined 160 }) { 161 const {_} = useLingui() 0 162 const {hasSession} = useSession() 163 const {openComposer} = useOpenComposer() 164 const isScreenFocused = useIsFocused() ··· 228 {(isScrolledDown || hasNew) && ( 229 <LoadLatestBtn 230 onPress={onScrollToTop} 231 - label={_(msg`Load new skeets`)} 232 showIndicator={hasNew} 233 /> 234 )}

··· 16 import {type CommonNavigatorParams} from '#/lib/routes/types' 17 import {type NavigationProp} from '#/lib/routes/types' 18 import {makeRecordUri} from '#/lib/strings/url-helpers' 19 + import {getTerminology, TERMINOLOGY} from '#/lib/strings/terminology' 20 import {s} from '#/lib/styles' 21 import {isNative} from '#/platform/detection' 22 import {listenSoftReset} from '#/state/events' 23 import {FeedFeedbackProvider, useFeedFeedback} from '#/state/feed-feedback' 24 + import {useTerminologyPreference} from '#/state/preferences' 25 import { 26 type FeedSourceFeedInfo, 27 useFeedSourceInfoQuery, ··· 161 feedParams: FeedParams | undefined 162 }) { 163 const {_} = useLingui() 164 + const terminologyPreference = useTerminologyPreference() 165 const {hasSession} = useSession() 166 const {openComposer} = useOpenComposer() 167 const isScreenFocused = useIsFocused() ··· 231 {(isScrolledDown || hasNew) && ( 232 <LoadLatestBtn 233 onPress={onScrollToTop} 234 + label={_(getTerminology(terminologyPreference, TERMINOLOGY.loadNew))} 235 showIndicator={hasNew} 236 /> 237 )}

+6 -3

src/screens/Profile/ProfileSearch.tsx

··· 3 import {useLingui} from '@lingui/react' 4 5 import {useSetTitle} from '#/lib/hooks/useSetTitle' 0 0 6 import { 7 type CommonNavigatorParams, 8 type NativeStackScreenProps, ··· 16 export const ProfileSearchScreen = ({route}: Props) => { 17 const {name, q: queryParam = ''} = route.params 18 const {_} = useLingui() 0 19 const {currentAccount} = useSession() 20 21 const {data: resolvedDid} = useResolveDidQuery(name) 22 const {data: profile} = useProfileQuery({did: resolvedDid}) 23 24 - useSetTitle(profile ? _(msg`Search @${profile.handle}'s skeets`) : undefined) 25 26 const fixedParams = useMemo( 27 () => ({ ··· 36 inputPlaceholder={ 37 profile 38 ? currentAccount?.did === profile.did 39 - ? _(msg`Search my skeets`) 40 - : _(msg`Search @${profile.handle}'s skeets`) 41 : _(msg`Search...`) 42 } 43 fixedParams={fixedParams}

··· 3 import {useLingui} from '@lingui/react' 4 5 import {useSetTitle} from '#/lib/hooks/useSetTitle' 6 + import {getTerminology, TERMINOLOGY} from '#/lib/strings/terminology' 7 + import {useTerminologyPreference} from '#/state/preferences' 8 import { 9 type CommonNavigatorParams, 10 type NativeStackScreenProps, ··· 18 export const ProfileSearchScreen = ({route}: Props) => { 19 const {name, q: queryParam = ''} = route.params 20 const {_} = useLingui() 21 + const terminologyPreference = useTerminologyPreference() 22 const {currentAccount} = useSession() 23 24 const {data: resolvedDid} = useResolveDidQuery(name) 25 const {data: profile} = useProfileQuery({did: resolvedDid}) 26 27 + useSetTitle(profile ? _(getTerminology(terminologyPreference, TERMINOLOGY.searchProfile(profile.handle))) : undefined) 28 29 const fixedParams = useMemo( 30 () => ({ ··· 39 inputPlaceholder={ 40 profile 41 ? currentAccount?.did === profile.did 42 + ? _(getTerminology(terminologyPreference, TERMINOLOGY.searchMy)) 43 + : _(getTerminology(terminologyPreference, TERMINOLOGY.searchProfile(profile.handle))) 44 : _(msg`Search...`) 45 } 46 fixedParams={fixedParams}

+4 -1

src/screens/Profile/Sections/Feed.tsx

··· 5 import {useQueryClient} from '@tanstack/react-query' 6 7 import {useInitialNumToRender} from '#/lib/hooks/useInitialNumToRender' 0 8 import {isIOS, isNative} from '#/platform/detection' 0 9 import { 10 type FeedDescriptor, 11 RQKEY as FEED_RQKEY, ··· 49 emptyStateIcon, 50 }: FeedSectionProps) { 51 const {_} = useLingui() 0 52 const queryClient = useQueryClient() 53 const [hasNew, setHasNew] = useState(false) 54 const [isScrolledDown, setIsScrolledDown] = useState(false) ··· 113 {(isScrolledDown || hasNew) && ( 114 <LoadLatestBtn 115 onPress={onScrollToTop} 116 - label={_(msg`Load new skeets`)} 117 showIndicator={hasNew} 118 /> 119 )}

··· 5 import {useQueryClient} from '@tanstack/react-query' 6 7 import {useInitialNumToRender} from '#/lib/hooks/useInitialNumToRender' 8 + import {getTerminology, TERMINOLOGY} from '#/lib/strings/terminology' 9 import {isIOS, isNative} from '#/platform/detection' 10 + import {useTerminologyPreference} from '#/state/preferences' 11 import { 12 type FeedDescriptor, 13 RQKEY as FEED_RQKEY, ··· 51 emptyStateIcon, 52 }: FeedSectionProps) { 53 const {_} = useLingui() 54 + const terminologyPreference = useTerminologyPreference() 55 const queryClient = useQueryClient() 56 const [hasNew, setHasNew] = useState(false) 57 const [isScrolledDown, setIsScrolledDown] = useState(false) ··· 116 {(isScrolledDown || hasNew) && ( 117 <LoadLatestBtn 118 onPress={onScrollToTop} 119 + label={_(getTerminology(terminologyPreference, TERMINOLOGY.loadNew))} 120 showIndicator={hasNew} 121 /> 122 )}

+12 -18

src/screens/Settings/DeerSettings.tsx

··· 9 import {APPVIEW_DID_PROXY} from '#/lib/constants' 10 import {usePalette} from '#/lib/hooks/usePalette' 11 import {type CommonNavigatorParams} from '#/lib/routes/types' 0 12 import {type Gate} from '#/lib/statsig/gates' 13 import { 14 resetDeerGateCache, ··· 559 </SettingsList.ItemText> 560 <Toggle.Item 561 name="external_share_buttons" 562 - label={_( 563 - msg`Show "Open original skeet" and "Open skeet in PDSls" buttons`, 564 - )} 565 value={showExternalShareButtons} 566 onChange={value => setShowExternalShareButtons(value)} 567 style={[a.w_full]}> 568 <Toggle.LabelText style={[a.flex_1]}> 569 - <Trans> 570 - Show "Open original skeet" and "Open skeet in PDSls" buttons 571 - </Trans> 572 </Toggle.LabelText> 573 <Toggle.Platform /> 574 </Toggle.Item> ··· 741 742 <Toggle.Item 743 name="repost_carousel" 744 - label={_(msg`Combine reskeets into a horizontal carousel`)} 745 value={repostCarouselEnabled} 746 onChange={value => setRepostCarouselEnabled(value)} 747 style={[a.w_full]}> 748 <Toggle.LabelText style={[a.flex_1]}> 749 - <Trans>Combine reskeets into a horizontal carousel</Trans> 750 </Toggle.LabelText> 751 <Toggle.Platform /> 752 </Toggle.Item> ··· 797 798 <Toggle.Item 799 name="disable_via_repost_notification" 800 - label={_(msg`Disable "via reskeet" notifications`)} 801 value={disableViaRepostNotification} 802 onChange={value => setDisableViaRepostNotification(value)} 803 style={[a.w_full]}> 804 <Toggle.LabelText style={[a.flex_1]}> 805 - <Trans>Disable "via reskeet" notifications</Trans> 806 </Toggle.LabelText> 807 <Toggle.Platform /> 808 </Toggle.Item> 809 <Admonition type="info" style={[a.flex_1]}> 810 - <Trans> 811 - Forcefully disables the notifications other people receive when 812 - you like/reskeet a skeet someone else has reskeeted for privacy. 813 - </Trans> 814 </Admonition> 815 816 <Toggle.Item ··· 883 884 <Toggle.Item 885 name="disable_reposts_metrics" 886 - label={_(msg`Disable reskeets metrics`)} 887 value={disableRepostsMetrics} 888 onChange={value => setDisableRepostsMetrics(value)} 889 style={[a.w_full]}> 890 <Toggle.LabelText style={[a.flex_1]}> 891 - <Trans>Disable reskeets metrics</Trans> 892 </Toggle.LabelText> 893 <Toggle.Platform /> 894 </Toggle.Item> ··· 967 968 <Toggle.Item 969 name="disable_posts_metrics" 970 - label={_(msg`Disable skeets metrics`)} 971 value={disablePostsMetrics} 972 onChange={value => setDisablePostsMetrics(value)} 973 style={[a.w_full]}> 974 <Toggle.LabelText style={[a.flex_1]}> 975 - <Trans>Disable skeets metrics</Trans> 976 </Toggle.LabelText> 977 <Toggle.Platform /> 978 </Toggle.Item>

··· 9 import {APPVIEW_DID_PROXY} from '#/lib/constants' 10 import {usePalette} from '#/lib/hooks/usePalette' 11 import {type CommonNavigatorParams} from '#/lib/routes/types' 12 + import {getTerminology, TERMINOLOGY} from '#/lib/strings/terminology' 13 import {type Gate} from '#/lib/statsig/gates' 14 import { 15 resetDeerGateCache, ··· 560 </SettingsList.ItemText> 561 <Toggle.Item 562 name="external_share_buttons" 563 + label={_(getTerminology(terminologyPreference, TERMINOLOGY.externalShareButtons))} 0 0 564 value={showExternalShareButtons} 565 onChange={value => setShowExternalShareButtons(value)} 566 style={[a.w_full]}> 567 <Toggle.LabelText style={[a.flex_1]}> 568 + <Trans>{_(getTerminology(terminologyPreference, TERMINOLOGY.externalShareButtons))}</Trans> 0 0 569 </Toggle.LabelText> 570 <Toggle.Platform /> 571 </Toggle.Item> ··· 738 739 <Toggle.Item 740 name="repost_carousel" 741 + label={_(getTerminology(terminologyPreference, TERMINOLOGY.carousel))} 742 value={repostCarouselEnabled} 743 onChange={value => setRepostCarouselEnabled(value)} 744 style={[a.w_full]}> 745 <Toggle.LabelText style={[a.flex_1]}> 746 + <Trans>{_(getTerminology(terminologyPreference, TERMINOLOGY.carousel))}</Trans> 747 </Toggle.LabelText> 748 <Toggle.Platform /> 749 </Toggle.Item> ··· 794 795 <Toggle.Item 796 name="disable_via_repost_notification" 797 + label={_(getTerminology(terminologyPreference, TERMINOLOGY.viaRepostNotification))} 798 value={disableViaRepostNotification} 799 onChange={value => setDisableViaRepostNotification(value)} 800 style={[a.w_full]}> 801 <Toggle.LabelText style={[a.flex_1]}> 802 + <Trans>{_(getTerminology(terminologyPreference, TERMINOLOGY.viaRepostNotification))}</Trans> 803 </Toggle.LabelText> 804 <Toggle.Platform /> 805 </Toggle.Item> 806 <Admonition type="info" style={[a.flex_1]}> 807 + <Trans>{_(getTerminology(terminologyPreference, TERMINOLOGY.viaRepostPrivacy))}</Trans> 0 0 0 808 </Admonition> 809 810 <Toggle.Item ··· 877 878 <Toggle.Item 879 name="disable_reposts_metrics" 880 + label={_(getTerminology(terminologyPreference, TERMINOLOGY.repostMetrics))} 881 value={disableRepostsMetrics} 882 onChange={value => setDisableRepostsMetrics(value)} 883 style={[a.w_full]}> 884 <Toggle.LabelText style={[a.flex_1]}> 885 + <Trans>{_(getTerminology(terminologyPreference, TERMINOLOGY.repostMetrics))}</Trans> 886 </Toggle.LabelText> 887 <Toggle.Platform /> 888 </Toggle.Item> ··· 961 962 <Toggle.Item 963 name="disable_posts_metrics" 964 + label={_(getTerminology(terminologyPreference, TERMINOLOGY.metrics))} 965 value={disablePostsMetrics} 966 onChange={value => setDisablePostsMetrics(value)} 967 style={[a.w_full]}> 968 <Toggle.LabelText style={[a.flex_1]}> 969 + <Trans>{_(getTerminology(terminologyPreference, TERMINOLOGY.metrics))}</Trans> 970 </Toggle.LabelText> 971 <Toggle.Platform /> 972 </Toggle.Item>

+23 -4

src/screens/Settings/FollowingFeedPreferences.tsx

··· 5 type CommonNavigatorParams, 6 type NativeStackScreenProps, 7 } from '#/lib/routes/types' 0 0 8 import { 9 usePreferencesQuery, 10 useSetFeedViewPreferencesMutation, ··· 25 > 26 export function FollowingFeedPreferencesScreen({}: Props) { 27 const {_} = useLingui() 0 28 29 const {data: preferences} = usePreferencesQuery() 30 const {mutate: setFeedViewPref, variables} = ··· 86 <Toggle.Item 87 type="checkbox" 88 name="show-reposts" 89 - label={_(msg`Show reskeets`)} 0 0 0 0 90 value={showReposts} 91 onChange={value => 92 setFeedViewPref({ ··· 96 <SettingsList.Item> 97 <SettingsList.ItemIcon icon={RepostIcon} /> 98 <SettingsList.ItemText> 99 - <Trans>Show reskeets</Trans> 0 0 0 0 100 </SettingsList.ItemText> 101 <Toggle.Platform /> 102 </SettingsList.Item> ··· 104 <Toggle.Item 105 type="checkbox" 106 name="show-quotes" 107 - label={_(msg`Show quote skeets`)} 0 0 0 0 108 value={showQuotePosts} 109 onChange={value => 110 setFeedViewPref({ ··· 114 <SettingsList.Item> 115 <SettingsList.ItemIcon icon={QuoteIcon} /> 116 <SettingsList.ItemText> 117 - <Trans>Show quote skeets</Trans> 0 0 0 0 118 </SettingsList.ItemText> 119 <Toggle.Platform /> 120 </SettingsList.Item>

··· 5 type CommonNavigatorParams, 6 type NativeStackScreenProps, 7 } from '#/lib/routes/types' 8 + import {getTerminology} from '#/lib/strings/terminology' 9 + import {useTerminologyPreference} from '#/state/preferences' 10 import { 11 usePreferencesQuery, 12 useSetFeedViewPreferencesMutation, ··· 27 > 28 export function FollowingFeedPreferencesScreen({}: Props) { 29 const {_} = useLingui() 30 + const terminologyPreference = useTerminologyPreference() 31 32 const {data: preferences} = usePreferencesQuery() 33 const {mutate: setFeedViewPref, variables} = ··· 89 <Toggle.Item 90 type="checkbox" 91 name="show-reposts" 92 + label={_(getTerminology(terminologyPreference, { 93 + skeet: msg`Show reskeets`, 94 + post: msg`Show reposts`, 95 + spell: msg`Show respells`, 96 + }))} 97 value={showReposts} 98 onChange={value => 99 setFeedViewPref({ ··· 103 <SettingsList.Item> 104 <SettingsList.ItemIcon icon={RepostIcon} /> 105 <SettingsList.ItemText> 106 + <Trans>{_(getTerminology(terminologyPreference, { 107 + skeet: msg`Show reskeets`, 108 + post: msg`Show reposts`, 109 + spell: msg`Show respells`, 110 + }))}</Trans> 111 </SettingsList.ItemText> 112 <Toggle.Platform /> 113 </SettingsList.Item> ··· 115 <Toggle.Item 116 type="checkbox" 117 name="show-quotes" 118 + label={_(getTerminology(terminologyPreference, { 119 + skeet: msg`Show quote skeets`, 120 + post: msg`Show quote posts`, 121 + spell: msg`Show quote spells`, 122 + }))} 123 value={showQuotePosts} 124 onChange={value => 125 setFeedViewPref({ ··· 129 <SettingsList.Item> 130 <SettingsList.ItemIcon icon={QuoteIcon} /> 131 <SettingsList.ItemText> 132 + <Trans>{_(getTerminology(terminologyPreference, { 133 + skeet: msg`Show quote skeets`, 134 + post: msg`Show quote posts`, 135 + spell: msg`Show quote spells`, 136 + }))}</Trans> 137 </SettingsList.ItemText> 138 <Toggle.Platform /> 139 </SettingsList.Item>

+16 -5

src/screens/Settings/NotificationSettings/LikesOnRepostsNotificationSettings.tsx

··· 1 import {View} from 'react-native' 2 - import {Trans} from '@lingui/macro' 0 3 4 import { 5 type AllNavigatorParams, 6 type NativeStackScreenProps, 7 } from '#/lib/routes/types' 0 0 8 import {useNotificationSettingsQuery} from '#/state/queries/notifications/settings' 9 import {atoms as a} from '#/alf' 10 import {Admonition} from '#/components/Admonition' ··· 19 'LikesOnRepostsNotificationSettings' 20 > 21 export function LikesOnRepostsNotificationSettingsScreen({}: Props) { 0 0 22 const {data: preferences, isError} = useNotificationSettingsQuery() 23 24 return ( ··· 38 <SettingsList.ItemIcon icon={LikeRepostIcon} /> 39 <ItemTextWithSubtitle 40 bold 41 - titleText={<Trans>Likes of your reskeets</Trans>} 0 0 0 0 42 subtitleText={ 43 - <Trans> 44 - Get notifications when people like skeets that you've reskeeted. 45 - </Trans> 0 0 46 } 47 /> 48 </SettingsList.Item>

··· 1 import {View} from 'react-native' 2 + import {msg, Trans} from '@lingui/macro' 3 + import {useLingui} from '@lingui/react' 4 5 import { 6 type AllNavigatorParams, 7 type NativeStackScreenProps, 8 } from '#/lib/routes/types' 9 + import {getTerminology} from '#/lib/strings/terminology' 10 + import {useTerminologyPreference} from '#/state/preferences' 11 import {useNotificationSettingsQuery} from '#/state/queries/notifications/settings' 12 import {atoms as a} from '#/alf' 13 import {Admonition} from '#/components/Admonition' ··· 22 'LikesOnRepostsNotificationSettings' 23 > 24 export function LikesOnRepostsNotificationSettingsScreen({}: Props) { 25 + const {_} = useLingui() 26 + const terminologyPreference = useTerminologyPreference() 27 const {data: preferences, isError} = useNotificationSettingsQuery() 28 29 return ( ··· 43 <SettingsList.ItemIcon icon={LikeRepostIcon} /> 44 <ItemTextWithSubtitle 45 bold 46 + titleText={<Trans>{_(getTerminology(terminologyPreference, { 47 + skeet: msg`Likes of your reskeets`, 48 + post: msg`Likes of your reposts`, 49 + spell: msg`Likes of your respells`, 50 + }))}</Trans>} 51 subtitleText={ 52 + <Trans>{_(getTerminology(terminologyPreference, { 53 + skeet: msg`Get notifications when people like skeets that you've reskeeted.`, 54 + post: msg`Get notifications when people like posts that you've reposted.`, 55 + spell: msg`Get notifications when people like spells that you've respelled.`, 56 + }))}</Trans> 57 } 58 /> 59 </SettingsList.Item>

+16 -3

src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx

··· 1 import {View} from 'react-native' 2 - import {Trans} from '@lingui/macro' 0 3 4 import { 5 type AllNavigatorParams, 6 type NativeStackScreenProps, 7 } from '#/lib/routes/types' 0 0 8 import {useNotificationSettingsQuery} from '#/state/queries/notifications/settings' 9 import {atoms as a} from '#/alf' 10 import {Admonition} from '#/components/Admonition' ··· 19 'RepostNotificationSettings' 20 > 21 export function RepostNotificationSettingsScreen({}: Props) { 0 0 22 const {data: preferences, isError} = useNotificationSettingsQuery() 23 24 return ( ··· 38 <SettingsList.ItemIcon icon={RepostIcon} /> 39 <ItemTextWithSubtitle 40 bold 41 - titleText={<Trans>Reskeets</Trans>} 0 0 0 0 42 subtitleText={ 43 - <Trans>Get notifications when people reskeet your skeets.</Trans> 0 0 0 0 44 } 45 /> 46 </SettingsList.Item>

··· 1 import {View} from 'react-native' 2 + import {msg, Trans} from '@lingui/macro' 3 + import {useLingui} from '@lingui/react' 4 5 import { 6 type AllNavigatorParams, 7 type NativeStackScreenProps, 8 } from '#/lib/routes/types' 9 + import {getTerminology} from '#/lib/strings/terminology' 10 + import {useTerminologyPreference} from '#/state/preferences' 11 import {useNotificationSettingsQuery} from '#/state/queries/notifications/settings' 12 import {atoms as a} from '#/alf' 13 import {Admonition} from '#/components/Admonition' ··· 22 'RepostNotificationSettings' 23 > 24 export function RepostNotificationSettingsScreen({}: Props) { 25 + const {_} = useLingui() 26 + const terminologyPreference = useTerminologyPreference() 27 const {data: preferences, isError} = useNotificationSettingsQuery() 28 29 return ( ··· 43 <SettingsList.ItemIcon icon={RepostIcon} /> 44 <ItemTextWithSubtitle 45 bold 46 + titleText={<Trans>{_(getTerminology(terminologyPreference, { 47 + skeet: msg`Reskeets`, 48 + post: msg`Reposts`, 49 + spell: msg`Respells`, 50 + }))}</Trans>} 51 subtitleText={ 52 + <Trans>{_(getTerminology(terminologyPreference, { 53 + skeet: msg`Get notifications when people reskeet your skeets.`, 54 + post: msg`Get notifications when people repost your posts.`, 55 + spell: msg`Get notifications when people respell your spells.`, 56 + }))}</Trans> 57 } 58 /> 59 </SettingsList.Item>

+16 -6

src/screens/Settings/NotificationSettings/RepostsOnRepostsNotificationSettings.tsx

··· 1 import {View} from 'react-native' 2 - import {Trans} from '@lingui/macro' 0 3 4 import { 5 type AllNavigatorParams, 6 type NativeStackScreenProps, 7 } from '#/lib/routes/types' 0 0 8 import {useNotificationSettingsQuery} from '#/state/queries/notifications/settings' 9 import {atoms as a} from '#/alf' 10 import {Admonition} from '#/components/Admonition' ··· 19 'RepostsOnRepostsNotificationSettings' 20 > 21 export function RepostsOnRepostsNotificationSettingsScreen({}: Props) { 0 0 22 const {data: preferences, isError} = useNotificationSettingsQuery() 23 24 return ( ··· 38 <SettingsList.ItemIcon icon={RepostRepostIcon} /> 39 <ItemTextWithSubtitle 40 bold 41 - titleText={<Trans>Reskeets of your reskeets</Trans>} 0 0 0 0 42 subtitleText={ 43 - <Trans> 44 - Get notifications when people reskeet skeets that you've 45 - reskeeted. 46 - </Trans> 0 47 } 48 /> 49 </SettingsList.Item>

··· 1 import {View} from 'react-native' 2 + import {msg, Trans} from '@lingui/macro' 3 + import {useLingui} from '@lingui/react' 4 5 import { 6 type AllNavigatorParams, 7 type NativeStackScreenProps, 8 } from '#/lib/routes/types' 9 + import {getTerminology} from '#/lib/strings/terminology' 10 + import {useTerminologyPreference} from '#/state/preferences' 11 import {useNotificationSettingsQuery} from '#/state/queries/notifications/settings' 12 import {atoms as a} from '#/alf' 13 import {Admonition} from '#/components/Admonition' ··· 22 'RepostsOnRepostsNotificationSettings' 23 > 24 export function RepostsOnRepostsNotificationSettingsScreen({}: Props) { 25 + const {_} = useLingui() 26 + const terminologyPreference = useTerminologyPreference() 27 const {data: preferences, isError} = useNotificationSettingsQuery() 28 29 return ( ··· 43 <SettingsList.ItemIcon icon={RepostRepostIcon} /> 44 <ItemTextWithSubtitle 45 bold 46 + titleText={<Trans>{_(getTerminology(terminologyPreference, { 47 + skeet: msg`Reskeets of your reskeets`, 48 + post: msg`Reposts of your reposts`, 49 + spell: msg`Respells of your respells`, 50 + }))}</Trans>} 51 subtitleText={ 52 + <Trans>{_(getTerminology(terminologyPreference, { 53 + skeet: msg`Get notifications when people reskeet skeets that you've reskeeted.`, 54 + post: msg`Get notifications when people repost posts that you've reposted.`, 55 + spell: msg`Get notifications when people respell spells that you've respelled.`, 56 + }))}</Trans> 57 } 58 /> 59 </SettingsList.Item>

+6 -3

src/state/queries/pinned-post.ts

··· 3 import {useMutation, useQueryClient} from '@tanstack/react-query' 4 5 import {logger} from '#/logger' 0 0 6 import {RQKEY as FEED_RQKEY} from '#/state/queries/post-feed' 7 import * as Toast from '#/view/com/util/Toast' 8 import {updatePostShadow} from '../cache/post-shadow' ··· 11 12 export function usePinnedPostMutation() { 13 const {_} = useLingui() 0 14 const {currentAccount} = useSession() 15 const agent = useAgent() 16 const queryClient = useQueryClient() ··· 56 }) 57 58 if (pinCurrentPost) { 59 - Toast.show(_(msg({message: 'Skeet pinned', context: 'toast'}))) 60 } else { 61 - Toast.show(_(msg({message: 'Skeet unpinned', context: 'toast'}))) 62 } 63 64 queryClient.invalidateQueries({ ··· 72 ), 73 }) 74 } catch (e: any) { 75 - Toast.show(_(msg`Failed to pin skeet`)) 76 logger.error('Failed to pin post', {message: String(e)}) 77 // revert optimistic update 78 updatePostShadow(queryClient, postUri, {

··· 3 import {useMutation, useQueryClient} from '@tanstack/react-query' 4 5 import {logger} from '#/logger' 6 + import {getTerminology, TERMINOLOGY} from '#/lib/strings/terminology' 7 + import {useTerminologyPreference} from '#/state/preferences' 8 import {RQKEY as FEED_RQKEY} from '#/state/queries/post-feed' 9 import * as Toast from '#/view/com/util/Toast' 10 import {updatePostShadow} from '../cache/post-shadow' ··· 13 14 export function usePinnedPostMutation() { 15 const {_} = useLingui() 16 + const terminologyPreference = useTerminologyPreference() 17 const {currentAccount} = useSession() 18 const agent = useAgent() 19 const queryClient = useQueryClient() ··· 59 }) 60 61 if (pinCurrentPost) { 62 + Toast.show(_(getTerminology(terminologyPreference, TERMINOLOGY.pinned))) 63 } else { 64 + Toast.show(_(getTerminology(terminologyPreference, TERMINOLOGY.unpinned))) 65 } 66 67 queryClient.invalidateQueries({ ··· 75 ), 76 }) 77 } catch (e: any) { 78 + Toast.show(_(getTerminology(terminologyPreference, TERMINOLOGY.failedToPin))) 79 logger.error('Failed to pin post', {message: String(e)}) 80 // revert optimistic update 81 updatePostShadow(queryClient, postUri, {

+16 -15

src/view/com/composer/Composer.tsx

··· 74 import {type NavigationProp} from '#/lib/routes/types' 75 import {logEvent} from '#/lib/statsig/statsig' 76 import {cleanError} from '#/lib/strings/errors' 0 77 import {colors} from '#/lib/styles' 78 import {logger} from '#/logger' 79 import {isAndroid, isIOS, isNative, isWeb} from '#/platform/detection' ··· 85 pasteImage, 86 } from '#/state/gallery' 87 import {useModalControls} from '#/state/modals' 88 - import {useRequireAltTextEnabled} from '#/state/preferences' 89 import {useEnableSquareButtons} from '#/state/preferences/enable-square-buttons' 90 import { 91 fromPostLanguages, ··· 185 const currentDid = currentAccount!.did 186 const {closeComposer} = useComposerControls() 187 const {_} = useLingui() 0 188 const requireAltTextEnabled = useRequireAltTextEnabled() 189 const langPrefs = useLanguagePrefs() 190 const setLangPrefs = useLanguagePrefsApi() ··· 456 replyTo: replyTo?.uri, 457 onStateChange: setPublishingStage, 458 langs: currentLanguages, 0 459 }) 460 ).uris[0] 461 ··· 509 510 let err = cleanError(e.message) 511 if (err.includes('not locate record')) { 512 - err = _( 513 - msg`We're sorry! The skeet you are replying to has been deleted.`, 514 - ) 515 } else if (e instanceof EmbeddingDisabledError) { 516 - err = _(msg`This skeet's author has disabled quote skeets.`) 517 } 518 setError(err) 519 setIsPublishing(false) ··· 573 <Toast.Icon /> 574 <Toast.Text> 575 {thread.posts.length > 1 576 - ? _(msg`Your skeets were sent`) 577 : replyTo 578 ? _(msg`Your reply was sent`) 579 - : _(msg`Your skeet was sent`)} 580 </Toast.Text> 581 {postUri && ( 582 <Toast.Action 583 - label={_(msg`View skeet`)} 584 onPress={() => { 585 const {host: name, rkey} = new AtUri(postUri) 586 navigation.navigate('PostThread', {name, rkey}) ··· 857 const selectTextInputPlaceholder = isReply 858 ? isFirstPost 859 ? _(msg`Write your reply`) 860 - : _(msg`Add another skeet`) 861 - : _(msg`Anything but skeet`) 862 const discardPromptControl = Prompt.usePromptControl() 863 864 const enableSquareButtons = useEnableSquareButtons() ··· 972 {canRemovePost && isActive && ( 973 <> 974 <Button 975 - label={_(msg`Delete skeet`)} 976 size="small" 977 color="secondary" 978 variant="ghost" ··· 997 </Button> 998 <Prompt.Basic 999 control={discardPromptControl} 1000 - title={_(msg`Discard skeet?`)} 1001 - description={_(msg`Are you sure you'd like to discard this skeet?`)} 1002 onConfirm={() => { 1003 dispatch({ 1004 type: 'remove_post', ··· 1133 {isReply ? ( 1134 <Trans context="action">Reply</Trans> 1135 ) : isThread ? ( 1136 - <Trans context="action">Skeet All</Trans> 1137 ) : ( 1138 - <Trans context="action">Skeet</Trans> 1139 )} 1140 </ButtonText> 1141 </Button>

··· 74 import {type NavigationProp} from '#/lib/routes/types' 75 import {logEvent} from '#/lib/statsig/statsig' 76 import {cleanError} from '#/lib/strings/errors' 77 + import {getTerminology, TERMINOLOGY} from '#/lib/strings/terminology' 78 import {colors} from '#/lib/styles' 79 import {logger} from '#/logger' 80 import {isAndroid, isIOS, isNative, isWeb} from '#/platform/detection' ··· 86 pasteImage, 87 } from '#/state/gallery' 88 import {useModalControls} from '#/state/modals' 89 + import {useRequireAltTextEnabled, useTerminologyPreference} from '#/state/preferences' 90 import {useEnableSquareButtons} from '#/state/preferences/enable-square-buttons' 91 import { 92 fromPostLanguages, ··· 186 const currentDid = currentAccount!.did 187 const {closeComposer} = useComposerControls() 188 const {_} = useLingui() 189 + const terminologyPreference = useTerminologyPreference() 190 const requireAltTextEnabled = useRequireAltTextEnabled() 191 const langPrefs = useLanguagePrefs() 192 const setLangPrefs = useLanguagePrefsApi() ··· 458 replyTo: replyTo?.uri, 459 onStateChange: setPublishingStage, 460 langs: currentLanguages, 461 + terminologyPreference, 462 }) 463 ).uris[0] 464 ··· 512 513 let err = cleanError(e.message) 514 if (err.includes('not locate record')) { 515 + err = _(getTerminology(terminologyPreference, TERMINOLOGY.replyWasDeleted)) 0 0 516 } else if (e instanceof EmbeddingDisabledError) { 517 + err = _(getTerminology(terminologyPreference, TERMINOLOGY.quoteAuthorDisabled)) 518 } 519 setError(err) 520 setIsPublishing(false) ··· 574 <Toast.Icon /> 575 <Toast.Text> 576 {thread.posts.length > 1 577 + ? _(getTerminology(terminologyPreference, TERMINOLOGY.sentPlural)) 578 : replyTo 579 ? _(msg`Your reply was sent`) 580 + : _(getTerminology(terminologyPreference, TERMINOLOGY.sent))} 581 </Toast.Text> 582 {postUri && ( 583 <Toast.Action 584 + label={_(getTerminology(terminologyPreference, TERMINOLOGY.view))} 585 onPress={() => { 586 const {host: name, rkey} = new AtUri(postUri) 587 navigation.navigate('PostThread', {name, rkey}) ··· 858 const selectTextInputPlaceholder = isReply 859 ? isFirstPost 860 ? _(msg`Write your reply`) 861 + : _(getTerminology(terminologyPreference, TERMINOLOGY.addAnother)) 862 + : _(getTerminology(terminologyPreference, TERMINOLOGY.anythingBut)) 863 const discardPromptControl = Prompt.usePromptControl() 864 865 const enableSquareButtons = useEnableSquareButtons() ··· 973 {canRemovePost && isActive && ( 974 <> 975 <Button 976 + label={_(getTerminology(terminologyPreference, TERMINOLOGY.delete))} 977 size="small" 978 color="secondary" 979 variant="ghost" ··· 998 </Button> 999 <Prompt.Basic 1000 control={discardPromptControl} 1001 + title={_(getTerminology(terminologyPreference, TERMINOLOGY.discard))} 1002 + description={_(getTerminology(terminologyPreference, TERMINOLOGY.discardConfirm))} 1003 onConfirm={() => { 1004 dispatch({ 1005 type: 'remove_post', ··· 1134 {isReply ? ( 1135 <Trans context="action">Reply</Trans> 1136 ) : isThread ? ( 1137 + <Trans context="action">{_(getTerminology(terminologyPreference, TERMINOLOGY.postAll))}</Trans> 1138 ) : ( 1139 + <Trans context="action">{_(getTerminology(terminologyPreference, TERMINOLOGY.postSingle))}</Trans> 1140 )} 1141 </ButtonText> 1142 </Button>

+6 -7

src/view/com/composer/select-language/PostLanguageSelect.tsx

··· 3 4 import {LANG_DROPDOWN_HITSLOP} from '#/lib/constants' 5 import {codeToLanguageName} from '#/locale/helpers' 0 0 6 import { 7 toPostLanguages, 8 useLanguagePrefs, ··· 25 onSelectLanguage?: (language: string) => void 26 }) { 27 const {_} = useLingui() 0 28 const langPrefs = useLanguagePrefs() 29 const setLangPrefs = useLanguagePrefsApi() 30 const languageDialogControl = Dialog.useDialogControl() ··· 54 return ( 55 <> 56 <Menu.Root> 57 - <Menu.Trigger label={_(msg`Select skeet language`)}> 58 {({props}) => ( 59 <LanguageBtn currentLanguages={currentLanguages} {...props} /> 60 )} ··· 109 }, 110 ) { 111 const {_} = useLingui() 0 112 const langPrefs = useLanguagePrefs() 113 const t = useTheme() 114 ··· 120 testID="selectLangBtn" 121 size="small" 122 hitSlop={LANG_DROPDOWN_HITSLOP} 123 - label={_( 124 - msg({ 125 - message: `Skeet language selection`, 126 - comment: `Accessibility label for button that opens dialog to choose post language settings`, 127 - }), 128 - )} 129 accessibilityHint={_(msg`Opens post language settings`)} 130 style={[a.mr_xs]} 131 {...props}>

··· 3 4 import {LANG_DROPDOWN_HITSLOP} from '#/lib/constants' 5 import {codeToLanguageName} from '#/locale/helpers' 6 + import {getTerminology, TERMINOLOGY} from '#/lib/strings/terminology' 7 + import {useTerminologyPreference} from '#/state/preferences' 8 import { 9 toPostLanguages, 10 useLanguagePrefs, ··· 27 onSelectLanguage?: (language: string) => void 28 }) { 29 const {_} = useLingui() 30 + const terminologyPreference = useTerminologyPreference() 31 const langPrefs = useLanguagePrefs() 32 const setLangPrefs = useLanguagePrefsApi() 33 const languageDialogControl = Dialog.useDialogControl() ··· 57 return ( 58 <> 59 <Menu.Root> 60 + <Menu.Trigger label={_(getTerminology(terminologyPreference, TERMINOLOGY.selectLanguage))}> 61 {({props}) => ( 62 <LanguageBtn currentLanguages={currentLanguages} {...props} /> 63 )} ··· 112 }, 113 ) { 114 const {_} = useLingui() 115 + const terminologyPreference = useTerminologyPreference() 116 const langPrefs = useLanguagePrefs() 117 const t = useTheme() 118 ··· 124 testID="selectLangBtn" 125 size="small" 126 hitSlop={LANG_DROPDOWN_HITSLOP} 127 + label={_(getTerminology(terminologyPreference, TERMINOLOGY.selectLanguage))} 0 0 0 0 0 128 accessibilityHint={_(msg`Opens post language settings`)} 129 style={[a.mr_xs]} 130 {...props}>

+5 -2

src/view/com/composer/select-language/PostLanguageSelectDialog.tsx

··· 7 import {languageName} from '#/locale/helpers' 8 import {type Language, LANGUAGES, LANGUAGES_MAP_CODE2} from '#/locale/languages' 9 import {isNative, isWeb} from '#/platform/detection' 0 0 10 import {useEnableSquareButtons} from '#/state/preferences/enable-square-buttons' 11 import { 12 toPostLanguages, ··· 93 const setLangPrefs = useLanguagePrefsApi() 94 const t = useTheme() 95 const {_} = useLingui() 0 96 97 const enableSquareButtons = useEnableSquareButtons() 98 ··· 184 a.text_xl, 185 a.mb_sm, 186 ]}> 187 - <Trans>Choose Skeet Languages</Trans> 188 </Text> 189 <Text 190 nativeID="dialog-description" ··· 194 a.text_md, 195 a.mb_lg, 196 ]}> 197 - <Trans>Select up to 3 languages used in this skeet</Trans> 198 </Text> 199 </View> 200

··· 7 import {languageName} from '#/locale/helpers' 8 import {type Language, LANGUAGES, LANGUAGES_MAP_CODE2} from '#/locale/languages' 9 import {isNative, isWeb} from '#/platform/detection' 10 + import {getTerminology, TERMINOLOGY} from '#/lib/strings/terminology' 11 + import {useTerminologyPreference} from '#/state/preferences' 12 import {useEnableSquareButtons} from '#/state/preferences/enable-square-buttons' 13 import { 14 toPostLanguages, ··· 95 const setLangPrefs = useLanguagePrefsApi() 96 const t = useTheme() 97 const {_} = useLingui() 98 + const terminologyPreference = useTerminologyPreference() 99 100 const enableSquareButtons = useEnableSquareButtons() 101 ··· 187 a.text_xl, 188 a.mb_sm, 189 ]}> 190 + <Trans>{_(getTerminology(terminologyPreference, TERMINOLOGY.chooseLanguages))}</Trans> 191 </Text> 192 <Text 193 nativeID="dialog-description" ··· 197 a.text_md, 198 a.mb_lg, 199 ]}> 200 + <Trans>{_(getTerminology(terminologyPreference, TERMINOLOGY.languageDescription))}</Trans> 201 </Text> 202 </View> 203

+13 -4

src/view/com/post-thread/PostRepostedBy.tsx

··· 5 6 import {useInitialNumToRender} from '#/lib/hooks/useInitialNumToRender' 7 import {cleanError} from '#/lib/strings/errors' 0 0 8 import {logger} from '#/logger' 9 import {usePostRepostedByQuery} from '#/state/queries/post-reposted-by' 10 import {useResolveUriQuery} from '#/state/queries/resolve-uri' ··· 34 35 export function PostRepostedBy({uri}: {uri: string}) { 36 const {_} = useLingui() 0 37 const initialNumToRender = useInitialNumToRender() 38 39 const [isPTRing, setIsPTRing] = useState(false) ··· 87 isLoading={isLoadingUri || isLoadingRepostedBy} 88 isError={isError} 89 emptyType="results" 90 - emptyTitle={_(msg`No reskeets yet`)} 91 - emptyMessage={_( 92 - msg`Nobody has reskeeted this yet. Maybe you should be the first!`, 93 - )} 0 0 0 0 0 0 94 errorMessage={cleanError(resolveError || error)} 95 sideBorders={false} 96 />

··· 5 6 import {useInitialNumToRender} from '#/lib/hooks/useInitialNumToRender' 7 import {cleanError} from '#/lib/strings/errors' 8 + import {getTerminology, TERMINOLOGY} from '#/lib/strings/terminology' 9 + import {useTerminologyPreference} from '#/state/preferences' 10 import {logger} from '#/logger' 11 import {usePostRepostedByQuery} from '#/state/queries/post-reposted-by' 12 import {useResolveUriQuery} from '#/state/queries/resolve-uri' ··· 36 37 export function PostRepostedBy({uri}: {uri: string}) { 38 const {_} = useLingui() 39 + const terminologyPreference = useTerminologyPreference() 40 const initialNumToRender = useInitialNumToRender() 41 42 const [isPTRing, setIsPTRing] = useState(false) ··· 90 isLoading={isLoadingUri || isLoadingRepostedBy} 91 isError={isError} 92 emptyType="results" 93 + emptyTitle={_(getTerminology(terminologyPreference, { 94 + skeet: msg`No reskeets yet`, 95 + post: msg`No reposts yet`, 96 + spell: msg`No respells yet`, 97 + }))} 98 + emptyMessage={_(getTerminology(terminologyPreference, { 99 + skeet: msg`Nobody has reskeeted this yet. Maybe you should be the first!`, 100 + post: msg`Nobody has reposted this yet. Maybe you should be the first!`, 101 + spell: msg`Nobody has respelled this yet. Maybe you should be the first!`, 102 + }))} 103 errorMessage={cleanError(resolveError || error)} 104 sideBorders={false} 105 />

+8 -3

src/view/com/posts/PostFeedReason.tsx

··· 6 import {isReasonFeedSource, type ReasonFeedSource} from '#/lib/api/feed/types' 7 import {createSanitizedDisplayName} from '#/lib/moderation/create-sanitized-display-name' 8 import {makeProfileLink} from '#/lib/routes/links' 0 0 9 import {useSession} from '#/state/session' 10 import {atoms as a, useTheme} from '#/alf' 11 import {Pin_Stroke2_Corner0_Rounded as PinIcon} from '#/components/icons/Pin' ··· 30 }) { 31 const t = useTheme() 32 const {_} = useLingui() 0 33 34 const {currentAccount} = useSession() 35 ··· 74 style={styles.includeReason} 75 to={makeProfileLink(reason.by)} 76 label={ 77 - isOwner ? _(msg`Reskeeted by you`) : _(msg`Reskeeted by ${reposter}`) 0 0 78 } 79 onPress={onOpenReposter}> 80 <RepostIcon ··· 91 ]} 92 numberOfLines={1}> 93 {isOwner ? ( 94 - <Trans>Reskeeted by you</Trans> 95 ) : ( 96 - <Trans>Reskeeted by {reposter}</Trans> 97 )} 98 </Text> 99 </ProfileHoverCard>

··· 6 import {isReasonFeedSource, type ReasonFeedSource} from '#/lib/api/feed/types' 7 import {createSanitizedDisplayName} from '#/lib/moderation/create-sanitized-display-name' 8 import {makeProfileLink} from '#/lib/routes/links' 9 + import {getTerminology, TERMINOLOGY} from '#/lib/strings/terminology' 10 + import {useTerminologyPreference} from '#/state/preferences' 11 import {useSession} from '#/state/session' 12 import {atoms as a, useTheme} from '#/alf' 13 import {Pin_Stroke2_Corner0_Rounded as PinIcon} from '#/components/icons/Pin' ··· 32 }) { 33 const t = useTheme() 34 const {_} = useLingui() 35 + const terminologyPreference = useTerminologyPreference() 36 37 const {currentAccount} = useSession() 38 ··· 77 style={styles.includeReason} 78 to={makeProfileLink(reason.by)} 79 label={ 80 + isOwner 81 + ? _(getTerminology(terminologyPreference, TERMINOLOGY.repost.byLine)) 82 + : `${_(getTerminology(terminologyPreference, TERMINOLOGY.repost.byLine))} ${reposter}` 83 } 84 onPress={onOpenReposter}> 85 <RepostIcon ··· 96 ]} 97 numberOfLines={1}> 98 {isOwner ? ( 99 + <Trans>{_(getTerminology(terminologyPreference, TERMINOLOGY.repost.byLine))}</Trans> 100 ) : ( 101 + <Trans>{_(getTerminology(terminologyPreference, TERMINOLOGY.repost.byLine))} {reposter}</Trans> 102 )} 103 </Text> 104 </ProfileHoverCard>

+13 -2

src/view/shell/desktop/LeftNav.tsx

··· 19 import {useGate} from '#/lib/statsig/statsig' 20 import {sanitizeDisplayName} from '#/lib/strings/display-names' 21 import {isInvalidHandle, sanitizeHandle} from '#/lib/strings/handles' 0 22 import {emitSoftReset} from '#/state/events' 23 import {useHomeBadge} from '#/state/home-badge' 24 import {useEnableSquareButtons} from '#/state/preferences/enable-square-buttons' 0 25 import {useFetchHandle} from '#/state/queries/handle' 26 import {useUnreadMessageCount} from '#/state/queries/messages/list-conversations' 27 import {useUnreadNotifications} from '#/state/queries/notifications/unread' ··· 530 const {getState} = useNavigation() 531 const {openComposer} = useOpenComposer() 532 const {_} = useLingui() 0 533 const {leftNavMinimal} = useLayoutBreakpoints() 534 const [isFetchingHandle, setIsFetchingHandle] = useState(false) 535 const fetchHandle = useFetchHandle() ··· 580 <View style={[a.flex_row, a.pl_md, a.pt_xl]}> 581 <Button 582 disabled={isFetchingHandle} 583 - label={_(msg`Compose new post`)} 0 0 0 0 584 onPress={onPressCompose} 585 size="large" 586 variant="solid" ··· 588 style={enableSquareButtons ? [a.rounded_sm] : [a.rounded_full]}> 589 <ButtonIcon icon={EditBig} position="left" /> 590 <ButtonText> 591 - <Trans context="action">New Skeet</Trans> 0 0 0 0 592 </ButtonText> 593 </Button> 594 </View>

··· 19 import {useGate} from '#/lib/statsig/statsig' 20 import {sanitizeDisplayName} from '#/lib/strings/display-names' 21 import {isInvalidHandle, sanitizeHandle} from '#/lib/strings/handles' 22 + import {getTerminology} from '#/lib/strings/terminology' 23 import {emitSoftReset} from '#/state/events' 24 import {useHomeBadge} from '#/state/home-badge' 25 import {useEnableSquareButtons} from '#/state/preferences/enable-square-buttons' 26 + import {useTerminologyPreference} from '#/state/preferences' 27 import {useFetchHandle} from '#/state/queries/handle' 28 import {useUnreadMessageCount} from '#/state/queries/messages/list-conversations' 29 import {useUnreadNotifications} from '#/state/queries/notifications/unread' ··· 532 const {getState} = useNavigation() 533 const {openComposer} = useOpenComposer() 534 const {_} = useLingui() 535 + const terminologyPreference = useTerminologyPreference() 536 const {leftNavMinimal} = useLayoutBreakpoints() 537 const [isFetchingHandle, setIsFetchingHandle] = useState(false) 538 const fetchHandle = useFetchHandle() ··· 583 <View style={[a.flex_row, a.pl_md, a.pt_xl]}> 584 <Button 585 disabled={isFetchingHandle} 586 + label={_(getTerminology(terminologyPreference, { 587 + skeet: msg`Compose new skeet`, 588 + post: msg`Compose new post`, 589 + spell: msg`Compose new spell`, 590 + }))} 591 onPress={onPressCompose} 592 size="large" 593 variant="solid" ··· 595 style={enableSquareButtons ? [a.rounded_sm] : [a.rounded_full]}> 596 <ButtonIcon icon={EditBig} position="left" /> 597 <ButtonText> 598 + <Trans>{_(getTerminology(terminologyPreference, { 599 + skeet: msg({message: `New Skeet`, context: 'action'}), 600 + post: msg({message: `New Post`, context: 'action'}), 601 + spell: msg({message: `New Spell`, context: 'action'}), 602 + }))}</Trans> 603 </ButtonText> 604 </Button> 605 </View>