Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve notification localization #3911

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
bc5ea62
Update FeedItem.tsx
quiple May 8, 2024
477e7de
Update FeedItem.tsx
quiple May 8, 2024
490fa7b
Update FeedItem.tsx
quiple May 10, 2024
4f2015c
Update FeedItem.tsx
quiple May 10, 2024
8164cc4
Update FeedItem.tsx
quiple May 10, 2024
552e0b8
Merge branch 'main' into Improve-notification-localization
quiple Jun 10, 2024
0b6ae76
Update FeedItem.tsx
quiple Jun 10, 2024
89fc356
Update FeedItem.tsx
quiple Jun 10, 2024
2ab80b0
Update FeedItem.tsx
quiple Jun 10, 2024
6409128
Update FeedItem.tsx
quiple Jun 10, 2024
855ca40
Update PostMeta.tsx
quiple Jun 10, 2024
d8adcae
Update RightNav.tsx
quiple Jun 10, 2024
564e55b
Update FeedItem.tsx
quiple Jun 10, 2024
8dc1f0b
Merge remote-tracking branch 'upstream/main' into Improve-notificatio…
quiple Jun 11, 2024
9963255
Merge remote-tracking branch 'upstream/main' into Improve-notificatio…
quiple Jun 12, 2024
99e4ca9
Merge remote-tracking branch 'upstream/main' into Improve-notificatio…
quiple Jun 22, 2024
6e2b295
Merge remote-tracking branch 'upstream/main' into Improve-notificatio…
quiple Jul 8, 2024
d0a2e26
Update FeedItem.tsx
quiple Jul 8, 2024
0bd1f19
Merge remote-tracking branch 'upstream/main' into Improve-notificatio…
quiple Jul 12, 2024
d70513a
Merge remote-tracking branch 'upstream/main' into Improve-notificatio…
quiple Jul 19, 2024
61b45f5
Merge remote-tracking branch 'upstream/main' into Improve-notificatio…
quiple Jul 25, 2024
149b30a
Merge remote-tracking branch 'upstream/main' into Improve-notificatio…
quiple Jul 26, 2024
11ef364
a11y
quiple Jul 26, 2024
a1e99a0
Update FeedItem.tsx
quiple Jul 26, 2024
ed084b7
Squashed commit of the following:
quiple Aug 8, 2024
e3b2a8a
Merge remote-tracking branch 'upstream/main' into Improve-notificatio…
quiple Aug 9, 2024
4501a93
Update PostThreadItem.tsx
quiple Aug 9, 2024
a203d3c
Update PostThreadItem.tsx
quiple Aug 9, 2024
ede8dfc
revert
quiple Aug 9, 2024
396c804
Merge remote-tracking branch 'upstream/main' into Improve-notificatio…
quiple Aug 26, 2024
35795cc
Merge remote-tracking branch 'upstream/main' into Improve-notificatio…
quiple Aug 30, 2024
1d6eb5c
Update FeedItem.tsx
quiple Sep 3, 2024
7478824
Merge remote-tracking branch 'upstream/main' into Improve-notificatio…
quiple Sep 3, 2024
2a04171
Update FeedItem.tsx
quiple Sep 3, 2024
6a7037b
Merge remote-tracking branch 'upstream/main' into Improve-notificatio…
quiple Sep 4, 2024
2444f3c
Merge remote-tracking branch 'upstream/main' into Improve-notificatio…
quiple Sep 5, 2024
24b2968
Merge remote-tracking branch 'upstream/main' into Improve-notificatio…
quiple Sep 6, 2024
6350ca1
Merge remote-tracking branch 'upstream/main' into Improve-notificatio…
quiple Sep 9, 2024
feab918
Merge remote-tracking branch 'upstream/main' into Improve-notificatio…
quiple Sep 10, 2024
bcdfd55
Merge remote-tracking branch 'upstream/main' into Improve-notificatio…
quiple Sep 12, 2024
f93deb3
Merge remote-tracking branch 'upstream/main' into Improve-notificatio…
quiple Sep 13, 2024
b19924e
Update FeedItem.tsx
quiple Sep 13, 2024
1ab51bb
Merge remote-tracking branch 'upstream/main' into Improve-notificatio…
quiple Sep 18, 2024
dae2aee
Merge remote-tracking branch 'upstream/main' into Improve-notificatio…
quiple Sep 19, 2024
f435d1e
Merge remote-tracking branch 'upstream/main' into Improve-notificatio…
quiple Sep 25, 2024
c93ac19
Revert "Merge remote-tracking branch 'upstream/main' into Improve-not…
quiple Sep 25, 2024
f63aace
Reapply "Merge remote-tracking branch 'upstream/main' into Improve-no…
quiple Sep 25, 2024
4917608
Merge remote-tracking branch 'upstream/main' into Improve-notificatio…
quiple Sep 26, 2024
bc7f728
Merge remote-tracking branch 'upstream/main' into Improve-notificatio…
quiple Sep 26, 2024
2c4a349
Merge remote-tracking branch 'upstream/main' into Improve-notificatio…
quiple Sep 27, 2024
19a7c85
Merge branch 'main' into Improve-notification-localization
quiple Sep 28, 2024
4a12e0c
Update ThreadgateBtn.tsx
quiple Sep 28, 2024
e29199f
Merge remote-tracking branch 'upstream/main' into Improve-notificatio…
quiple Oct 1, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/App.native.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'react-native-url-polyfill/auto'
import 'lib/sentry' // must be near top
import 'view/icons'
import '#/lib/sentry' // must be near top
import '#/view/icons'

import React, {useEffect, useState} from 'react'
import {GestureHandlerRootView} from 'react-native-gesture-handler'
Expand Down
4 changes: 2 additions & 2 deletions src/components/ProfileHoverCard/index.web.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ import {flip, offset, shift, size, useFloating} from '@floating-ui/react-dom'
import {msg, plural} from '@lingui/macro'
import {useLingui} from '@lingui/react'

import {isTouchDevice} from '#/lib/browser'
import {getModerationCauseKey} from '#/lib/moderation'
import {makeProfileLink} from '#/lib/routes/links'
import {sanitizeDisplayName} from '#/lib/strings/display-names'
import {sanitizeHandle} from '#/lib/strings/handles'
import {useProfileShadow} from '#/state/cache/profile-shadow'
import {useModerationOpts} from '#/state/preferences/moderation-opts'
import {usePrefetchProfileQuery, useProfileQuery} from '#/state/queries/profile'
import {useSession} from '#/state/session'
import {isTouchDevice} from 'lib/browser'
import {useProfileShadow} from 'state/cache/profile-shadow'
import {formatCount} from '#/view/com/util/numeric/format'
import {UserAvatar} from '#/view/com/util/UserAvatar'
import {ProfileHeaderHandle} from '#/screens/Profile/Header/Handle'
Expand Down
6 changes: 3 additions & 3 deletions src/components/StarterPack/Wizard/WizardEditListDialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import {BottomSheetFlatListMethods} from '@discord/bottom-sheet'
import {msg, Trans} from '@lingui/macro'
import {useLingui} from '@lingui/react'

import {useInitialNumToRender} from 'lib/hooks/useInitialNumToRender'
import {isWeb} from 'platform/detection'
import {useSession} from 'state/session'
import {useInitialNumToRender} from '#/lib/hooks/useInitialNumToRender'
import {isWeb} from '#/platform/detection'
import {useSession} from '#/state/session'
import {WizardAction, WizardState} from '#/screens/StarterPack/Wizard/State'
import {atoms as a, native, useTheme, web} from '#/alf'
import {Button, ButtonText} from '#/components/Button'
Expand Down
2 changes: 1 addition & 1 deletion src/components/forms/Toggle.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import React from 'react'
import {Pressable, View, ViewStyle} from 'react-native'
import Animated, {LinearTransition} from 'react-native-reanimated'

import {HITSLOP_10} from '#/lib/constants'
import {isNative} from '#/platform/detection'
import {HITSLOP_10} from 'lib/constants'
import {
atoms as a,
flatten,
Expand Down
2 changes: 1 addition & 1 deletion src/components/intents/VerifyEmailIntentDialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {View} from 'react-native'
import {msg, Trans} from '@lingui/macro'
import {useLingui} from '@lingui/react'

import {useAgent, useSession} from 'state/session'
import {useAgent, useSession} from '#/state/session'
import {atoms as a} from '#/alf'
import {Button, ButtonText} from '#/components/Button'
import * as Dialog from '#/components/Dialog'
Expand Down
4 changes: 2 additions & 2 deletions src/lib/api/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ import {
RichText,
} from '@atproto/api'

import {isNetworkError} from '#/lib/strings/errors'
import {shortenLinks, stripInvalidMentions} from '#/lib/strings/rich-text-manip'
import {logger} from '#/logger'
import {ComposerImage, compressImage} from '#/state/gallery'
import {writePostgateRecord} from '#/state/queries/postgate'
Expand All @@ -22,8 +24,6 @@ import {
threadgateAllowUISettingToAllowRecordValue,
writeThreadgateRecord,
} from '#/state/queries/threadgate'
import {isNetworkError} from 'lib/strings/errors'
import {shortenLinks, stripInvalidMentions} from 'lib/strings/rich-text-manip'
import {LinkMeta} from '../link-meta/link-meta'
import {uploadBlob} from './upload-blob'

Expand Down
2 changes: 1 addition & 1 deletion src/lib/media/picker.shared.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
MediaTypeOptions,
} from 'expo-image-picker'

import * as Toast from 'view/com/util/Toast'
import * as Toast from '#/view/com/util/Toast'
import {getDataUriSize} from './util'

export async function openPicker(opts?: ImagePickerOptions) {
Expand Down
2 changes: 1 addition & 1 deletion src/locale/helpers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import {AppBskyFeedDefs, AppBskyFeedPost} from '@atproto/api'
import * as bcp47Match from 'bcp-47-match'
import lande from 'lande'

import {hasProp} from 'lib/type-guards'
import {hasProp} from '#/lib/type-guards'
import {
AppLanguage,
LANGUAGES_MAP_CODE2,
Expand Down
2 changes: 1 addition & 1 deletion src/screens/E2E/SharedPreferencesTesterScreen.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react'
import {View} from 'react-native'

import {ScrollView} from 'view/com/util/Views'
import {ScrollView} from '#/view/com/util/Views'
import {atoms as a} from '#/alf'
import {Button, ButtonText} from '#/components/Button'
import {Text} from '#/components/Typography'
Expand Down
14 changes: 7 additions & 7 deletions src/screens/List/ListHiddenScreen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@ import {msg, Trans} from '@lingui/macro'
import {useLingui} from '@lingui/react'
import {useQueryClient} from '@tanstack/react-query'

import {useGoBack} from '#/lib/hooks/useGoBack'
import {sanitizeHandle} from '#/lib/strings/handles'
import {logger} from '#/logger'
import {RQKEY_ROOT as listQueryRoot} from '#/state/queries/list'
import {useGoBack} from 'lib/hooks/useGoBack'
import {sanitizeHandle} from 'lib/strings/handles'
import {useListBlockMutation, useListMuteMutation} from 'state/queries/list'
import {useListBlockMutation, useListMuteMutation} from '#/state/queries/list'
import {
UsePreferencesQueryResponse,
useRemoveFeedMutation,
} from 'state/queries/preferences'
import {useSession} from 'state/session'
import * as Toast from 'view/com/util/Toast'
import {CenteredView} from 'view/com/util/Views'
} from '#/state/queries/preferences'
import {useSession} from '#/state/session'
import * as Toast from '#/view/com/util/Toast'
import {CenteredView} from '#/view/com/util/Views'
import {atoms as a, useBreakpoints, useTheme} from '#/alf'
import {Button, ButtonIcon, ButtonText} from '#/components/Button'
import {EyeSlash_Stroke2_Corner0_Rounded as EyeSlash} from '#/components/icons/EyeSlash'
Expand Down
42 changes: 21 additions & 21 deletions src/screens/StarterPack/StarterPackScreen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,35 +15,35 @@ import {useNavigation} from '@react-navigation/native'
import {NativeStackScreenProps} from '@react-navigation/native-stack'
import {useQueryClient} from '@tanstack/react-query'

import {batchedUpdates} from '#/lib/batchedUpdates'
import {HITSLOP_20} from '#/lib/constants'
import {isBlockedOrBlocking, isMuted} from '#/lib/moderation/blocked-and-muted'
import {makeProfileLink, makeStarterPackLink} from '#/lib/routes/links'
import {CommonNavigatorParams, NavigationProp} from '#/lib/routes/types'
import {logEvent} from '#/lib/statsig/statsig'
import {cleanError} from '#/lib/strings/errors'
import {getStarterPackOgCard} from '#/lib/strings/starter-pack'
import {logger} from '#/logger'
import {isWeb} from '#/platform/detection'
import {updateProfileShadow} from '#/state/cache/profile-shadow'
import {useModerationOpts} from '#/state/preferences/moderation-opts'
import {getAllListMembers} from '#/state/queries/list-members'
import {useResolvedStarterPackShortLink} from '#/state/queries/resolve-short-link'
import {useResolveDidQuery} from '#/state/queries/resolve-uri'
import {useShortenLink} from '#/state/queries/shorten-link'
import {useDeleteStarterPackMutation} from '#/state/queries/starter-packs'
import {useStarterPackQuery} from '#/state/queries/starter-packs'
import {useAgent, useSession} from '#/state/session'
import {useLoggedOutViewControls} from '#/state/shell/logged-out'
import {
ProgressGuideAction,
useProgressGuideControls,
} from '#/state/shell/progress-guide'
import {batchedUpdates} from 'lib/batchedUpdates'
import {HITSLOP_20} from 'lib/constants'
import {isBlockedOrBlocking, isMuted} from 'lib/moderation/blocked-and-muted'
import {makeProfileLink, makeStarterPackLink} from 'lib/routes/links'
import {CommonNavigatorParams, NavigationProp} from 'lib/routes/types'
import {logEvent} from 'lib/statsig/statsig'
import {getStarterPackOgCard} from 'lib/strings/starter-pack'
import {isWeb} from 'platform/detection'
import {updateProfileShadow} from 'state/cache/profile-shadow'
import {useModerationOpts} from 'state/preferences/moderation-opts'
import {getAllListMembers} from 'state/queries/list-members'
import {useResolvedStarterPackShortLink} from 'state/queries/resolve-short-link'
import {useResolveDidQuery} from 'state/queries/resolve-uri'
import {useShortenLink} from 'state/queries/shorten-link'
import {useStarterPackQuery} from 'state/queries/starter-packs'
import {useAgent, useSession} from 'state/session'
import {useLoggedOutViewControls} from 'state/shell/logged-out'
import {useSetActiveStarterPack} from 'state/shell/starter-pack'
import {useSetActiveStarterPack} from '#/state/shell/starter-pack'
import {PagerWithHeader} from '#/view/com/pager/PagerWithHeader'
import {ProfileSubpageHeader} from '#/view/com/profile/ProfileSubpageHeader'
import * as Toast from '#/view/com/util/Toast'
import {PagerWithHeader} from 'view/com/pager/PagerWithHeader'
import {ProfileSubpageHeader} from 'view/com/profile/ProfileSubpageHeader'
import {CenteredView} from 'view/com/util/Views'
import {CenteredView} from '#/view/com/util/Views'
import {bulkWriteFollows} from '#/screens/Onboarding/util'
import {atoms as a, useBreakpoints, useTheme} from '#/alf'
import {Button, ButtonIcon, ButtonText} from '#/components/Button'
Expand Down
36 changes: 18 additions & 18 deletions src/screens/StarterPack/Wizard/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,32 +19,32 @@ import {useLingui} from '@lingui/react'
import {useFocusEffect, useNavigation} from '@react-navigation/native'
import {NativeStackScreenProps} from '@react-navigation/native-stack'

import {logger} from '#/logger'
import {HITSLOP_10, STARTER_PACK_MAX_SIZE} from 'lib/constants'
import {createSanitizedDisplayName} from 'lib/moderation/create-sanitized-display-name'
import {CommonNavigatorParams, NavigationProp} from 'lib/routes/types'
import {logEvent} from 'lib/statsig/statsig'
import {sanitizeDisplayName} from 'lib/strings/display-names'
import {sanitizeHandle} from 'lib/strings/handles'
import {enforceLen} from 'lib/strings/helpers'
import {HITSLOP_10, STARTER_PACK_MAX_SIZE} from '#/lib/constants'
import {createSanitizedDisplayName} from '#/lib/moderation/create-sanitized-display-name'
import {CommonNavigatorParams, NavigationProp} from '#/lib/routes/types'
import {logEvent} from '#/lib/statsig/statsig'
import {sanitizeDisplayName} from '#/lib/strings/display-names'
import {sanitizeHandle} from '#/lib/strings/handles'
import {enforceLen} from '#/lib/strings/helpers'
import {
getStarterPackOgCard,
parseStarterPackUri,
} from 'lib/strings/starter-pack'
import {isAndroid, isNative, isWeb} from 'platform/detection'
import {useModerationOpts} from 'state/preferences/moderation-opts'
import {useAllListMembersQuery} from 'state/queries/list-members'
import {useProfileQuery} from 'state/queries/profile'
} from '#/lib/strings/starter-pack'
import {logger} from '#/logger'
import {isAndroid, isNative, isWeb} from '#/platform/detection'
import {useModerationOpts} from '#/state/preferences/moderation-opts'
import {useAllListMembersQuery} from '#/state/queries/list-members'
import {useProfileQuery} from '#/state/queries/profile'
import {
useCreateStarterPackMutation,
useEditStarterPackMutation,
useStarterPackQuery,
} from 'state/queries/starter-packs'
import {useSession} from 'state/session'
import {useSetMinimalShellMode} from 'state/shell'
} from '#/state/queries/starter-packs'
import {useSession} from '#/state/session'
import {useSetMinimalShellMode} from '#/state/shell'
import * as Toast from '#/view/com/util/Toast'
import {UserAvatar} from 'view/com/util/UserAvatar'
import {CenteredView} from 'view/com/util/Views'
import {UserAvatar} from '#/view/com/util/UserAvatar'
import {CenteredView} from '#/view/com/util/Views'
import {useWizardState, WizardStep} from '#/screens/StarterPack/Wizard/State'
import {StepDetails} from '#/screens/StarterPack/Wizard/StepDetails'
import {StepFeeds} from '#/screens/StarterPack/Wizard/StepFeeds'
Expand Down
8 changes: 4 additions & 4 deletions src/view/com/composer/ExternalEmbed.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import React from 'react'
import {StyleProp, View, ViewStyle} from 'react-native'

import {ExternalEmbedDraft} from 'lib/api/index'
import {Gif} from 'state/queries/tenor'
import {ExternalEmbedRemoveBtn} from 'view/com/composer/ExternalEmbedRemoveBtn'
import {ExternalLinkEmbed} from 'view/com/util/post-embeds/ExternalLinkEmbed'
import {ExternalEmbedDraft} from '#/lib/api/index'
import {Gif} from '#/state/queries/tenor'
import {ExternalEmbedRemoveBtn} from '#/view/com/composer/ExternalEmbedRemoveBtn'
import {ExternalLinkEmbed} from '#/view/com/util/post-embeds/ExternalLinkEmbed'
import {atoms as a, useTheme} from '#/alf'
import {Loader} from '#/components/Loader'
import {Text} from '#/components/Typography'
Expand Down
8 changes: 4 additions & 4 deletions src/view/com/composer/text-input/TextInput.web.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ import {Text as TiptapText} from '@tiptap/extension-text'
import {generateJSON} from '@tiptap/html'
import {EditorContent, JSONContent, useEditor} from '@tiptap/react'

import {useColorSchemeStyle} from '#/lib/hooks/useColorSchemeStyle'
import {usePalette} from '#/lib/hooks/usePalette'
import {blobToDataUri, isUriImage} from '#/lib/media/util'
import {useActorAutocompleteFn} from '#/state/queries/actor-autocomplete'
import {useColorSchemeStyle} from 'lib/hooks/useColorSchemeStyle'
import {blobToDataUri, isUriImage} from 'lib/media/util'
import {textInputWebEmitter} from '#/view/com/composer/text-input/textInputWebEmitter'
import {
LinkFacetMatch,
suggestLinkCardUri,
} from 'view/com/composer/text-input/text-input-util'
} from '#/view/com/composer/text-input/text-input-util'
import {textInputWebEmitter} from '#/view/com/composer/text-input/textInputWebEmitter'
import {atoms as a, useAlf} from '#/alf'
import {Portal} from '#/components/Portal'
import {normalizeTextStyles} from '#/components/Typography'
Expand Down
Loading
Loading