v1.129.0 release prep (#11265)

crowdin.yml

@@ -11,7 +11,9 @@
           "two_letters_code": {
             "pt": "pt-PT",
             "pt-BR": "pt-BR",
+            "en-CA": "en-CA",
             "en-GB": "en-GB",
+            "fr-CA": "fr-CA",
             "zh-CN": "zh-CN",
             "zh-TW": "zh-TW",
             "zh-HK": "zh-HK"
@@ -19,4 +21,4 @@
       }
     }
   ]
-}
+}

src/components/interstitials/FeedTrendingTopics.tsx

@@ -1,8 +1,7 @@
 import {useMemo} from 'react'
 import {Pressable, View} from 'react-native'
 import {type AppBskyUnspeccedDefs, moderateProfile} from '@atproto/api'
-import {plural} from '@lingui/core/macro'
+import {Plural, Trans, useLingui} from '@lingui/react/macro'
-import {Trans, useLingui} from '@lingui/react/macro'
 
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
 import {useTrendingSettings} from '#/state/preferences/trending'
@@ -149,6 +148,7 @@ function TrendRow({
   const {t: l, i18n} = useLingui()
 
   const actors = useModerateTrendingActors(trend.actors)
+  const formattedPostCount = formatCount(i18n, trend.postCount)
 
   return (
     <Link
@@ -202,8 +202,12 @@ function TrendRow({
                   style={[a.text_sm, t.atoms.text_contrast_medium]}
                   numberOfLines={1}>
                   <Trans comment="'{postCount} {posts}', e.g., '1.2K posts'">
-                    {formatCount(i18n, trend.postCount)}{' '}
+                    {formattedPostCount}{' '}
-                    {plural(trend.postCount, {one: 'post', other: 'posts'})}
+                    <Plural
+                      value={{postCount: trend.postCount}}
+                      one="post"
+                      other="posts"
+                    />
                   </Trans>
                 </Text>
               </View>

src/screens/Search/modules/ExploreTrendingTopics.tsx

@@ -6,8 +6,7 @@ import {
   moderateProfile,
   RichText as RichTextApi,
 } from '@atproto/api'
-import {plural} from '@lingui/core/macro'
+import {Plural, Trans, useLingui} from '@lingui/react/macro'
-import {Trans, useLingui} from '@lingui/react/macro'
 
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
 import {useTrendingSettings} from '#/state/preferences/trending'
@@ -88,6 +87,7 @@ export function TrendRow({
   const gutters = useGutters([0, 'base'])
 
   const actors = useModerateTrendingActors(trend.actors)
+  const formattedPostCount = formatCount(i18n, trend.postCount)
 
   const description = useMemo(() => {
     if (!trend.description) return
@@ -146,8 +146,12 @@ export function TrendRow({
                   style={[a.text_sm, t.atoms.text_contrast_medium]}
                   numberOfLines={1}>
                   <Trans comment="'{postCount} {posts}', e.g., '1.2K posts'">
-                    {formatCount(i18n, trend.postCount)}{' '}
+                    {formattedPostCount}{' '}
-                    {plural(trend.postCount, {one: 'post', other: 'posts'})}
+                    <Plural
+                      value={{postCount: trend.postCount}}
+                      one="post"
+                      other="posts"
+                    />
                   </Trans>
                 </Text>
               </View>