Support double-length pseudlanguage in fallback translations and upda…

…te snapshots for en-us.
element-hq · Jan 15, 2025 · c29175d · c29175d
1 parent 0bcc59a
commit c29175d
Show file tree

Hide file tree

Showing 32 changed files with 67 additions and 59 deletions.
diff --git a/ElementX/Sources/Generated/Strings.swift b/ElementX/Sources/Generated/Strings.swift
@@ -2798,7 +2798,11 @@ extension L10n {
     guard let bundle = Bundle.lprojBundle(for: language) else { return nil }
     let format = NSLocalizedString(key, tableName: table, bundle: bundle, comment: "")
     let translation = String(format: format, locale: Locale(identifier: language), arguments: args)
-    guard translation != key else { return nil }
+    guard translation != key, 
+          translation != "\(key) \(key)" // Handle double pseudo for tests
+      else { 
+        return nil 
+      }
     return translation
   }
 }

diff --git a/...Sources/Screens/Onboarding/SessionVerificationScreen/View/SessionVerificationScreen.swift b/...Sources/Screens/Onboarding/SessionVerificationScreen/View/SessionVerificationScreen.swift
@@ -162,7 +162,7 @@ struct SessionVerificationScreen: View {
             VStack(spacing: 16.0) {
                 Text(emoji.symbol)
                     .font(.compound.headingXLBold)
-                Text(emoji.localizedDescription)
+                Text(emoji.localizedDescription.capitalized)
                     .font(.compound.bodyMD)
                     .foregroundColor(.compound.textSecondary)
             }

diff --git a/...ources/__Snapshots__/PreviewTests/test_advancedSettingsScreen-iPad-pseudo.1.png b/...ources/__Snapshots__/PreviewTests/test_advancedSettingsScreen-iPad-pseudo.1.png
diff --git a/...s/__Snapshots__/PreviewTests/test_advancedSettingsScreen-iPhone-16-pseudo.1.png b/...s/__Snapshots__/PreviewTests/test_advancedSettingsScreen-iPhone-16-pseudo.1.png
diff --git a/...Tests/Sources/__Snapshots__/PreviewTests/test_homeScreen-iPad-pseudo.Loaded.png b/...Tests/Sources/__Snapshots__/PreviewTests/test_homeScreen-iPad-pseudo.Loaded.png
diff --git a/...ots__/PreviewTests/test_qRCodeLoginScreen-iPad-pseudo.Connection-not-secure.png b/...ots__/PreviewTests/test_qRCodeLoginScreen-iPad-pseudo.Connection-not-secure.png
diff --git a/.../PreviewTests/test_qRCodeLoginScreen-iPhone-16-pseudo.Connection-not-secure.png b/.../PreviewTests/test_qRCodeLoginScreen-iPhone-16-pseudo.Connection-not-secure.png
diff --git a/...urces/__Snapshots__/PreviewTests/test_roomDetailsScreen-iPad-pseudo.DM-Room.png b/...urces/__Snapshots__/PreviewTests/test_roomDetailsScreen-iPad-pseudo.DM-Room.png
diff --git a/.../__Snapshots__/PreviewTests/test_roomDetailsScreen-iPad-pseudo.Generic-Room.png b/.../__Snapshots__/PreviewTests/test_roomDetailsScreen-iPad-pseudo.Generic-Room.png
diff --git a/...s/__Snapshots__/PreviewTests/test_roomDetailsScreen-iPad-pseudo.Simple-Room.png b/...s/__Snapshots__/PreviewTests/test_roomDetailsScreen-iPad-pseudo.Simple-Room.png
diff --git a/.../__Snapshots__/PreviewTests/test_roomDetailsScreen-iPhone-16-pseudo.DM-Room.png b/.../__Snapshots__/PreviewTests/test_roomDetailsScreen-iPhone-16-pseudo.DM-Room.png
diff --git a/...apshots__/PreviewTests/test_roomDetailsScreen-iPhone-16-pseudo.Generic-Room.png b/...apshots__/PreviewTests/test_roomDetailsScreen-iPhone-16-pseudo.Generic-Room.png
diff --git a/...napshots__/PreviewTests/test_roomDetailsScreen-iPhone-16-pseudo.Simple-Room.png b/...napshots__/PreviewTests/test_roomDetailsScreen-iPhone-16-pseudo.Simple-Room.png
diff --git a/...sts/Sources/__Snapshots__/PreviewTests/test_roomListFilterView-iPad-en-GB.1.png b/...sts/Sources/__Snapshots__/PreviewTests/test_roomListFilterView-iPad-en-GB.1.png
diff --git a/...sts/Sources/__Snapshots__/PreviewTests/test_roomListFilterView-iPad-en-GB.2.png b/...sts/Sources/__Snapshots__/PreviewTests/test_roomListFilterView-iPad-en-GB.2.png
diff --git a/...ts/Sources/__Snapshots__/PreviewTests/test_roomListFilterView-iPad-pseudo.1.png b/...ts/Sources/__Snapshots__/PreviewTests/test_roomListFilterView-iPad-pseudo.1.png
diff --git a/...ts/Sources/__Snapshots__/PreviewTests/test_roomListFilterView-iPad-pseudo.2.png b/...ts/Sources/__Snapshots__/PreviewTests/test_roomListFilterView-iPad-pseudo.2.png
diff --git a/...ources/__Snapshots__/PreviewTests/test_roomListFilterView-iPhone-16-en-GB.1.png b/...ources/__Snapshots__/PreviewTests/test_roomListFilterView-iPhone-16-en-GB.1.png
diff --git a/...ources/__Snapshots__/PreviewTests/test_roomListFilterView-iPhone-16-en-GB.2.png b/...ources/__Snapshots__/PreviewTests/test_roomListFilterView-iPhone-16-en-GB.2.png
diff --git a/...urces/__Snapshots__/PreviewTests/test_roomListFilterView-iPhone-16-pseudo.1.png b/...urces/__Snapshots__/PreviewTests/test_roomListFilterView-iPhone-16-pseudo.1.png
diff --git a/...urces/__Snapshots__/PreviewTests/test_roomListFilterView-iPhone-16-pseudo.2.png b/...urces/__Snapshots__/PreviewTests/test_roomListFilterView-iPhone-16-pseudo.2.png
diff --git a/...__Snapshots__/PreviewTests/test_roomListFiltersEmptyStateView-iPad-pseudo.1.png b/...__Snapshots__/PreviewTests/test_roomListFiltersEmptyStateView-iPad-pseudo.1.png
diff --git a/...pshots__/PreviewTests/test_roomListFiltersEmptyStateView-iPhone-16-pseudo.1.png b/...pshots__/PreviewTests/test_roomListFiltersEmptyStateView-iPhone-16-pseudo.1.png
diff --git a/...ts/Sources/__Snapshots__/PreviewTests/test_roomListFiltersView-iPad-en-GB.1.png b/...ts/Sources/__Snapshots__/PreviewTests/test_roomListFiltersView-iPad-en-GB.1.png
diff --git a/...s/Sources/__Snapshots__/PreviewTests/test_roomListFiltersView-iPad-pseudo.1.png b/...s/Sources/__Snapshots__/PreviewTests/test_roomListFiltersView-iPad-pseudo.1.png
diff --git a/...s/Sources/__Snapshots__/PreviewTests/test_roomListFiltersView-iPad-pseudo.2.png b/...s/Sources/__Snapshots__/PreviewTests/test_roomListFiltersView-iPad-pseudo.2.png
diff --git a/...urces/__Snapshots__/PreviewTests/test_roomListFiltersView-iPhone-16-en-GB.1.png b/...urces/__Snapshots__/PreviewTests/test_roomListFiltersView-iPhone-16-en-GB.1.png
diff --git a/...rces/__Snapshots__/PreviewTests/test_roomListFiltersView-iPhone-16-pseudo.1.png b/...rces/__Snapshots__/PreviewTests/test_roomListFiltersView-iPhone-16-pseudo.1.png
diff --git a/...rces/__Snapshots__/PreviewTests/test_roomListFiltersView-iPhone-16-pseudo.2.png b/...rces/__Snapshots__/PreviewTests/test_roomListFiltersView-iPhone-16-pseudo.2.png
diff --git a/.../__Snapshots__/PreviewTests/test_serverConfirmationScreen-iPad-pseudo.Login.png b/.../__Snapshots__/PreviewTests/test_serverConfirmationScreen-iPad-pseudo.Login.png
diff --git a/...apshots__/PreviewTests/test_serverConfirmationScreen-iPhone-16-pseudo.Login.png b/...apshots__/PreviewTests/test_serverConfirmationScreen-iPhone-16-pseudo.Login.png
diff --git a/Tools/SwiftGen/Templates/Strings/structured-swift5-element.stencil b/Tools/SwiftGen/Templates/Strings/structured-swift5-element.stencil
@@ -90,7 +90,11 @@ extension {{enumName}} {
     guard let bundle = Bundle.lprojBundle(for: language) else { return nil }
     let format = NSLocalizedString(key, tableName: table, bundle: bundle, comment: "")
     let translation = String(format: format, locale: Locale(identifier: language), arguments: args)
-    guard translation != key else { return nil }
+    guard translation != key, 
+          translation != "\(key) \(key)" // Handle double pseudo for tests
+      else { 
+        return nil 
+      }
     return translation
   }
 }