octo/tooot
1
0
Fork 0
mirror of https://github.com/tooot-app/app synced 2025-06-05 22:19:13 +02:00
Code Issues Projects Releases Wiki Activity

Update i18next type

Browse Source
This commit is contained in:
xmflsct
2022-12-23 15:53:40 +01:00
parent b388853429
commit e32125ad17
49 changed files with 1054 additions and 896 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/screens/Actions/AltText.tsx
View File

@@ -16,17 +16,15 @@ export interface Props {
const ActionsAltText: React.FC<Props> = ({ text }) => {
const navigation = useNavigation()
const { t } = useTranslation('screenActions')
const { t } = useTranslation(['common', 'screenActions'])
const { colors } = useTheme()
return (
<>
<MenuContainer>
<MenuHeader heading={t(`content.altText.heading`)} />
<MenuHeader heading={t(`screenActions:content.altText.heading`)} />
<ScrollView style={{ maxHeight: Dimensions.get('window').height / 2 }}>
<CustomText style={{ color: colors.primaryDefault }}>
{text}
</CustomText>
<CustomText style={{ color: colors.primaryDefault }}>{text}</CustomText>
</ScrollView>
</MenuContainer>
<Button

3
src/screens/Announcements.tsx
View File

@@ -87,7 +87,8 @@ const ScreenAnnouncements: React.FC<RootStackScreenProps<'Screen-Announcements'>
}}
>
<Trans
i18nKey='screenAnnouncements:content.published'
ns='screenAnnouncements'
i18nKey='content.published'
components={[<RelativeTime time={item.published_at} />]}
/>
</CustomText>

22
src/screens/Compose.tsx
View File

@@ -39,7 +39,7 @@ const ScreenCompose: React.FC<RootStackScreenProps<'Screen-Compose'>> = ({
route: { params },
navigation
}) => {
const { t } = useTranslation('screenCompose')
const { t } = useTranslation(['common', 'screenCompose'])
const { colors } = useTheme()
const queryClient = useQueryClient()
@@ -212,9 +212,9 @@ const ScreenCompose: React.FC<RootStackScreenProps<'Screen-Compose'>> = ({
navigation.goBack()
return
} else {
Alert.alert(t('heading.left.alert.title'), undefined, [
Alert.alert(t('screenCompose:heading.left.alert.title'), undefined, [
{
text: t('heading.left.alert.buttons.delete'),
text: t('screenCompose:heading.left.alert.buttons.delete'),
style: 'destructive',
onPress: () => {
removeDraft()
@@ -222,7 +222,7 @@ const ScreenCompose: React.FC<RootStackScreenProps<'Screen-Compose'>> = ({
}
},
{
text: t('heading.left.alert.buttons.save'),
text: t('screenCompose:heading.left.alert.buttons.save'),
onPress: () => {
saveDraft()
navigation.goBack()
@@ -266,7 +266,7 @@ const ScreenCompose: React.FC<RootStackScreenProps<'Screen-Compose'>> = ({
: 'default'
: params.type)) ||
'default'
}`
}` as any
)}
onPress={() => {
composeDispatch({ type: 'posting', payload: true })
@@ -302,8 +302,8 @@ const ScreenCompose: React.FC<RootStackScreenProps<'Screen-Compose'>> = ({
.catch(error => {
if (error?.removeReply) {
Alert.alert(
t('heading.right.alert.removeReply.title'),
t('heading.right.alert.removeReply.description'),
t('screenCompose:heading.right.alert.removeReply.title'),
t('screenCompose:heading.right.alert.removeReply.description'),
[
{
text: t('common:buttons.cancel'),
@@ -313,7 +313,7 @@ const ScreenCompose: React.FC<RootStackScreenProps<'Screen-Compose'>> = ({
style: 'destructive'
},
{
text: t('heading.right.alert.removeReply.confirm'),
text: t('screenCompose:heading.right.alert.removeReply.confirm'),
onPress: () => {
composeDispatch({ type: 'removeReply' })
composeDispatch({ type: 'posting', payload: false })
@@ -326,10 +326,8 @@ const ScreenCompose: React.FC<RootStackScreenProps<'Screen-Compose'>> = ({
haptics('Error')
handleError({ message: 'Posting error', captureResponse: true })
composeDispatch({ type: 'posting', payload: false })
Alert.alert(t('heading.right.alert.default.title'), undefined, [
{
text: t('heading.right.alert.default.button')
}
Alert.alert(t('screenCompose:heading.right.alert.default.title'), undefined, [
{ text: t('screenCompose:heading.right.alert.default.button') }
])
}
})

28
src/screens/Compose/Root/Actions.tsx
View File

@@ -16,7 +16,7 @@ import chooseAndUploadAttachment from './Footer/addAttachment'
const ComposeActions: React.FC = () => {
const { showActionSheetWithOptions } = useActionSheet()
const { composeState, composeDispatch } = useContext(ComposeContext)
const { t } = useTranslation('screenCompose')
const { t } = useTranslation(['common', 'screenCompose'])
const { colors } = useTheme()
const instanceConfigurationStatusMaxAttachments = useSelector(
getInstanceConfigurationStatusMaxAttachments,
@@ -81,12 +81,12 @@ const ComposeActions: React.FC = () => {
if (!composeState.visibilityLock) {
showActionSheetWithOptions(
{
title: t('content.root.actions.visibility.title'),
title: t('screenCompose:content.root.actions.visibility.title'),
options: [
t('content.root.actions.visibility.options.public'),
t('content.root.actions.visibility.options.unlisted'),
t('content.root.actions.visibility.options.private'),
t('content.root.actions.visibility.options.direct'),
t('screenCompose:content.root.actions.visibility.options.public'),
t('screenCompose:content.root.actions.visibility.options.unlisted'),
t('screenCompose:content.root.actions.visibility.options.private'),
t('screenCompose:content.root.actions.visibility.options.direct'),
t('common:buttons.cancel')
],
cancelButtonIndex: 4,
@@ -160,8 +160,8 @@ const ComposeActions: React.FC = () => {
>
<Pressable
accessibilityRole='button'
accessibilityLabel={t('content.root.actions.attachment.accessibilityLabel')}
accessibilityHint={t('content.root.actions.attachment.accessibilityHint')}
accessibilityLabel={t('screenCompose:content.root.actions.attachment.accessibilityLabel')}
accessibilityHint={t('screenCompose:content.root.actions.attachment.accessibilityHint')}
accessibilityState={{
disabled: composeState.poll.active
}}
@@ -171,8 +171,8 @@ const ComposeActions: React.FC = () => {
/>
<Pressable
accessibilityRole='button'
accessibilityLabel={t('content.root.actions.poll.accessibilityLabel')}
accessibilityHint={t('content.root.actions.poll.accessibilityHint')}
accessibilityLabel={t('screenCompose:content.root.actions.poll.accessibilityLabel')}
accessibilityHint={t('screenCompose:content.root.actions.poll.accessibilityHint')}
accessibilityState={{
disabled: composeState.attachments.uploads.length ? true : false,
expanded: composeState.poll.active
@@ -183,7 +183,7 @@ const ComposeActions: React.FC = () => {
/>
<Pressable
accessibilityRole='button'
accessibilityLabel={t('content.root.actions.visibility.accessibilityLabel', {
accessibilityLabel={t('screenCompose:content.root.actions.visibility.accessibilityLabel', {
visibility: composeState.visibility
})}
accessibilityState={{ disabled: composeState.visibilityLock }}
@@ -199,7 +199,7 @@ const ComposeActions: React.FC = () => {
/>
<Pressable
accessibilityRole='button'
accessibilityLabel={t('content.root.actions.spoiler.accessibilityLabel')}
accessibilityLabel={t('screenCompose:content.root.actions.spoiler.accessibilityLabel')}
accessibilityState={{ expanded: composeState.spoiler.active }}
style={styles.button}
onPress={spoilerOnPress}
@@ -213,8 +213,8 @@ const ComposeActions: React.FC = () => {
/>
<Pressable
accessibilityRole='button'
accessibilityLabel={t('content.root.actions.emoji.accessibilityLabel')}
accessibilityHint={t('content.root.actions.emoji.accessibilityHint')}
accessibilityLabel={t('screenCompose:content.root.actions.emoji.accessibilityLabel')}
accessibilityHint={t('screenCompose:content.root.actions.emoji.accessibilityHint')}
accessibilityState={{
disabled: emojis.current?.length ? false : true,
expanded: emojisState.targetIndex !== -1

39
src/screens/Compose/Root/Footer/Poll.tsx
View File

@@ -21,7 +21,7 @@ const ComposePoll: React.FC = () => {
},
composeDispatch
} = useContext(ComposeContext)
const { t } = useTranslation('screenCompose')
const { t } = useTranslation(['common', 'screenCompose'])
const { colors, mode } = useTheme()
const instanceConfigurationPoll = useSelector(getInstanceConfigurationPoll, () => true)
@@ -71,7 +71,7 @@ const ComposePoll: React.FC = () => {
/>
<TextInput
accessibilityLabel={t(
'content.root.footer.poll.option.placeholder.accessibilityLabel',
'screenCompose:content.root.footer.poll.option.placeholder.accessibilityLabel',
{ index: i + 1 }
)}
keyboardAppearance={mode}
@@ -88,8 +88,8 @@ const ComposePoll: React.FC = () => {
}}
placeholder={
multiple
? t('content.root.footer.poll.option.placeholder.multiple')
: t('content.root.footer.poll.option.placeholder.single')
? t('screenCompose:content.root.footer.poll.option.placeholder.multiple')
: t('screenCompose:content.root.footer.poll.option.placeholder.single')
}
placeholderTextColor={colors.disabled}
maxLength={MAX_CHARS_PER_OPTION}
@@ -119,14 +119,15 @@ const ComposePoll: React.FC = () => {
{...(total > 2
? {
accessibilityLabel: t(
'content.root.footer.poll.quantity.reduce.accessibilityLabel',
'screenCompose:content.root.footer.poll.quantity.reduce.accessibilityLabel',
{ amount: total - 1 }
)
}
: {
accessibilityHint: t('content.root.footer.poll.quantity.reduce.accessibilityHint', {
amount: total
})
accessibilityHint: t(
'screenCompose:content.root.footer.poll.quantity.reduce.accessibilityHint',
{ amount: total }
)
})}
onPress={() => {
total > 2 &&
@@ -152,13 +153,13 @@ const ComposePoll: React.FC = () => {
{...(total < MAX_OPTIONS
? {
accessibilityLabel: t(
'content.root.footer.poll.quantity.increase.accessibilityLabel',
'screenCompose:content.root.footer.poll.quantity.increase.accessibilityLabel',
{ amount: total + 1 }
)
}
: {
accessibilityHint: t(
'content.root.footer.poll.quantity.increase.accessibilityHint',
'screenCompose:content.root.footer.poll.quantity.increase.accessibilityHint',
{ amount: total }
)
})}
@@ -177,18 +178,18 @@ const ComposePoll: React.FC = () => {
</View>
<View style={{ paddingHorizontal: StyleConstants.Spacing.Global.PagePadding }}>
<MenuRow
title={t('content.root.footer.poll.multiple.heading')}
title={t('screenCompose:content.root.footer.poll.multiple.heading')}
content={
multiple
? t('content.root.footer.poll.multiple.options.multiple')
: t('content.root.footer.poll.multiple.options.single')
? t('screenCompose:content.root.footer.poll.multiple.options.multiple')
: t('screenCompose:content.root.footer.poll.multiple.options.single')
}
onPress={() =>
showActionSheetWithOptions(
{
options: [
t('content.root.footer.poll.multiple.options.single'),
t('content.root.footer.poll.multiple.options.multiple'),
t('screenCompose:content.root.footer.poll.multiple.options.single'),
t('screenCompose:content.root.footer.poll.multiple.options.multiple'),
t('common:buttons.cancel')
],
cancelButtonIndex: 2,
@@ -207,8 +208,8 @@ const ComposePoll: React.FC = () => {
iconBack='ChevronRight'
/>
<MenuRow
title={t('content.root.footer.poll.expiration.heading')}
content={t(`content.root.footer.poll.expiration.options.${expire}`)}
title={t('screenCompose:content.root.footer.poll.expiration.heading')}
content={t(`screenCompose:content.root.footer.poll.expiration.options.${expire}`)}
onPress={() => {
const expirations = [
'300',
@@ -225,7 +226,9 @@ const ComposePoll: React.FC = () => {
showActionSheetWithOptions(
{
options: [
...expirations.map(e => t(`content.root.footer.poll.expiration.options.${e}`)),
...expirations.map(e =>
t(`screenCompose:content.root.footer.poll.expiration.options.${e}` as any)
),
t('common:buttons.cancel')
],
cancelButtonIndex: expirations.length,

14
src/screens/ImagesViewer.tsx
View File

@@ -41,7 +41,7 @@ const ScreenImagesViewer = ({
const insets = useSafeAreaInsets()
const { mode, colors } = useTheme()
const { t } = useTranslation('screenImageViewer')
const { t } = useTranslation(['common', 'screenImageViewer'])
const initialIndex = imageUrls.findIndex(image => image.id === id)
const [currentIndex, setCurrentIndex] = useState(initialIndex)
@@ -51,8 +51,8 @@ const ScreenImagesViewer = ({
showActionSheetWithOptions(
{
options: [
t('content.options.save'),
t('content.options.share'),
t('screenImageViewer:content.options.save'),
t('screenImageViewer:content.options.share'),
t('common:buttons.cancel')
],
cancelButtonIndex: 2,
@@ -164,8 +164,8 @@ const ScreenImagesViewer = ({
<HeaderCenter inverted content={`${currentIndex + 1} / ${imageUrls.length}`} />
) : null}
<HeaderRight
accessibilityLabel={t('content.actions.accessibilityLabel')}
accessibilityHint={t('content.actions.accessibilityHint')}
accessibilityLabel={t('screenImageViewer:content.actions.accessibilityLabel')}
accessibilityHint={t('screenImageViewer:content.actions.accessibilityHint')}
content='MoreHorizontal'
native={false}
background
@@ -177,8 +177,8 @@ const ScreenImagesViewer = ({
showActionSheetWithOptions(
{
options: [
t('content.options.save'),
t('content.options.share'),
t('screenImageViewer:content.options.save'),
t('screenImageViewer:content.options.share'),
t('common:buttons.cancel')
],
cancelButtonIndex: 2,

8
src/screens/Tabs/Me/FollowedTags.tsx
View File

@@ -12,7 +12,7 @@ import { FlatList } from 'react-native-gesture-handler'
const TabMeFollowedTags: React.FC<TabMeStackScreenProps<'Tab-Me-FollowedTags'>> = ({
navigation
}) => {
const { t } = useTranslation('screenTabs')
const { t } = useTranslation(['common', 'screenTabs'])
const { data, fetchNextPage, refetch } = useFollowedTagsQuery()
const flattenData = data?.pages ? data.pages.flatMap(page => [...page.body]) : []
@@ -31,7 +31,9 @@ const TabMeFollowedTags: React.FC<TabMeStackScreenProps<'Tab-Me-FollowedTags'>>
displayMessage({
type: 'error',
message: t('common:message.error.message', {
function: to ? t('shared.hashtag.follow') : t('shared.hashtag.unfollow')
function: to
? t('screenTabs:shared.hashtag.follow')
: t('screenTabs:shared.hashtag.unfollow')
}),
...(err.status &&
typeof err.status === 'number' &&
@@ -55,7 +57,7 @@ const TabMeFollowedTags: React.FC<TabMeStackScreenProps<'Tab-Me-FollowedTags'>>
children={
<Button
type='text'
content={t('shared.hashtag.unfollow')}
content={t('screenTabs:shared.hashtag.unfollow')}
onPress={() => mutation.mutate({ tag: item.name, to: !item.following })}
/>
}

6
src/screens/Tabs/Me/List/Accounts.tsx
View File

@@ -19,7 +19,7 @@ const TabMeListAccounts: React.FC<TabMeStackScreenProps<'Tab-Me-List-Accounts'>>
route: { params }
}) => {
const { colors, theme } = useTheme()
const { t } = useTranslation('screenTabs')
const { t } = useTranslation(['common', 'screenTabs'])
const queryKey: QueryKeyListAccounts = ['ListAccounts', { id: params.id }]
const { data, refetch, fetchNextPage, hasNextPage } = useListAccountsQuery({
@@ -45,7 +45,7 @@ const TabMeListAccounts: React.FC<TabMeStackScreenProps<'Tab-Me-List-Accounts'>>
displayMessage({
type: 'danger',
message: t('common:message.error.message', {
function: t('me.listAccounts.error')
function: t('screenTabs:me.listAccounts.error')
})
})
}
@@ -88,7 +88,7 @@ const TabMeListAccounts: React.FC<TabMeStackScreenProps<'Tab-Me-List-Accounts'>>
color: colors.secondary
}}
>
{t('me.listAccounts.empty')}
{t('screenTabs:me.listAccounts.empty')}
</CustomText>
</View>
}

21
src/screens/Tabs/Me/List/Edit.tsx
View File

@@ -20,7 +20,7 @@ const TabMeListEdit: React.FC<TabMeStackScreenProps<'Tab-Me-List-Edit'>> = ({
route: { params }
}) => {
const { colors, theme } = useTheme()
const { t } = useTranslation('screenTabs')
const { t } = useTranslation(['common', 'screenTabs'])
const messageRef = useRef(null)
@@ -44,7 +44,9 @@ const TabMeListEdit: React.FC<TabMeStackScreenProps<'Tab-Me-List-Edit'>> = ({
type: 'danger',
message: t('common:message.error.message', {
function:
params.type === 'add' ? t('me.stacks.listAdd.name') : t('me.stacks.listEdit.name')
params.type === 'add'
? t('screenTabs:me.stacks.listAdd.name')
: t('screenTabs:me.stacks.listEdit.name')
})
})
}
@@ -65,24 +67,27 @@ const TabMeListEdit: React.FC<TabMeStackScreenProps<'Tab-Me-List-Edit'>> = ({
>([
{
id: 'none',
content: t('me.listEdit.repliesPolicy.options.none'),
content: t('screenTabs:me.listEdit.repliesPolicy.options.none'),
selected: params.type === 'edit' ? params.payload.replies_policy === 'none' : false
},
{
id: 'list',
content: t('me.listEdit.repliesPolicy.options.list'),
content: t('screenTabs:me.listEdit.repliesPolicy.options.list'),
selected: params.type === 'edit' ? params.payload.replies_policy === 'list' : true
},
{
id: 'followed',
content: t('me.listEdit.repliesPolicy.options.followed'),
content: t('screenTabs:me.listEdit.repliesPolicy.options.followed'),
selected: params.type === 'edit' ? params.payload.replies_policy === 'followed' : false
}
])
useEffect(() => {
navigation.setOptions({
title: params.type === 'add' ? t('me.stacks.listAdd.name') : t('me.stacks.listEdit.name'),
title:
params.type === 'add'
? t('screenTabs:me.stacks.listAdd.name')
: t('screenTabs:me.stacks.listEdit.name'),
headerLeft: () => (
<HeaderLeft
content='X'
@@ -140,7 +145,7 @@ const TabMeListEdit: React.FC<TabMeStackScreenProps<'Tab-Me-List-Edit'>> = ({
return (
<ScrollView style={{ paddingHorizontal: StyleConstants.Spacing.Global.PagePadding }}>
<ComponentInput {...inputProps} autoFocus title={t('me.listEdit.title')} />
<ComponentInput {...inputProps} autoFocus title={t('screenTabs:me.listEdit.title')} />
<CustomText
fontStyle='M'
@@ -151,7 +156,7 @@ const TabMeListEdit: React.FC<TabMeStackScreenProps<'Tab-Me-List-Edit'>> = ({
marginTop: StyleConstants.Spacing.M
}}
>
{t('me.listEdit.repliesPolicy.heading')}
{t('screenTabs:me.listEdit.repliesPolicy.heading')}
</CustomText>
<Selections options={options} setOptions={setOptions} />

2
src/screens/Tabs/Me/List/List.tsx
View File

@@ -14,7 +14,7 @@ const TabMeListList: React.FC<TabMeStackScreenProps<'Tab-Me-List-List'>> = ({ na
headerRight: () => (
<HeaderRight
type='text'
content={t('common:buttons.create')}
content={t('buttons.create')}
onPress={() => navigation.navigate('Tab-Me-List-Edit', { type: 'add' })}
/>
)

4
src/screens/Tabs/Me/List/index.tsx
View File

@@ -18,7 +18,7 @@ const TabMeList: React.FC<TabMeStackScreenProps<'Tab-Me-List'>> = ({
route: { key, params }
}) => {
const { colors } = useTheme()
const { t } = useTranslation('screenTabs')
const { t } = useTranslation(['common', 'screenTabs'])
const queryKey: QueryKeyTimeline = ['Timeline', { page: 'List', list: params.id }]
const queryKeyLists: QueryKeyLists = ['Lists']
@@ -32,7 +32,7 @@ const TabMeList: React.FC<TabMeStackScreenProps<'Tab-Me-List'>> = ({
displayMessage({
type: 'danger',
message: t('common:message.error.message', {
function: t('me.listDelete.heading')
function: t('screenTabs:me.listDelete.heading')
})
})
}

36
src/screens/Tabs/Me/Profile/Fields.tsx
View File

@@ -19,7 +19,7 @@ const Field: React.FC<{
field?: Mastodon.Field
}> = ({ allProps, setDirty, index, field }) => {
const { colors } = useTheme()
const { t } = useTranslation('screenTabs')
const { t } = useTranslation(['common', 'screenTabs'])
const nameRef = useRef<TextInput>(null)
const valueRef = useRef<TextInput>(null)
@@ -55,11 +55,11 @@ const Field: React.FC<{
color: colors.primaryDefault
}}
>
{t('me.profile.fields.group', { index: index + 1 })}
{t('screenTabs:me.profile.fields.group', { index: index + 1 })}
</CustomText>
<ComponentInput title={t('me.profile.fields.label')} {...allProps[index * 2]} />
<ComponentInput title={t('screenTabs:me.profile.fields.label')} {...allProps[index * 2]} />
<ComponentInput
title={t('me.profile.fields.content')}
title={t('screenTabs:me.profile.fields.content')}
{...allProps[index * 2 + 1]}
multiline
/>
@@ -79,7 +79,7 @@ const TabMeProfileFields: React.FC<
navigation
}) => {
const { theme } = useTheme()
const { t } = useTranslation('screenTabs')
const { t } = useTranslation(['common'])
const { mutateAsync, status } = useProfileMutation()
const allProps: EmojisState['inputProps'] = []
@@ -93,21 +93,17 @@ const TabMeProfileFields: React.FC<
content='X'
onPress={() => {
if (dirty) {
Alert.alert(
t('common:discard.title'),
t('common:discard.message'),
[
{
text: t('common:buttons.discard'),
style: 'destructive',
onPress: () => navigation.navigate('Tab-Me-Profile-Root')
},
{
text: t('common:buttons.cancel'),
style: 'default'
}
]
)
Alert.alert(t('common:discard.title'), t('common:discard.message'), [
{
text: t('common:buttons.discard'),
style: 'destructive',
onPress: () => navigation.navigate('Tab-Me-Profile-Root')
},
{
text: t('common:buttons.cancel'),
style: 'default'
}
])
} else {
navigation.navigate('Tab-Me-Profile-Root')
}

28
src/screens/Tabs/Me/Profile/Name.tsx
View File

@@ -23,7 +23,7 @@ const TabMeProfileName: React.FC<
navigation
}) => {
const { theme } = useTheme()
const { t } = useTranslation('screenTabs')
const { t } = useTranslation(['common'])
const { mutateAsync, status } = useProfileMutation()
const [value, setValue] = useState(display_name)
@@ -47,21 +47,17 @@ const TabMeProfileName: React.FC<
content='X'
onPress={() => {
if (dirty) {
Alert.alert(
t('common:discard.title'),
t('common:discard.message'),
[
{
text: t('common:buttons.discard'),
style: 'destructive',
onPress: () => navigation.navigate('Tab-Me-Profile-Root')
},
{
text: t('common:buttons.cancel'),
style: 'default'
}
]
)
Alert.alert(t('common:discard.title'), t('common:discard.message'), [
{
text: t('common:buttons.discard'),
style: 'destructive',
onPress: () => navigation.navigate('Tab-Me-Profile-Root')
},
{
text: t('common:buttons.cancel'),
style: 'default'
}
])
} else {
navigation.navigate('Tab-Me-Profile-Root')
}

28
src/screens/Tabs/Me/Profile/Note.tsx
View File

@@ -23,7 +23,7 @@ const TabMeProfileNote: React.FC<
navigation
}) => {
const { theme } = useTheme()
const { t } = useTranslation('screenTabs')
const { t } = useTranslation(['common'])
const { mutateAsync, status } = useProfileMutation()
const [notes, setNotes] = useState(note)
@@ -47,21 +47,17 @@ const TabMeProfileNote: React.FC<
content='X'
onPress={() => {
if (dirty) {
Alert.alert(
t('common:discard.title'),
t('common:discard.message'),
[
{
text: t('common:buttons.discard'),
style: 'destructive',
onPress: () => navigation.navigate('Tab-Me-Profile-Root')
},
{
text: t('common:buttons.cancel'),
style: 'default'
}
]
)
Alert.alert(t('common:discard.title'), t('common:discard.message'), [
{
text: t('common:buttons.discard'),
style: 'destructive',
onPress: () => navigation.navigate('Tab-Me-Profile-Root')
},
{
text: t('common:buttons.cancel'),
style: 'default'
}
])
} else {
navigation.navigate('Tab-Me-Profile-Root')
}

120
src/screens/Tabs/Me/Profile/Root.tsx
View File

@@ -18,7 +18,7 @@ const TabMeProfileRoot: React.FC<
}
> = ({ messageRef, navigation }) => {
const { colors } = useTheme()
const { t } = useTranslation('screenTabs')
const { t } = useTranslation(['common', 'screenTabs'])
const { showActionSheetWithOptions } = useActionSheet()
@@ -30,7 +30,7 @@ const TabMeProfileRoot: React.FC<
<ScrollView>
<MenuContainer>
<MenuRow
title={t('me.profile.root.name.title')}
title={t('screenTabs:me.profile.root.name.title')}
content={data?.display_name}
loading={isFetching}
iconBack='ChevronRight'
@@ -44,7 +44,7 @@ const TabMeProfileRoot: React.FC<
<ProfileAvatarHeader type='avatar' messageRef={messageRef} />
<ProfileAvatarHeader type='header' messageRef={messageRef} />
<MenuRow
title={t('me.profile.root.note.title')}
title={t('screenTabs:me.profile.root.note.title')}
content={data?.source.note}
loading={isFetching}
iconBack='ChevronRight'
@@ -56,10 +56,10 @@ const TabMeProfileRoot: React.FC<
}}
/>
<MenuRow
title={t('me.profile.root.fields.title')}
title={t('screenTabs:me.profile.root.fields.title')}
content={
data?.source.fields && data.source.fields.length
? t('me.profile.root.fields.total', {
? t('screenTabs:me.profile.root.fields.total', {
count: data.source.fields.length
})
: undefined
@@ -74,58 +74,60 @@ const TabMeProfileRoot: React.FC<
/>
</MenuContainer>
<MenuContainer>
<MenuRow
title={t('me.profile.root.visibility.title')}
content={
data?.source.privacy
? t(`me.profile.root.visibility.options.${data?.source.privacy}`)
: undefined
}
loading={isFetching}
iconBack='ChevronRight'
onPress={() =>
showActionSheetWithOptions(
{
title: t('me.profile.root.visibility.title'),
options: [
t('me.profile.root.visibility.options.public'),
t('me.profile.root.visibility.options.unlisted'),
t('me.profile.root.visibility.options.private'),
t('common:buttons.cancel')
],
cancelButtonIndex: 3,
...androidActionSheetStyles(colors)
},
async buttonIndex => {
switch (buttonIndex) {
case 0:
case 1:
case 2:
const indexVisibilityMapping = ['public', 'unlisted', 'private'] as [
'public',
'unlisted',
'private'
]
if (data?.source.privacy !== indexVisibilityMapping[buttonIndex]) {
mutateAsync({
messageRef,
message: {
text: 'me.profile.root.visibility.title',
succeed: false,
failed: true
},
type: 'source[privacy]',
data: indexVisibilityMapping[buttonIndex]
}).then(() => dispatch(updateAccountPreferences()))
}
break
{data?.source.privacy !== 'direct' ? (
<MenuRow
title={t('screenTabs:me.profile.root.visibility.title')}
content={
data?.source.privacy
? t(`screenTabs:me.profile.root.visibility.options.${data.source.privacy}`)
: undefined
}
loading={isFetching}
iconBack='ChevronRight'
onPress={() =>
showActionSheetWithOptions(
{
title: t('screenTabs:me.profile.root.visibility.title'),
options: [
t('screenTabs:me.profile.root.visibility.options.public'),
t('screenTabs:me.profile.root.visibility.options.unlisted'),
t('screenTabs:me.profile.root.visibility.options.private'),
t('common:buttons.cancel')
],
cancelButtonIndex: 3,
...androidActionSheetStyles(colors)
},
async buttonIndex => {
switch (buttonIndex) {
case 0:
case 1:
case 2:
const indexVisibilityMapping = ['public', 'unlisted', 'private'] as [
'public',
'unlisted',
'private'
]
if (data?.source.privacy !== indexVisibilityMapping[buttonIndex]) {
mutateAsync({
messageRef,
message: {
text: 'me.profile.root.visibility.title',
succeed: false,
failed: true
},
type: 'source[privacy]',
data: indexVisibilityMapping[buttonIndex]
}).then(() => dispatch(updateAccountPreferences()))
}
break
}
}
}
)
}
/>
)
}
/>
) : null}
<MenuRow
title={t('me.profile.root.sensitive.title')}
title={t('screenTabs:me.profile.root.sensitive.title')}
switchValue={data?.source.sensitive}
switchOnValueChange={() =>
mutateAsync({
@@ -144,8 +146,8 @@ const TabMeProfileRoot: React.FC<
</MenuContainer>
<MenuContainer>
<MenuRow
title={t('me.profile.root.lock.title')}
description={t('me.profile.root.lock.description')}
title={t('screenTabs:me.profile.root.lock.title')}
description={t('screenTabs:me.profile.root.lock.description')}
switchValue={data?.locked}
switchOnValueChange={() =>
mutateAsync({
@@ -162,8 +164,8 @@ const TabMeProfileRoot: React.FC<
loading={isFetching}
/>
<MenuRow
title={t('me.profile.root.bot.title')}
description={t('me.profile.root.bot.description')}
title={t('screenTabs:me.profile.root.bot.title')}
description={t('screenTabs:me.profile.root.bot.description')}
switchValue={data?.bot}
switchOnValueChange={() =>
mutateAsync({

6
src/screens/Tabs/Me/Profile/Root/AvatarHeader.tsx
View File

@@ -13,7 +13,7 @@ export interface Props {
}
const ProfileAvatarHeader: React.FC<Props> = ({ type, messageRef }) => {
const { t } = useTranslation('screenTabs')
const { t } = useTranslation(['screenTabs'])
const { showActionSheetWithOptions } = useActionSheet()
@@ -22,8 +22,8 @@ const ProfileAvatarHeader: React.FC<Props> = ({ type, messageRef }) => {
return (
<MenuRow
title={t(`me.profile.root.${type}.title`)}
description={t(`me.profile.root.${type}.description`)}
title={t(`screenTabs:me.profile.root.${type}.title`)}
description={t(`screenTabs:me.profile.root.${type}.description`)}
loading={query.isFetching || mutation.isLoading}
iconBack='ChevronRight'
onPress={async () => {

25
src/screens/Tabs/Me/Root/Collections.tsx
View File

@@ -10,12 +10,12 @@ import {
updateInstanceMePage
} from '@utils/slices/instancesSlice'
import { getInstancePush } from '@utils/slices/instancesSlice'
import React, { useEffect } from 'react'
import React from 'react'
import { useTranslation } from 'react-i18next'
import { useSelector } from 'react-redux'
const Collections: React.FC = () => {
const { t } = useTranslation('screenTabs')
const { t } = useTranslation(['screenAnnouncements', 'screenTabs'])
const navigation = useNavigation<any>()
const dispatch = useAppDispatch()
@@ -65,26 +65,26 @@ const Collections: React.FC = () => {
<MenuRow
iconFront='Mail'
iconBack='ChevronRight'
title={t('me.stacks.conversations.name')}
title={t('screenTabs:me.stacks.conversations.name')}
onPress={() => navigation.navigate('Tab-Me-Conversations')}
/>
<MenuRow
iconFront='Bookmark'
iconBack='ChevronRight'
title={t('me.stacks.bookmarks.name')}
title={t('screenTabs:me.stacks.bookmarks.name')}
onPress={() => navigation.navigate('Tab-Me-Bookmarks')}
/>
<MenuRow
iconFront='Heart'
iconBack='ChevronRight'
title={t('me.stacks.favourites.name')}
title={t('screenTabs:me.stacks.favourites.name')}
onPress={() => navigation.navigate('Tab-Me-Favourites')}
/>
{mePage.lists.shown ? (
<MenuRow
iconFront='List'
iconBack='ChevronRight'
title={t('me.stacks.lists.name')}
title={t('screenTabs:me.stacks.lists.name')}
onPress={() => navigation.navigate('Tab-Me-List-List')}
/>
) : null}
@@ -92,7 +92,7 @@ const Collections: React.FC = () => {
<MenuRow
iconFront='Hash'
iconBack='ChevronRight'
title={t('me.stacks.followedTags.name')}
title={t('screenTabs:me.stacks.followedTags.name')}
onPress={() => navigation.navigate('Tab-Me-FollowedTags')}
/>
) : null}
@@ -103,10 +103,10 @@ const Collections: React.FC = () => {
title={t('screenAnnouncements:heading')}
content={
mePage.announcements.unread
? t('me.root.announcements.content.unread', {
? t('screenTabs:me.root.announcements.content.unread', {
amount: mePage.announcements.unread
})
: t('me.root.announcements.content.read')
: t('screenTabs:me.root.announcements.content.read')
}
onPress={() => navigation.navigate('Screen-Announcements', { showAll: true })}
/>
@@ -114,10 +114,13 @@ const Collections: React.FC = () => {
<MenuRow
iconFront={instancePush ? 'Bell' : 'BellOff'}
iconBack='ChevronRight'
title={t('me.stacks.push.name')}
title={t('screenTabs:me.stacks.push.name')}
content={
typeof instancePush.global === 'boolean'
? t('me.root.push.content', { context: instancePush.global.toString() })
? t('screenTabs:me.root.push.content', {
defaultValue: 'false',
context: instancePush.global.toString()
})
: undefined
}
onPress={() => navigation.navigate('Tab-Me-Push')}

38
src/screens/Tabs/Me/Root/Logout.tsx
View File

@@ -11,7 +11,7 @@ import { useQueryClient } from '@tanstack/react-query'
import { useSelector } from 'react-redux'
const Logout: React.FC = () => {
const { t } = useTranslation('screenTabs')
const { t } = useTranslation(['common', 'screenTabs'])
const dispatch = useAppDispatch()
const queryClient = useQueryClient()
const instance = useSelector(getInstance)
@@ -19,7 +19,7 @@ const Logout: React.FC = () => {
return (
<Button
type='text'
content={t('me.root.logout.button')}
content={t('screenTabs:me.root.logout.button')}
style={{
marginHorizontal: StyleConstants.Spacing.Global.PagePadding * 2,
marginTop: StyleConstants.Spacing.Global.PagePadding,
@@ -27,23 +27,27 @@ const Logout: React.FC = () => {
}}
destructive
onPress={() =>
Alert.alert(t('me.root.logout.alert.title'), t('me.root.logout.alert.message'), [
{
text: t('me.root.logout.alert.buttons.logout'),
style: 'destructive',
onPress: () => {
if (instance) {
haptics('Success')
queryClient.clear()
dispatch(removeInstance(instance))
Alert.alert(
t('screenTabs:me.root.logout.alert.title'),
t('screenTabs:me.root.logout.alert.message'),
[
{
text: t('screenTabs:me.root.logout.alert.buttons.logout'),
style: 'destructive',
onPress: () => {
if (instance) {
haptics('Success')
queryClient.clear()
dispatch(removeInstance(instance))
}
}
},
{
text: t('common:buttons.cancel'),
style: 'default'
}
},
{
text: t('common:buttons.cancel'),
style: 'default'
}
])
]
)
}
/>
)

46
src/screens/Tabs/Me/Settings/App.tsx
View File

@@ -29,7 +29,7 @@ const SettingsApp: React.FC = () => {
const dispatch = useAppDispatch()
const { showActionSheetWithOptions } = useActionSheet()
const { colors } = useTheme()
const { t, i18n } = useTranslation('screenTabs')
const { t, i18n } = useTranslation(['common', 'screenTabs'])
const settingsFontsize = useSelector(getSettingsFontsize)
const settingsTheme = useSelector(getSettingsTheme)
@@ -40,13 +40,15 @@ const SettingsApp: React.FC = () => {
return (
<MenuContainer>
<MenuRow
title={t('me.settings.fontsize.heading')}
content={t(`me.settings.fontsize.content.${mapFontsizeToName(settingsFontsize)}`)}
title={t('screenTabs:me.settings.fontsize.heading')}
content={t(
`screenTabs:me.settings.fontsize.content.${mapFontsizeToName(settingsFontsize)}`
)}
iconBack='ChevronRight'
onPress={() => navigation.navigate('Tab-Me-Settings-Fontsize')}
/>
<MenuRow
title={t('me.settings.language.heading')}
title={t('screenTabs:me.settings.language.heading')}
content={
// @ts-ignore
LOCALES[
@@ -61,17 +63,17 @@ const SettingsApp: React.FC = () => {
}
/>
<MenuRow
title={t('me.settings.theme.heading')}
content={t(`me.settings.theme.options.${settingsTheme}`)}
title={t('screenTabs:me.settings.theme.heading')}
content={t(`screenTabs:me.settings.theme.options.${settingsTheme}`)}
iconBack='ChevronRight'
onPress={() =>
showActionSheetWithOptions(
{
title: t('me.settings.theme.heading'),
title: t('screenTabs:me.settings.theme.heading'),
options: [
t('me.settings.theme.options.auto'),
t('me.settings.theme.options.light'),
t('me.settings.theme.options.dark'),
t('screenTabs:me.settings.theme.options.auto'),
t('screenTabs:me.settings.theme.options.light'),
t('screenTabs:me.settings.theme.options.dark'),
t('common:buttons.cancel')
],
cancelButtonIndex: 3,
@@ -97,16 +99,16 @@ const SettingsApp: React.FC = () => {
}
/>
<MenuRow
title={t('me.settings.darkTheme.heading')}
content={t(`me.settings.darkTheme.options.${settingsDarkTheme}`)}
title={t('screenTabs:me.settings.darkTheme.heading')}
content={t(`screenTabs:me.settings.darkTheme.options.${settingsDarkTheme}`)}
iconBack='ChevronRight'
onPress={() =>
showActionSheetWithOptions(
{
title: t('me.settings.darkTheme.heading'),
title: t('screenTabs:me.settings.darkTheme.heading'),
options: [
t('me.settings.darkTheme.options.lighter'),
t('me.settings.darkTheme.options.darker'),
t('screenTabs:me.settings.darkTheme.options.lighter'),
t('screenTabs:me.settings.darkTheme.options.darker'),
t('common:buttons.cancel')
],
cancelButtonIndex: 2,
@@ -128,16 +130,16 @@ const SettingsApp: React.FC = () => {
}
/>
<MenuRow
title={t('me.settings.browser.heading')}
content={t(`me.settings.browser.options.${settingsBrowser}`)}
title={t('screenTabs:me.settings.browser.heading')}
content={t(`screenTabs:me.settings.browser.options.${settingsBrowser}`)}
iconBack='ChevronRight'
onPress={() =>
showActionSheetWithOptions(
{
title: t('me.settings.browser.heading'),
title: t('screenTabs:me.settings.browser.heading'),
options: [
t('me.settings.browser.options.internal'),
t('me.settings.browser.options.external'),
t('screenTabs:me.settings.browser.options.internal'),
t('screenTabs:me.settings.browser.options.external'),
t('common:buttons.cancel')
],
cancelButtonIndex: 2,
@@ -159,8 +161,8 @@ const SettingsApp: React.FC = () => {
}
/>
<MenuRow
title={t('me.settings.staticEmoji.heading')}
description={t('me.settings.staticEmoji.description')}
title={t('screenTabs:me.settings.staticEmoji.heading')}
description={t('screenTabs:me.settings.staticEmoji.description')}
switchValue={settingsStaticEmoji}
switchOnValueChange={() => dispatch(changeStaticEmoji(!settingsStaticEmoji))}
/>

8
src/screens/Tabs/Notifications/Filters.tsx
View File

@@ -20,7 +20,7 @@ import { useSelector } from 'react-redux'
const TabNotificationsFilters: React.FC<
TabNotificationsStackScreenProps<'Tab-Notifications-Filters'>
> = ({ navigation }) => {
const { t } = useTranslation('screenTabs')
const { t } = useTranslation(['common', 'screenTabs'])
const pushFeatures = usePushFeatures()
@@ -33,7 +33,7 @@ const TabNotificationsFilters: React.FC<
useEffect(() => {
const changed = !isEqual(instanceNotificationsFilter, filters)
navigation.setOptions({
title: t('notifications.filters.title'),
title: t('screenTabs:notifications.filters.title'),
headerLeft: () => (
<HeaderLeft
content='ChevronDown'
@@ -81,7 +81,7 @@ const TabNotificationsFilters: React.FC<
{PUSH_DEFAULT(pushFeatures).map((type, index) => (
<MenuRow
key={index}
title={t(`notifications.filters.options.${type}`)}
title={t(`screenTabs:notifications.filters.options.${type}`)}
switchValue={filters[type]}
switchOnValueChange={() => setFilters({ ...filters, [type]: !filters[type] })}
/>
@@ -89,7 +89,7 @@ const TabNotificationsFilters: React.FC<
{PUSH_ADMIN(pushFeatures, profileQuery.data?.role?.permissions).map(({ type }) => (
<MenuRow
key={type}
title={t(`notifications.filters.options.${type}`)}
title={t(`screenTabs:notifications.filters.options.${type}`)}
switchValue={filters[type]}
switchOnValueChange={() => setFilters({ ...filters, [type]: !filters[type] })}
/>

12
src/screens/Tabs/Shared/AccountInLists.tsx
View File

@@ -21,12 +21,12 @@ const TabSharedAccountInLists: React.FC<
}
}) => {
const { colors } = useTheme()
const { t } = useTranslation('screenTabs')
const { t } = useTranslation(['common', 'screenTabs'])
useEffect(() => {
navigation.setOptions({
presentation: 'modal',
title: t('shared.accountInLists.name', { username: account.username }),
title: t('screenTabs:shared.accountInLists.name', { username: account.username }),
headerRight: () => {
return (
<HeaderRight
@@ -43,10 +43,14 @@ const TabSharedAccountInLists: React.FC<
const accountInListsQuery = useAccountInListsQuery({ id: account.id })
const sections = [
{ id: 'in', title: t('shared.accountInLists.inLists'), data: accountInListsQuery.data || [] },
{
id: 'in',
title: t('screenTabs:shared.accountInLists.inLists'),
data: accountInListsQuery.data || []
},
{
id: 'out',
title: t('shared.accountInLists.notInLists'),
title: t('screenTabs:shared.accountInLists.notInLists'),
data:
listsQuery.data?.filter(({ id }) =>
accountInListsQuery.data?.length

3
src/screens/Tabs/Shared/Attachments.tsx
View File

@@ -23,7 +23,8 @@ const TabSharedAttachments: React.FC<TabSharedStackScreenProps<'Tab-Shared-Attac
headerTitle: () => (
<CustomText numberOfLines={1}>
<Trans
i18nKey='screenTabs:shared.attachments.name'
ns='screenTabs'
i18nKey='shared.attachments.name'
components={[
<ParseEmojis
content={account.display_name || account.username}

12
src/screens/Tabs/Shared/Hashtag.tsx
View File

@@ -27,7 +27,7 @@ const TabSharedHashtag: React.FC<TabSharedStackScreenProps<'Tab-Shared-Hashtag'>
const queryKey: QueryKeyTimeline = ['Timeline', { page: 'Hashtag', hashtag }]
const { t } = useTranslation('screenTabs')
const { t } = useTranslation(['common', 'screenTabs'])
const canFollowTags = useSelector(checkInstanceFeature('follow_tags'))
const { data, isFetching, refetch } = useTagsQuery({
@@ -46,7 +46,9 @@ const TabSharedHashtag: React.FC<TabSharedStackScreenProps<'Tab-Shared-Hashtag'>
displayMessage({
type: 'error',
message: t('common:message.error.message', {
function: to ? t('shared.hashtag.follow') : t('shared.hashtag.unfollow')
function: to
? t('screenTabs:shared.hashtag.follow')
: t('screenTabs:shared.hashtag.unfollow')
}),
...(err.status &&
typeof err.status === 'number' &&
@@ -66,7 +68,11 @@ const TabSharedHashtag: React.FC<TabSharedStackScreenProps<'Tab-Shared-Hashtag'>
<HeaderRight
loading={isFetching || mutation.isLoading}
type='text'
content={data?.following ? t('shared.hashtag.unfollow') : t('shared.hashtag.follow')}
content={
data?.following
? t('screenTabs:shared.hashtag.unfollow')
: t('screenTabs:shared.hashtag.follow')
}
onPress={() =>
typeof data?.following === 'boolean' &&
mutation.mutate({ tag: hashtag, to: !data.following })

22
src/screens/Tabs/Shared/Report.tsx
View File

@@ -21,14 +21,14 @@ const TabSharedReport: React.FC<TabSharedStackScreenProps<'Tab-Shared-Report'>>
}
}) => {
const { colors } = useTheme()
const { t } = useTranslation('screenTabs')
const { t } = useTranslation(['common', 'screenTabs'])
const [categories, setCategories] = useState<
{ selected: boolean; content: string; type: 'spam' | 'other' | 'violation' }[]
>([
{ selected: true, content: t('shared.report.reasons.spam'), type: 'spam' },
{ selected: false, content: t('shared.report.reasons.other'), type: 'other' },
{ selected: false, content: t('shared.report.reasons.violation'), type: 'violation' }
{ selected: true, content: t('screenTabs:shared.report.reasons.spam'), type: 'spam' },
{ selected: false, content: t('screenTabs:shared.report.reasons.other'), type: 'other' },
{ selected: false, content: t('screenTabs:shared.report.reasons.violation'), type: 'violation' }
])
const [rules, setRules] = useState<{ selected: boolean; content: string; id: string }[]>([])
const [forward, setForward] = useState<boolean>(true)
@@ -37,7 +37,7 @@ const TabSharedReport: React.FC<TabSharedStackScreenProps<'Tab-Shared-Report'>>
const [isReporting, setIsReporting] = useState(false)
useEffect(() => {
navigation.setOptions({
title: t('shared.report.name', { acct: `@${account.acct}` }),
title: t('screenTabs:shared.report.name', { acct: `@${account.acct}` }),
headerLeft: () => (
<HeaderLeft
type='text'
@@ -48,7 +48,7 @@ const TabSharedReport: React.FC<TabSharedStackScreenProps<'Tab-Shared-Report'>>
headerRight: () => (
<HeaderRight
type='text'
content={t('shared.report.report')}
content={t('screenTabs:shared.report.report')}
destructive
onPress={() => {
const body = new FormData()
@@ -119,7 +119,9 @@ const TabSharedReport: React.FC<TabSharedStackScreenProps<'Tab-Shared-Report'>>
style={{ color: colors.primaryDefault, paddingRight: StyleConstants.Spacing.M }}
numberOfLines={2}
>
{t('shared.report.forward.heading', { instance: account.acct.match(/@(.*)/)?.[1] })}
{t('screenTabs:shared.report.forward.heading', {
instance: account.acct.match(/@(.*)/)?.[1]
})}
</CustomText>
<Switch
value={forward}
@@ -133,7 +135,7 @@ const TabSharedReport: React.FC<TabSharedStackScreenProps<'Tab-Shared-Report'>>
fontStyle='M'
style={{ color: colors.primaryDefault, marginBottom: StyleConstants.Spacing.S }}
>
{t('shared.report.reasons.heading')}
{t('screenTabs:shared.report.reasons.heading')}
</CustomText>
<View style={{ marginLeft: StyleConstants.Spacing.M }}>
<Selections options={categories} setOptions={setCategories} />
@@ -149,7 +151,7 @@ const TabSharedReport: React.FC<TabSharedStackScreenProps<'Tab-Shared-Report'>>
marginBottom: StyleConstants.Spacing.XS
}}
>
{t('shared.report.comment.heading')}
{t('screenTabs:shared.report.comment.heading')}
</CustomText>
<View
style={{
@@ -198,7 +200,7 @@ const TabSharedReport: React.FC<TabSharedStackScreenProps<'Tab-Shared-Report'>>
marginBottom: StyleConstants.Spacing.S
}}
>
{t('shared.report.violatedRules.heading')}
{t('screenTabs:shared.report.violatedRules.heading')}
</CustomText>
<View style={{ marginLeft: StyleConstants.Spacing.M }}>
<Selections

3
src/screens/Tabs/Shared/Search/Empty.tsx
View File

@@ -38,7 +38,8 @@ const SearchEmpty: React.FC<Props> = ({ isFetching, inputRef, setSearchTerm }) =
}}
>
<Trans
i18nKey='screenTabs:shared.search.empty.general'
ns='screenTabs'
i18nKey='shared.search.empty.general'
components={{
bold: <CustomText fontWeight='Bold' />
}}

3
src/screens/Tabs/Shared/Search/index.tsx
View File

@@ -179,7 +179,8 @@ const TabSharedSearch: React.FC<TabSharedStackScreenProps<'Tab-Shared-Search'>>
>
<CustomText fontStyle='S' style={{ textAlign: 'center', color: colors.secondary }}>
<Trans
i18nKey='screenTabs:shared.search.notFound'
ns='screenTabs'
i18nKey='shared.search.notFound'
values={{ searchTerm, type: translation }}
components={{
bold: <CustomText fontWeight='Bold' />

4
src/screens/Tabs/Shared/Users.tsx
View File

@@ -23,7 +23,9 @@ const TabSharedUsers: React.FC<TabSharedStackScreenProps<'Tab-Shared-Users'>> =
const { t } = useTranslation('screenTabs')
useEffect(() => {
navigation.setOptions({
title: t(`shared.users.${params.reference}.${params.type}`, { count: params.count }),
title: t(`shared.users.${params.reference}.${params.type}`, {
count: params.count
} as any) as any,
headerLeft: () => <HeaderLeft onPress={() => navigation.goBack()} />
})
}, [])