Improve a few complex strings now that we have shifted to .xcstrings

This also introduces a new manually-maintained lookup for localizable strings to replace swiftgen. This manual system allows us to organize the strings as much as we want and is much less work than maintaining the swiftgen system used to be.

Contributes to IOS-582

Author: whattherestimefor

Mastodon/In Progress New Layout and Datamodel/Common Components/Views/TimelineRowViews/MastodonPostViewModel.swift

@@ -237,17 +237,17 @@ extension MastodonPostViewModel {
         let boostLabel: String? = {
             guard metrics.boostCount > 0 else { return nil }
             if myActions.boosted {
-                return L10n.Plural.Count.youAndOthersBoosted(metrics.boostCount - 1)
+                return L10nLookup.Scene.Notification.GroupedNotificationDescription.youAndOthersBoosted(othersCount: metrics.boostCount - 1)
             } else {
-                return L10n.Plural.Count.reblogA11y(metrics.boostCount)
+                return L10nLookup.Scene.Notification.GroupedNotificationDescription.peopleBoosted(boostCount: metrics.boostCount)
             }
         }()
         let favoriteLabel: String? = {
             guard metrics.favoriteCount > 0 else { return nil }
             if myActions.favorited {
-                return L10n.Plural.Count.youAndOthersFavorited(metrics.favoriteCount - 1)
+                return L10nLookup.Scene.Notification.GroupedNotificationDescription.youAndOthersFavorited(othersCount: metrics.favoriteCount - 1)
             } else {
-                return L10n.Plural.Count.favorite(metrics.favoriteCount)
+                return L10nLookup.Scene.Notification.GroupedNotificationDescription.peopleFavourited(favouriteCount: metrics.favoriteCount)
             }
         }()
         let bookmarkLabel: String? = {

Mastodon/In Progress New Layout and Datamodel/Common Components/Views/TimelineRowViews/Molecules/EmbeddedPostView.swift

@@ -365,7 +365,7 @@ extension GenericMastodonPost.PostAttachment {
                 return L10n.Plural.Count.attachment(array.count)
             }
         case .poll:
-            return L10n.Plural.Count.poll(1)
+            return L10nLookup.pluralCountPoll(1)
         case .linkPreviewCard:
             return nil
         }

Mastodon/In Progress New Layout and Datamodel/Common Components/Views/TimelineRowViews/NotificationRowView.swift

@@ -127,8 +127,7 @@ extension GroupedNotificationType {
                     plainString = firstAuthorName
                 case .poll(let status):
                     let votersCount = status?.poll?.votersCount ?? 0
-                    let pollDescription = L10n.Plural.Count.pollThatYouAndOthersVotedIn(votersCount - 1)
-                    plainString = L10n.Scene.Notification.GroupedNotificationDescription.singleNameRanPoll(firstAuthorName, pollDescription)
+                    plainString = L10nLookup.Scene.Notification.GroupedNotificationDescription.pollHasEnded(pollAuthor: firstAuthorName, otherVotersCount: votersCount - 1)
                 case .status:
                     plainString = firstAuthorName
                 case .adminSignUp:
@@ -143,7 +142,7 @@ extension GroupedNotificationType {
             } else {
                 switch self {
                 case .favourite:
-                    plainString = L10n.Plural.Count.peopleFavourited(totalAuthorCount)
+                    plainString = L10nLookup.Scene.Notification.GroupedNotificationDescription.peopleFavourited(favouriteCount: totalAuthorCount)
                 case .follow:
                     plainString = L10n.Plural.Count.peopleFollowedYou(totalAuthorCount)
                 case .reblog:
@@ -167,31 +166,25 @@ extension Mastodon.Entity.Report {
     var summaryHtml: String {
         if let targetedAccount = targetAccount {
             let targetedAccountName = targetedAccount.displayNameWithFallback
-            let postCountString: String? = {
-                if let postCount = flaggedStatusIDs?.count {
-                    return L10n.Plural.Count.post(postCount)
-                } else {
-                    return nil
-                }
-            }()
+            let postCount: Int? = flaggedStatusIDs?.count
 
             let summaryPlainstring: String = {
                 switch category {
                 case .spam:
-                    if let postCountString {
-                        return L10n.Scene.Notification.GroupedNotificationDescription.someoneReportedPostsFromAccountForSpam(postCountString, targetedAccountName)
+                    if let postCount {
+                        return L10nLookup.Scene.Notification.GroupedNotificationDescription.someoneReportedPostsForSpam(postCount: postCount, violatingAccountName: targetedAccountName)
                     } else {
                         return L10n.Scene.Notification.GroupedNotificationDescription.someoneReportedAccountForSpam(targetedAccountName)
                     }
                 case .violation:
-                    if let postCountString {
-                        return L10n.Scene.Notification.GroupedNotificationDescription.someoneReportedPostsFromAccountForRuleViolation(postCountString, targetedAccountName)
+                    if let postCount {
+                        return L10nLookup.Scene.Notification.GroupedNotificationDescription.someoneReportedPostsForRuleViolation(postCount: postCount, violatingAccountName: targetedAccountName)
                     } else {
                         return L10n.Scene.Notification.GroupedNotificationDescription.someoneReportedAccountForRuleViolation(targetedAccountName)
                     }
                 case ._other, nil:
-                    if let postCountString {
-                        return L10n.Scene.Notification.GroupedNotificationDescription.someoneReportedPostsFromAccount(postCountString, targetedAccountName)
+                    if let postCount {
+                        return L10nLookup.Scene.Notification.GroupedNotificationDescription.someoneReportedPosts(postCount: postCount, violatingAccountName: targetedAccountName)
                     } else {
                         return L10n.Scene.Notification.GroupedNotificationDescription.someoneReportedAccount(targetedAccountName)
                     }
@@ -732,7 +725,7 @@ extension Mastodon.Entity.Status {
             case .generic(let count):
                 return L10n.Plural.Count.attachment(count)
             case .poll:
-                return L10n.Plural.Count.poll(1)
+                return L10nLookup.pluralCountPoll(1)
             }
         }
 

MastodonSDK/Sources/MastodonLocalization/Generated/Strings.swift

@@ -1102,18 +1102,6 @@ public enum L10n {
         public static let rejected = L10n.tr("Localizable", "Scene.Notification.FollowRequest.Rejected", fallback: "Rejected")
       }
       public enum GroupedNotificationDescription {
-        /// %@ boosted:
-        public static func multiplePeopleBoosted(_ p1: Any) -> String {
-          return L10n.tr("Localizable", "Scene.Notification.GroupedNotificationDescription.MultiplePeopleBoosted", String(describing: p1), fallback: "%@ boosted:")
-        }
-        /// %@ favorited:
-        public static func multiplePeopleFavourited(_ p1: Any) -> String {
-          return L10n.tr("Localizable", "Scene.Notification.GroupedNotificationDescription.MultiplePeopleFavourited", String(describing: p1), fallback: "%@ favorited:")
-        }
-        /// %@ followed you
-        public static func multiplePeopleFollowedYou(_ p1: Any) -> String {
-          return L10n.tr("Localizable", "Scene.Notification.GroupedNotificationDescription.MultiplePeopleFollowedYou", String(describing: p1), fallback: "%@ followed you")
-        }
         /// %@ boosted:
         public static func singleNameBoosted(_ p1: Any) -> String {
           return L10n.tr("Localizable", "Scene.Notification.GroupedNotificationDescription.SingleNameBoosted", String(describing: p1), fallback: "%@ boosted:")
@@ -1146,10 +1134,6 @@ public enum L10n {
         public static func singleNameQuoted(_ p1: Any) -> String {
           return L10n.tr("Localizable", "Scene.Notification.GroupedNotificationDescription.SingleNameQuoted", String(describing: p1), fallback: "%@ quoted you")
         }
-        /// %@ ran %@
-        public static func singleNameRanPoll(_ p1: Any, _ p2: Any) -> String {
-          return L10n.tr("Localizable", "Scene.Notification.GroupedNotificationDescription.SingleNameRanPoll", String(describing: p1), String(describing: p2), fallback: "%@ ran %@")
-        }
         /// %@ requested to follow you
         public static func singleNameRequestedToFollowYou(_ p1: Any) -> String {
           return L10n.tr("Localizable", "Scene.Notification.GroupedNotificationDescription.SingleNameRequestedToFollowYou", String(describing: p1), fallback: "%@ requested to follow you")
@@ -1170,18 +1154,6 @@ public enum L10n {
         public static func someoneReportedAccountForSpam(_ p1: Any) -> String {
           return L10n.tr("Localizable", "Scene.Notification.GroupedNotificationDescription.SomeoneReportedAccountForSpam", String(describing: p1), fallback: "Someone reported %@ for spam.")
         }
-        /// Someone reported %@ from %@.
-        public static func someoneReportedPostsFromAccount(_ p1: Any, _ p2: Any) -> String {
-          return L10n.tr("Localizable", "Scene.Notification.GroupedNotificationDescription.SomeoneReportedPostsFromAccount", String(describing: p1), String(describing: p2), fallback: "Someone reported %@ from %@.")
-        }
-        /// Someone reported %@ from %@ for rule violation.
-        public static func someoneReportedPostsFromAccountForRuleViolation(_ p1: Any, _ p2: Any) -> String {
-          return L10n.tr("Localizable", "Scene.Notification.GroupedNotificationDescription.SomeoneReportedPostsFromAccountForRuleViolation", String(describing: p1), String(describing: p2), fallback: "Someone reported %@ from %@ for rule violation.")
-        }
-        /// Someone reported %@ from %@ for spam.
-        public static func someoneReportedPostsFromAccountForSpam(_ p1: Any, _ p2: Any) -> String {
-          return L10n.tr("Localizable", "Scene.Notification.GroupedNotificationDescription.SomeoneReportedPostsFromAccountForSpam", String(describing: p1), String(describing: p2), fallback: "Someone reported %@ from %@ for spam.")
-        }
         /// Your poll has ended
         public static let yourPollHasEnded = L10n.tr("Localizable", "Scene.Notification.GroupedNotificationDescription.YourPollHasEnded", fallback: "Your poll has ended")
       }
@@ -1216,16 +1188,6 @@ public enum L10n {
         public static let showMentions = L10n.tr("Localizable", "Scene.Notification.Keyobard.ShowMentions", fallback: "Show Mentions")
       }
       public enum NotificationDescription {
-        /// favorited your post
-        public static let favoritedYourPost = L10n.tr("Localizable", "Scene.Notification.NotificationDescription.FavoritedYourPost", fallback: "favorited your post")
-        /// followed you
-        public static let followedYou = L10n.tr("Localizable", "Scene.Notification.NotificationDescription.FollowedYou", fallback: "followed you")
-        /// mentioned you
-        public static let mentionedYou = L10n.tr("Localizable", "Scene.Notification.NotificationDescription.MentionedYou", fallback: "mentioned you")
-        /// poll has ended
-        public static let pollHasEnded = L10n.tr("Localizable", "Scene.Notification.NotificationDescription.PollHasEnded", fallback: "poll has ended")
-        /// boosted your post
-        public static let rebloggedYourPost = L10n.tr("Localizable", "Scene.Notification.NotificationDescription.RebloggedYourPost", fallback: "boosted your post")
         /// An admin from %@ has blocked %@, including %@.
         public static func relationshipSeverance(_ p1: Any, _ p2: Any, _ p3: Any) -> String {
           return L10n.tr("Localizable", "Scene.Notification.NotificationDescription.RelationshipSeverance", String(describing: p1), String(describing: p2), String(describing: p3), fallback: "An admin from %@ has blocked %@, including %@.")
@@ -2356,21 +2318,9 @@ public enum L10n {
         return L10n.tr("Localizable", "plural.count.people_boosted", p1, fallback: "Plural format key: \"%#@count_people@\"")
       }
       /// Plural format key: "%#@count_people@"
-      public static func peopleFavourited(_ p1: Int) -> String {
-        return L10n.tr("Localizable", "plural.count.people_favourited", p1, fallback: "Plural format key: \"%#@count_people@\"")
-      }
-      /// Plural format key: "%#@count_people@"
       public static func peopleFollowedYou(_ p1: Int) -> String {
         return L10n.tr("Localizable", "plural.count.people_followed_you", p1, fallback: "Plural format key: \"%#@count_people@\"")
       }
-      /// Plural format key: "%#@poll_count@"
-      public static func poll(_ p1: Int) -> String {
-        return L10n.tr("Localizable", "plural.count.poll", p1, fallback: "Plural format key: \"%#@poll_count@\"")
-      }
-      /// Plural format key: "%#@count_others@"
-      public static func pollThatYouAndOthersVotedIn(_ p1: Int) -> String {
-        return L10n.tr("Localizable", "plural.count.poll_that_you_and_others_voted_in", p1, fallback: "Plural format key: \"%#@count_others@\"")
-      }
       /// Plural format key: "%#@post_count@"
       public static func post(_ p1: Int) -> String {
         return L10n.tr("Localizable", "plural.count.post", p1, fallback: "Plural format key: \"%#@post_count@\"")
@@ -2399,14 +2349,6 @@ public enum L10n {
       public static func voter(_ p1: Int) -> String {
         return L10n.tr("Localizable", "plural.count.voter", p1, fallback: "Plural format key: \"%#@voter_count@\"")
       }
-      /// Plural format key: "%#@count_others@"
-      public static func youAndOthersBoosted(_ p1: Int) -> String {
-        return L10n.tr("Localizable", "plural.count.you_and_others_boosted", p1, fallback: "Plural format key: \"%#@count_others@\"")
-      }
-      /// Plural format key: "%#@count_others@"
-      public static func youAndOthersFavorited(_ p1: Int) -> String {
-        return L10n.tr("Localizable", "plural.count.you_and_others_favorited", p1, fallback: "Plural format key: \"%#@count_others@\"")
-      }
     }
     public enum FilteredNotificationBanner {
       /// Plural format key: "%#@number_of_requests@"

MastodonSDK/Sources/MastodonLocalization/Resources/L10nLookup.swift

@@ -0,0 +1,94 @@
+//
+//  L10nLookup.swift
+//  MastodonSDK
+//
+//  Created by Shannon Hughes on 11/19/25.
+//
+
+import Foundation
+
+/// This bridge seems to be necessary for now because our localizations are contained within a Swift package. Also, nesting inside meaningful structs is helpful for organization and the automatic symbol generation is limited in that regard.
+///
+/// To add new strings:
+///  1. Add the entry in .xcstrings with the English string and any pluralization variants
+///  2. Use the "Convert Strings to Symbols" option in .xcstrings to create the function name and set the argument labels
+///  3. Add a function here (in the expected nested struct) that matches the new function signature and looks up the new key.
+///
+/// NOTE: Take care not to modify existing keys without checking to maintain agreement here and on CrowdIn.
+
+public struct L10nLookup {
+    
+    public struct Scene {
+        public struct Notification {
+            public struct GroupedNotificationDescription {
+                public static func youAndOthersFavorited(othersCount: Int) -> String {
+                    let result = tr("Localizable", "Scene.Notification.GroupedNotificationDescription.YouAndOthersFavorited", othersCount, fallback: "sceneNotificationGroupedNotificationDescriptionYouAndOthersFavorited")
+                    return result
+                }
+                
+                public static func peopleFavourited(favouriteCount: Int) -> String {
+                    let result = tr("Localizable", "Scene.Notification.GroupedNotificationDescription.PeopleFavourited", favouriteCount, fallback: "Scene.Notification.GroupedNotificationDescription.PeopleFavourited")
+                    return result
+                }
+                
+                public static func youAndOthersBoosted(othersCount: Int) -> String {
+                    let result = tr("Localizable", "Scene.Notification.GroupedNotificationDescription.YouAndOthersBoosted", othersCount, fallback: "Scene.Notification.GroupedNotificationDescription.YouAndOthersBoosted")
+                    return result
+                }
+                
+                public static func peopleBoosted(boostCount: Int) -> String {
+                    let result = tr("Localizable", "Scene.Notification.GroupedNotificationDescription.PeopleBoosted", boostCount, fallback: "Scene.Notification.GroupedNotificationDescription.PeopleBoosted")
+                    return result
+                }
+                
+                public static func peopleFollowedYou(newFollowerCount: Int) -> String {
+                    let result = tr("Localizable", "Scene.Notification.GroupedNotificationDescription.PeopleFollowedYou", newFollowerCount, fallback: "sceneNotificationGroupedNotificationDescriptionPeopleFollowedYou")
+                    return result
+                }
+                
+                public static func pollHasEnded(pollAuthor: String, otherVotersCount: Int) -> String {
+                    let result = tr("Localizable", "Scene.Notification.GroupedNotificationDescription.PollHasEnded", pollAuthor, otherVotersCount, fallback: "sceneNotificationGroupedNotificationDescriptionPollHasEnded")
+                    return result
+                }
+                
+                public static func someoneReportedPosts(postCount: Int, violatingAccountName: String) -> String {
+                    let result = tr("Localizable", "Scene.Notification.GroupedNotificationDescription.SomeonReportedPosts", postCount, violatingAccountName, fallback: "sceneNotificationGroupedNotificationDescriptionSomeoneReportedPosts")
+                    return result
+                }
+                
+                public static func someoneReportedPostsForRuleViolation(postCount: Int, violatingAccountName: String) -> String {
+                    let result = tr("Localizable", "Scene.Notification.GroupedNotificationDescription.SomeonReportedPostsForRuleViolation", postCount, violatingAccountName, fallback: "sceneNotificationGroupedNotificationDescriptionSomeoneReportedPostsForRuleViolation")
+                    return result
+                }
+                
+                public static func someoneReportedPostsForSpam(postCount: Int, violatingAccountName: String) -> String {
+                    let result = tr("Localizable", "Scene.Notification.GroupedNotificationDescription.SomeonReportedPostsForSpam", postCount, violatingAccountName, fallback: "sceneNotificationGroupedNotificationDescriptionSomeoneReportedPostsForSpam")
+                    return result
+                }
+            }
+        }
+    }
+
+    public static func pluralCountPoll(_ count: Int) -> String {
+        let result = tr("Localizable", "plural.count.poll", count, fallback: "pluralCountPoll")
+        return result
+    }
+    
+    private static func tr(_ table: String, _ key: String, _ args: CVarArg..., fallback value: String) -> String {
+        let missingKey = "_MISSING_"
+        let format = {
+            let localized = Bundle.module.localizedString(forKey: key, value: missingKey, table: table)
+            if localized != missingKey {
+                return localized
+            } else {
+                return englishBundle?.localizedString(forKey: key, value: value, table: table) ?? value
+            }
+        }()
+        return String(format: format, locale: Locale.current, arguments: args)
+    }
+    
+    private static var englishBundle: Bundle? = {
+        guard let enBundlePath = Bundle.module.path(forResource: "en", ofType: "lproj") else { return nil }
+        return Bundle(path: enBundlePath)
+    }()
+}