Merge remote-tracking branch 'origin/main' into hailey/swipeable-chats

bluesky-social · Oct 7, 2024 · 5438fd1 · 5438fd1
2 parents 500361f + c365096
commit 5438fd1
Show file tree

Hide file tree

Showing 30 changed files with 13,440 additions and 5,438 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -5,10 +5,7 @@ body:
   - type: markdown
     attributes:
       value: |
-        Thanks for taking the time to report an issue you've found in the app! Before you submit this issue, please make
-        sure you've searched for similar issues that are already open and being tracked. If you find an open issue that
-        seems relevant to yours, it is best to leave a response there with your information instead of opening a new
-        issue, since it helps to consolidate the info in one place.
+        Thanks for taking the time to report an issue you've found in the app! Before you submit this issue, please make sure you've searched for similar issues that are already open and being tracked. If you find an open issue that seems relevant to yours, it is best to leave a response there with your information instead of opening a new issue, since it helps to consolidate the info in one place.
   - type: textarea
     attributes:
       label: Steps to Reproduce

diff --git a/.github/ISSUE_TEMPLATE/bug_report_fabric.yml b/.github/ISSUE_TEMPLATE/bug_report_fabric.yml
@@ -12,10 +12,7 @@ body:
   - type: markdown
     attributes:
       value: |
-        Thanks for taking the time to report an issue you've found in the app! Before you submit this issue, please make
-        sure you've searched for similar issues that are already open and being tracked. If you find an open issue that
-        seems relevant to yours, it is best to leave a response there with your information instead of opening a new
-        issue, since it helps to consolidate the info in one place.
+        Thanks for taking the time to report an issue you've found in the app! Before you submit this issue, please make sure you've searched for similar issues that are already open and being tracked. If you find an open issue that seems relevant to yours, it is best to leave a response there with your information instead of opening a new issue, since it helps to consolidate the info in one place.
   - type: textarea
     attributes:
       label: Steps to Reproduce

diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -5,10 +5,7 @@ body:
   - type: markdown
     attributes:
       value: |
-        Thanks for submitting a feature request! Before you submit this request, please make sure you've searched for
-        similar requests that are already open and being tracked. If you find an open request that seems relevant to
-        yours, it is best to leave a response there with your information instead of opening a new request, since it
-        helps to consolidate the info in one place.
+        Thanks for submitting a feature request! Before you submit this request, please make sure you've searched for similar requests that are already open and being tracked. If you find an open request that seems relevant to yours, it is best to leave a response there with your information instead of opening a new request, since it helps to consolidate the info in one place.
   - type: textarea
     attributes:
       label: Describe the Feature

diff --git a/lingui.config.js b/lingui.config.js
@@ -18,6 +18,7 @@ module.exports = {
     'tr',
     'uk',
     'zh-CN',
+    'zh-HK',
     'zh-TW',
   ],
   catalogs: [

diff --git a/modules/bottom-sheet/ios/SheetView.swift b/modules/bottom-sheet/ios/SheetView.swift
@@ -66,6 +66,7 @@ class SheetView: ExpoView, UISheetPresentationControllerDelegate {
       }
     }
   }
+  private var prevLayoutDetentIdentifier: UISheetPresentationController.Detent.Identifier?
 
   // MARK: - Lifecycle
 
@@ -143,11 +144,13 @@ class SheetView: ExpoView, UISheetPresentationControllerDelegate {
   }
 
   func updateLayout() {
-    if let contentHeight = self.innerView?.subviews.first?.frame.size.height {
+    if self.prevLayoutDetentIdentifier == self.selectedDetentIdentifier,
+       let contentHeight = self.innerView?.subviews.first?.frame.size.height {
       self.sheetVc?.updateDetents(contentHeight: self.clampHeight(contentHeight),
-                               preventExpansion: self.preventExpansion)
+                                  preventExpansion: self.preventExpansion)
       self.selectedDetentIdentifier = self.sheetVc?.getCurrentDetentIdentifier()
     }
+    self.prevLayoutDetentIdentifier = self.selectedDetentIdentifier
   }
 
   func dismiss() {

diff --git a/modules/bottom-sheet/ios/SheetViewController.swift b/modules/bottom-sheet/ios/SheetViewController.swift
@@ -62,7 +62,7 @@ class SheetViewController: UIViewController {
       }
     }
   }
-  
+
   func getCurrentDetentIdentifier() -> UISheetPresentationController.Detent.Identifier? {
     guard let sheet = self.sheetPresentationController else {
       return nil

diff --git a/src/components/hooks/dates.ts b/src/components/hooks/dates.ts
@@ -25,6 +25,7 @@ import {
   tr,
   uk,
   zhCN,
+  zhHK,
   zhTW,
 } from 'date-fns/locale'
 
@@ -52,6 +53,7 @@ const locales: Record<AppLanguage, Locale | undefined> = {
   tr,
   uk,
   ['zh-CN']: zhCN,
+  ['zh-HK']: zhHK,
   ['zh-TW']: zhTW,
 }
 

diff --git a/src/components/moderation/LabelsOnMeDialog.tsx b/src/components/moderation/LabelsOnMeDialog.tsx
@@ -242,18 +242,20 @@ function AppealForm({
           <Trans>Appeal "{strings.name}" label</Trans>
         </Text>
         <Text style={[a.text_md, a.leading_snug]}>
-          <Trans>This appeal will be sent to</Trans>{' '}
+          <Trans>
+            This appeal will be sent to{' '}
+            <InlineLinkText
+              label={sourceName}
+              to={makeProfileLink(
+                labeler ? labeler.creator : {did: label.src, handle: ''},
+              )}
+              onPress={() => control.close()}
+              style={[a.text_md, a.leading_snug]}>
+              {sourceName}
+            </InlineLinkText>
+            .
+          </Trans>
         </Text>
-        <InlineLinkText
-          label={sourceName}
-          to={makeProfileLink(
-            labeler ? labeler.creator : {did: label.src, handle: ''},
-          )}
-          onPress={() => control.close()}
-          style={[a.text_md, a.leading_snug]}>
-          {sourceName}
-        </InlineLinkText>
-        <Text style={[a.text_md, a.leading_snug]}>.</Text>
       </View>
       <View style={[a.my_md]}>
         <Dialog.Input

diff --git a/src/components/moderation/ModerationDetailsDialog.tsx b/src/components/moderation/ModerationDetailsDialog.tsx
@@ -148,15 +148,18 @@ function ModerationDetailsDialogInner({
           ) : (
             <>
               <Text style={[t.atoms.text, a.text_md, a.leading_snug, a.mt_lg]}>
-                <Trans>This label was applied by </Trans>
+                <Trans>
+                  This label was applied by{' '}
+                  <InlineLinkText
+                    label={desc.source || _(msg`an unknown labeler`)}
+                    to={makeProfileLink({did: modcause.label.src, handle: ''})}
+                    onPress={() => control.close()}
+                    style={a.text_md}>
+                    {desc.source || _(msg`an unknown labeler`)}
+                  </InlineLinkText>
+                  .
+                </Trans>
               </Text>
-              <InlineLinkText
-                label={desc.source || _(msg`an unknown labeler`)}
-                to={makeProfileLink({did: modcause.label.src, handle: ''})}
-                onPress={() => control.close()}
-                style={a.text_md}>
-                {desc.source || _(msg`an unknown labeler`)}
-              </InlineLinkText>
             </>
           )}
         </View>

diff --git a/src/lib/constants.ts b/src/lib/constants.ts
@@ -50,7 +50,7 @@ export const MAX_DM_GRAPHEME_LENGTH = 1000
 
 // Recommended is 100 per: https://www.w3.org/WAI/GL/WCAG20/tests/test3.html
 // but increasing limit per user feedback
-export const MAX_ALT_TEXT = 1000
+export const MAX_ALT_TEXT = 2000
 
 export function IS_TEST_USER(handle?: string) {
   return handle && handle?.endsWith('.test')

diff --git a/src/locale/helpers.ts b/src/locale/helpers.ts
@@ -151,6 +151,8 @@ export function sanitizeAppLanguageSetting(appLanguage: string): AppLanguage {
         return AppLanguage.uk
       case 'zh-CN':
         return AppLanguage.zh_CN
+      case 'zh-HK':
+        return AppLanguage.zh_HK
       case 'zh-TW':
         return AppLanguage.zh_TW
       default:

diff --git a/src/locale/i18n.ts b/src/locale/i18n.ts
@@ -28,6 +28,7 @@ import {messages as messagesRu} from '#/locale/locales/ru/messages'
 import {messages as messagesTr} from '#/locale/locales/tr/messages'
 import {messages as messagesUk} from '#/locale/locales/uk/messages'
 import {messages as messagesZh_CN} from '#/locale/locales/zh-CN/messages'
+import {messages as messagesZh_HK} from '#/locale/locales/zh-HK/messages'
 import {messages as messagesZh_TW} from '#/locale/locales/zh-TW/messages'
 import {useLanguagePrefs} from '#/state/preferences'
 
@@ -164,6 +165,14 @@ export async function dynamicActivate(locale: AppLanguage) {
       ])
       break
     }
+    case AppLanguage.zh_HK: {
+      i18n.loadAndActivate({locale, messages: messagesZh_HK})
+      await Promise.all([
+        import('@formatjs/intl-pluralrules/locale-data/zh'),
+        import('@formatjs/intl-numberformat/locale-data/zh'),
+      ])
+      break
+    }
     case AppLanguage.zh_TW: {
       i18n.loadAndActivate({locale, messages: messagesZh_TW})
       await Promise.all([

diff --git a/src/locale/i18n.web.ts b/src/locale/i18n.web.ts
@@ -76,6 +76,10 @@ export async function dynamicActivate(locale: AppLanguage) {
       mod = await import(`./locales/zh-CN/messages`)
       break
     }
+    case AppLanguage.zh_HK: {
+      mod = await import(`./locales/zh-HK/messages`)
+      break
+    }
     case AppLanguage.zh_TW: {
       mod = await import(`./locales/zh-TW/messages`)
       break

diff --git a/src/locale/languages.ts b/src/locale/languages.ts
@@ -22,6 +22,7 @@ export enum AppLanguage {
   tr = 'tr',
   uk = 'uk',
   zh_CN = 'zh-CN',
+  zh_HK = 'zh-HK',
   zh_TW = 'zh-TW',
 }
 
@@ -47,8 +48,9 @@ export const APP_LANGUAGES: AppLanguageConfig[] = [
   {code2: AppLanguage.ru, name: 'Русский – Russian'},
   {code2: AppLanguage.tr, name: 'Türkçe – Turkish'},
   {code2: AppLanguage.uk, name: 'Українська – Ukrainian'},
-  {code2: AppLanguage.zh_CN, name: '简体中文（中国）– Chinese (Simplified)'},
-  {code2: AppLanguage.zh_TW, name: '繁體中文（臺灣）– Chinese (Traditional)'},
+  {code2: AppLanguage.zh_CN, name: '简体中文 – Simplified Chinese'},
+  {code2: AppLanguage.zh_TW, name: '繁體中文 – Traditional Chinese'},
+  {code2: AppLanguage.zh_HK, name: '粵文 – Cantonese'},
 ]
 
 export const LANGUAGES: Language[] = [

diff --git a/src/locale/locales/ca/messages.po b/src/locale/locales/ca/messages.po
@@ -716,7 +716,7 @@ msgstr "Hi ha hagut un error mentre es carregava el vídeo. Prova-ho més tard."
 
 #: src/components/dialogs/nuxs/TenMillion/index.tsx:250
 msgid "An error occurred while saving the image!"
-msgstr ""
+msgstr "S'ha produït un error en desar la imatge!"
 
 #: src/components/StarterPack/ShareDialog.tsx:79
 #~ msgid "An error occurred while saving the image."
@@ -1098,7 +1098,7 @@ msgstr "Bluesky és millor amb col·legues!"
 
 #: src/components/dialogs/nuxs/TenMillion/index.tsx:206
 msgid "Bluesky now has over 10 million users, and I was #{0}!"
-msgstr ""
+msgstr "Bluesky té més de 10 milions d'usuaris ara, i jo he estat el #{0}!"
 
 #: src/view/com/modals/Waitlist.tsx:70
 #~ msgid "Bluesky uses invites to build a healthier community. If you don't know anybody with an invite, you can sign up for the waitlist and we'll send one soon."
@@ -1131,7 +1131,7 @@ msgstr "Llibres"
 
 #: src/components/dialogs/nuxs/TenMillion/index.tsx:614
 msgid "Brag a little!"
-msgstr ""
+msgstr "Presumeix-ne una mica!"
 
 #: src/components/FeedInterstitials.tsx:350
 msgid "Browse more accounts on the Explore page"
@@ -1298,7 +1298,7 @@ msgstr "Subtítols i text alternatiu"
 
 #: src/components/dialogs/nuxs/TenMillion/index.tsx:368
 msgid "Celebrating {0} users"
-msgstr ""
+msgstr "Celebrant {0} usuaris"
 
 #: src/view/com/modals/VerifyEmail.tsx:160
 msgid "Change"
@@ -2381,7 +2381,7 @@ msgstr "Descarrega el fitxer CAR"
 
 #: src/components/dialogs/nuxs/TenMillion/index.tsx:622
 msgid "Download image"
-msgstr ""
+msgstr "Descarrega la imatge"
 
 #: src/view/com/composer/text-input/TextInput.web.tsx:269
 msgid "Drop to add images"
@@ -3140,7 +3140,7 @@ msgstr "Segueix-los a tots"
 #: src/view/com/profile/FollowButton.tsx:79
 msgctxt "action"
 msgid "Follow Back"
-msgstr ""
+msgstr "Segueix"
 
 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:223
 #: src/view/com/post-thread/PostThreadFollowBtn.tsx:142
@@ -3870,7 +3870,7 @@ msgstr "Uneix-te a la conversa"
 
 #: src/components/dialogs/nuxs/TenMillion/index.tsx:492
 msgid "Joined {0}"
-msgstr ""
+msgstr "Es va unir el {0}"
 
 #: src/screens/Onboarding/index.tsx:21
 #: src/screens/Onboarding/state.ts:89
@@ -4425,7 +4425,7 @@ msgstr "Música"
 #: src/view/com/util/post-embeds/VideoEmbedInner/VideoWebControls.tsx:389
 msgctxt "video"
 msgid "Mute"
-msgstr ""
+msgstr "Silencia"
 
 #: src/components/TagMenu/index.tsx:263
 #: src/view/com/util/post-embeds/VideoEmbedInner/VideoEmbedInnerNative.tsx:163
@@ -4959,7 +4959,7 @@ msgstr "Ostres! Alguna cosa ha fallat."
 
 #: src/components/dialogs/nuxs/TenMillion/index.tsx:175
 msgid "Oh no! We weren't able to generate an image for you to share. Rest assured, we're glad you're here 🦋"
-msgstr ""
+msgstr "Oh no! No hem pogut generar una imatge per compartir. Tingues present que ens alegrem que siguis aquí 🦋"
 
 #: src/screens/Profile/Header/ProfileHeaderLabeler.tsx:339
 msgid "OK"
@@ -6978,11 +6978,11 @@ msgstr "Comparteix el canal"
 
 #: src/components/dialogs/nuxs/TenMillion/index.tsx:621
 msgid "Share image externally"
-msgstr ""
+msgstr "Comparteix la imatge externament"
 
 #: src/components/dialogs/nuxs/TenMillion/index.tsx:639
 msgid "Share image in post"
-msgstr ""
+msgstr "Comparteix la imatge en una publicació"
 
 #: src/components/StarterPack/ShareDialog.tsx:124
 #: src/components/StarterPack/ShareDialog.tsx:131
@@ -7557,7 +7557,7 @@ msgstr "Toca per entrar a pantalla completa"
 
 #: src/view/com/util/post-embeds/VideoEmbedInner/VideoEmbedInnerNative.tsx:151
 msgid "Tap to play or pause"
-msgstr ""
+msgstr "Toca per a reproduir o pausar"
 
 #: src/view/com/util/post-embeds/VideoEmbedInner/VideoEmbedInnerNative.tsx:164
 msgid "Tap to toggle sound"
@@ -7595,7 +7595,7 @@ msgstr "Explica'ns una mica més"
 
 #: src/components/dialogs/nuxs/TenMillion/index.tsx:518
 msgid "Ten Million"
-msgstr ""
+msgstr "Deu milions"
 
 #: src/view/shell/desktop/RightNav.tsx:90
 msgid "Terms"
@@ -7636,7 +7636,7 @@ msgstr "Gràcies. El teu informe s'ha enviat."
 
 #: src/components/dialogs/nuxs/TenMillion/index.tsx:593
 msgid "Thanks for being one of our first 10 million users."
-msgstr ""
+msgstr "Gràcies per ser un dels nostres primers 10 milions d'usuaris."
 
 #: src/components/intents/VerifyEmailIntentDialog.tsx:74
 msgid "Thanks, you have successfully verified your email address."
@@ -8163,7 +8163,7 @@ msgstr "A qui vols enviar aquest informe?"
 
 #: src/components/dialogs/nuxs/TenMillion/index.tsx:597
 msgid "Together, we're rebuilding the social internet. We're glad you're here."
-msgstr ""
+msgstr "Junts, estem reconstruint l'Internet social. Ens alegrem que siguis aquí."
 
 #: src/components/dialogs/MutedWords.tsx:112
 #~ msgid "Toggle between muted word options."
@@ -8311,7 +8311,7 @@ msgstr "Desfés el m'agrada a aquest canal"
 #: src/view/com/util/post-embeds/VideoEmbedInner/VideoWebControls.tsx:388
 msgctxt "video"
 msgid "Unmute"
-msgstr ""
+msgstr "Deixa de silenciar"
 
 #: src/components/TagMenu/index.tsx:263
 #: src/view/com/util/post-embeds/VideoEmbedInner/VideoEmbedInnerNative.tsx:163
@@ -8684,7 +8684,7 @@ msgstr "Vídeo: {0}"
 #: src/view/com/composer/videos/SelectVideoBtn.tsx:65
 #: src/view/com/composer/videos/VideoPreview.web.tsx:44
 msgid "Videos must be less than 60 seconds long"
-msgstr ""
+msgstr "Els vídeos han de ser de menys de 60 segons"
 
 #: src/screens/Profile/Header/Shell.tsx:113
 msgid "View {0}'s avatar"
@@ -9367,7 +9367,7 @@ msgstr "El teu compte s'ha eliminat"
 
 #: src/state/queries/video/video.ts:185
 msgid "Your account is not yet old enough to upload videos. Please try again later."
-msgstr ""
+msgstr "El teu compte encara no té l'edat suficient per penjar vídeos. Torna-ho a provar més tard."
 
 #: src/view/screens/Settings/ExportCarDialog.tsx:65
 msgid "Your account repository, containing all public data records, can be downloaded as a \"CAR\" file. This file does not include media embeds, such as images, or your private data, which must be fetched separately."
-Original file line number
+Diff line change
@@ Expand Up / @@ -62,7 +62,7 @@ class SheetViewController: UIViewController { @@
           }
         }
       }
       func getCurrentDetentIdentifier() -> UISheetPresentationController.Detent.Identifier? {
         guard let sheet = self.sheetPresentationController else {
           return nil
@@ Expand Down @@