diff options
Diffstat (limited to 'src/view/com/feeds')
| -rw-r--r-- | src/view/com/feeds/FeedPage.tsx | 2 | ||||
| -rw-r--r-- | src/view/com/feeds/FeedSourceCard.tsx | 33 | ||||
| -rw-r--r-- | src/view/com/feeds/ProfileFeedgens.tsx | 10 |
3 files changed, 28 insertions, 17 deletions
diff --git a/src/view/com/feeds/FeedPage.tsx b/src/view/com/feeds/FeedPage.tsx index 84d49e3b0..2d0b17f38 100644 --- a/src/view/com/feeds/FeedPage.tsx +++ b/src/view/com/feeds/FeedPage.tsx @@ -197,7 +197,7 @@ export function FeedPage({ onPress={onPressCompose} icon={<ComposeIcon2 strokeWidth={1.5} size={29} style={s.white} />} accessibilityRole="button" - accessibilityLabel={_(msg`New post`)} + accessibilityLabel={_(msg({message: `New post`, context: 'action'}))} accessibilityHint="" /> )} diff --git a/src/view/com/feeds/FeedSourceCard.tsx b/src/view/com/feeds/FeedSourceCard.tsx index 338ffc3d0..487163840 100644 --- a/src/view/com/feeds/FeedSourceCard.tsx +++ b/src/view/com/feeds/FeedSourceCard.tsx @@ -14,7 +14,7 @@ import * as Toast from 'view/com/util/Toast' import {sanitizeHandle} from 'lib/strings/handles' import {logger} from '#/logger' import {useModalControls} from '#/state/modals' -import {msg} from '@lingui/macro' +import {Trans, msg} from '@lingui/macro' import {useLingui} from '@lingui/react' import { usePinFeedMutation, @@ -108,9 +108,9 @@ export function FeedSourceCardLoaded({ try { await removeFeed({uri: feed.uri}) // await item.unsave() - Toast.show('Removed from my feeds') + Toast.show(_(msg`Removed from my feeds`)) } catch (e) { - Toast.show('There was an issue contacting your server') + Toast.show(_(msg`There was an issue contacting your server`)) logger.error('Failed to unsave feed', {error: e}) } }, @@ -122,9 +122,9 @@ export function FeedSourceCardLoaded({ } else { await saveFeed({uri: feed.uri}) } - Toast.show('Added to my feeds') + Toast.show(_(msg`Added to my feeds`)) } catch (e) { - Toast.show('There was an issue contacting your server') + Toast.show(_(msg`There was an issue contacting your server`)) logger.error('Failed to save feed', {error: e}) } } @@ -164,7 +164,7 @@ export function FeedSourceCardLoaded({ testID={`feed-${feedUri}-toggleSave`} disabled={isRemovePending} accessibilityRole="button" - accessibilityLabel={'Remove from my feeds'} + accessibilityLabel={_(msg`Remove from my feeds`)} accessibilityHint="" onPress={() => { openModal({ @@ -175,9 +175,11 @@ export function FeedSourceCardLoaded({ try { await removeFeed({uri: feedUri}) // await item.unsave() - Toast.show('Removed from my feeds') + Toast.show(_(msg`Removed from my feeds`)) } catch (e) { - Toast.show('There was an issue contacting your server') + Toast.show( + _(msg`There was an issue contacting your server`), + ) logger.error('Failed to unsave feed', {error: e}) } }, @@ -223,8 +225,11 @@ export function FeedSourceCardLoaded({ {feed.displayName} </Text> <Text style={[pal.textLight]} numberOfLines={3}> - {feed.type === 'feed' ? 'Feed' : 'List'} by{' '} - {sanitizeHandle(feed.creatorHandle, '@')} + {feed.type === 'feed' ? ( + <Trans>Feed by {sanitizeHandle(feed.creatorHandle, '@')}</Trans> + ) : ( + <Trans>List by {sanitizeHandle(feed.creatorHandle, '@')}</Trans> + )} </Text> </View> @@ -235,7 +240,7 @@ export function FeedSourceCardLoaded({ disabled={isSavePending || isPinPending || isRemovePending} accessibilityRole="button" accessibilityLabel={ - isSaved ? 'Remove from my feeds' : 'Add to my feeds' + isSaved ? _(msg`Remove from my feeds`) : _(msg`Add to my feeds`) } accessibilityHint="" onPress={onToggleSaved} @@ -269,8 +274,10 @@ export function FeedSourceCardLoaded({ {showLikes && feed.type === 'feed' ? ( <Text type="sm-medium" style={[pal.text, pal.textLight]}> - Liked by {feed.likeCount || 0}{' '} - {pluralize(feed.likeCount || 0, 'user')} + <Trans> + Liked by {feed.likeCount || 0}{' '} + {pluralize(feed.likeCount || 0, 'user')} + </Trans> </Text> ) : null} </Pressable> diff --git a/src/view/com/feeds/ProfileFeedgens.tsx b/src/view/com/feeds/ProfileFeedgens.tsx index 8665fbfac..f558eb18c 100644 --- a/src/view/com/feeds/ProfileFeedgens.tsx +++ b/src/view/com/feeds/ProfileFeedgens.tsx @@ -9,13 +9,14 @@ import {Text} from '../util/text/Text' import {usePalette} from 'lib/hooks/usePalette' import {useProfileFeedgensQuery, RQKEY} from '#/state/queries/profile-feedgens' import {logger} from '#/logger' -import {Trans} from '@lingui/macro' +import {Trans, msg} from '@lingui/macro' import {cleanError} from '#/lib/strings/errors' import {useTheme} from '#/lib/ThemeContext' import {usePreferencesQuery} from '#/state/queries/preferences' import {hydrateFeedGenerator} from '#/state/queries/feed' import {FeedLoadingPlaceholder} from '#/view/com/util/LoadingPlaceholder' import {isNative} from '#/platform/detection' +import {useLingui} from '@lingui/react' const LOADING = {_reactKey: '__loading__'} const EMPTY = {_reactKey: '__empty__'} @@ -43,6 +44,7 @@ export const ProfileFeedgens = React.forwardRef< ref, ) { const pal = usePalette('default') + const {_} = useLingui() const theme = useTheme() const [isPTRing, setIsPTRing] = React.useState(false) const opts = React.useMemo(() => ({enabled}), [enabled]) @@ -142,7 +144,9 @@ export const ProfileFeedgens = React.forwardRef< } else if (item === LOAD_MORE_ERROR_ITEM) { return ( <LoadMoreRetryBtn - label="There was an issue fetching your lists. Tap here to try again." + label={_( + msg`There was an issue fetching your lists. Tap here to try again.`, + )} onPress={onPressRetryLoadMore} /> ) @@ -162,7 +166,7 @@ export const ProfileFeedgens = React.forwardRef< } return null }, - [error, refetch, onPressRetryLoadMore, pal, preferences], + [error, refetch, onPressRetryLoadMore, pal, preferences, _], ) return ( |