fix: max participants 2000 formatting with locale - WPB-17344 (#3058)

dmitrysimkin · caldrian · commit 910977d84790 · 2025-05-23T13:55:08.000+02:00
diff --git a/wire-ios/Wire-iOS/Generated/Strings+Generated.swift b/wire-ios/Wire-iOS/Generated/Strings+Generated.swift
@@ -1172,13 +1172,13 @@ internal enum L10n {
         /// The conversation is full
         internal static let title = L10n.tr("Localizable", "add_participants.alert.title", fallback: "The conversation is full")
         internal enum Message {
-          /// Up to %1$d people can join a conversation. Currently there is only room for %2$d more.
-          internal static func existingConversation(_ p1: Int, _ p2: Int) -> String {
-            return L10n.tr("Localizable", "add_participants.alert.message.existing_conversation", p1, p2, fallback: "Up to %1$d people can join a conversation. Currently there is only room for %2$d more.")
+          /// Up to %@ people can join a conversation. Currently there is only room for %@ more.
+          internal static func existingConversation(_ p1: Any, _ p2: Any) -> String {
+            return L10n.tr("Localizable", "add_participants.alert.message.existing_conversation", String(describing: p1), String(describing: p2), fallback: "Up to %@ people can join a conversation. Currently there is only room for %@ more.")
           }
-          /// Up to %d people can join a conversation.
-          internal static func newConversation(_ p1: Int) -> String {
-            return L10n.tr("Localizable", "add_participants.alert.message.new_conversation", p1, fallback: "Up to %d people can join a conversation.")
+          /// Up to %@ people can join a conversation.
+          internal static func newConversation(_ p1: Any) -> String {
+            return L10n.tr("Localizable", "add_participants.alert.message.new_conversation", String(describing: p1), fallback: "Up to %@ people can join a conversation.")
           }
         }
       }
@@ -4469,9 +4469,9 @@ internal enum L10n {
           internal static let footer = L10n.tr("Localizable", "participants.section.members.footer", fallback: "There are no members.")
         }
         internal enum Name {
-          /// Up to %1$d participants can join a conversation.
-          internal static func footer(_ p1: Int) -> String {
-            return L10n.tr("Localizable", "participants.section.name.footer", p1, fallback: "Up to %1$d participants can join a conversation.")
+          /// Up to %@ participants can join a conversation.
+          internal static func footer(_ p1: Any) -> String {
+            return L10n.tr("Localizable", "participants.section.name.footer", String(describing: p1), fallback: "Up to %@ participants can join a conversation.")
           }
         }
       }
diff --git a/wire-ios/Wire-iOS/Resources/Localization/Base.lproj/Localizable.strings b/wire-ios/Wire-iOS/Resources/Localization/Base.lproj/Localizable.strings
@@ -102,8 +102,8 @@
 "peoplepicker.federation.domain_unvailable" = "The federated domain is currently not available. [Learn more](%@)";
 
 "add_participants.alert.title" = "The conversation is full";
-"add_participants.alert.message.new_conversation" = "Up to %d people can join a conversation.";
-"add_participants.alert.message.existing_conversation" = "Up to %1$d people can join a conversation. Currently there is only room for %2$d more.";
+"add_participants.alert.message.new_conversation" = "Up to %@ people can join a conversation.";
+"add_participants.alert.message.existing_conversation" = "Up to %@ people can join a conversation. Currently there is only room for %@ more.";
 
 // Channel Creation UI - Navigation
 "conversation.create.channel.title" = "New channel";
@@ -860,7 +860,7 @@
 "participants.section.services" = "Services (%d)";
 "participants.section.settings" = "Options";
 "participants.footer.add_title" = "Add Participants";
-"participants.section.name.footer" = "Up to %1$d participants can join a conversation.";
+"participants.section.name.footer" = "Up to %@ participants can join a conversation.";
 "participants.section.admins.footer" = "There are no admins.";
 "participants.section.members.footer" = "There are no members.";
 
diff --git a/wire-ios/Wire-iOS/Resources/Localization/de.lproj/Localizable.strings b/wire-ios/Wire-iOS/Resources/Localization/de.lproj/Localizable.strings
@@ -102,8 +102,8 @@
 "peoplepicker.federation.domain_unvailable" = "Die föderierte Domain ist derzeit nicht verfügbar. [Mehr erfahren](%@)";
 
 "add_participants.alert.title" = "Die Unterhaltung ist voll";
-"add_participants.alert.message.new_conversation" = "Bis zu %d Personen können an einer Unterhaltung teilnehmen.";
-"add_participants.alert.message.existing_conversation" = "Bis zu %1$d Personen können an einer Unterhaltung teilnehmen. Jetzt ist noch Platz für %2$d weitere.";
+"add_participants.alert.message.new_conversation" = "Bis zu %@ Personen können an einer Unterhaltung teilnehmen.";
+"add_participants.alert.message.existing_conversation" = "Bis zu %@ Personen können an einer Unterhaltung teilnehmen. Jetzt ist noch Platz für %2$d weitere.";
 
 // Channel Creation UI - Navigation
 "conversation.create.channel.title" = "Neuer Channel";
@@ -860,7 +860,7 @@
 "participants.section.services" = "Dienste (%d)";
 "participants.section.settings" = "Optionen";
 "participants.footer.add_title" = "Teilnehmer hinzufügen";
-"participants.section.name.footer" = "Bis zu %1$d Personen können an einer Unterhaltung teilnehmen.";
+"participants.section.name.footer" = "Bis zu %@ Personen können an einer Unterhaltung teilnehmen.";
 "participants.section.admins.footer" = "Es gibt keine Admins.";
 "participants.section.members.footer" = "Es gibt keine Mitglieder.";
 
diff --git a/wire-ios/Wire-iOS/Resources/Localization/ru.lproj/Localizable.strings b/wire-ios/Wire-iOS/Resources/Localization/ru.lproj/Localizable.strings
@@ -102,7 +102,7 @@
 "peoplepicker.federation.domain_unvailable" = "Федеративный домен в настоящее время недоступен. [Подробнее](%@)";
 
 "add_participants.alert.title" = "Беседа переполнена";
-"add_participants.alert.message.new_conversation" = "К беседе могут присоединиться до %d человек.";
+"add_participants.alert.message.new_conversation" = "К беседе могут присоединиться до %@ человек.";
 "add_participants.alert.message.existing_conversation" = "К беседе может присоединиться до %1$d человек. На текущий момент в комнате есть места еще для %2$d.";
 
 // Channel Creation UI - Navigation
@@ -860,7 +860,7 @@
 "participants.section.services" = "Сервисы (%d)";
 "participants.section.settings" = "Настройки";
 "participants.footer.add_title" = "Добавить участников";
-"participants.section.name.footer" = "К беседе могут присоединиться до %1$d участников.";
+"participants.section.name.footer" = "К беседе могут присоединиться до %@ участников.";
 "participants.section.admins.footer" = "Здесь нет администраторов.";
 "participants.section.members.footer" = "Здесь нет участников.";
 
diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/AddContacts/AddParticipantsViewController.swift b/wire-ios/Wire-iOS/Sources/UserInterface/AddContacts/AddParticipantsViewController.swift
@@ -77,10 +77,14 @@ extension AddParticipantsViewController.Context {
         case let .add(conversation):
             let freeSpace = conversation.freeParticipantSlots
             let max = ZMConversation.getMaxParticipants(isChannel: conversation.isChannel)
-            message = AddParticipantsAlert.Message.existingConversation(max, freeSpace)
+            message = AddParticipantsAlert.Message
+                .existingConversation(
+                    max.formatted(.number),
+                    freeSpace.formatted(.number)
+                )
         case let .create(context):
             message = AddParticipantsAlert.Message
-                .newConversation(ZMConversation.getMaxParticipants(isChannel: context.isChannel))
+                .newConversation(ZMConversation.getMaxParticipants(isChannel: context.isChannel).formatted(.number))
         }
 
         let controller = UIAlertController(
diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/Create/Sections/ConversationCreateNameSectionController.swift b/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/Create/Sections/ConversationCreateNameSectionController.swift
@@ -38,7 +38,7 @@ final class ConversationCreateNameSectionController: NSObject, CollectionViewSec
     private let isChannel: Bool
 
     private lazy var footerText: String = L10n.Localizable.Participants.Section.Name
-        .footer(ZMConversation.getMaxParticipants(isChannel: isChannel))
+        .footer(ZMConversation.getMaxParticipants(isChannel: isChannel).formatted(.number))
 
     init(
         selfUser: UserType,
diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/GroupDetails/Sections/RenameGroupSectionController.swift b/wire-ios/Wire-iOS/Sources/UserInterface/GroupDetails/Sections/RenameGroupSectionController.swift
@@ -35,7 +35,7 @@ final class RenameGroupSectionController: NSObject, CollectionViewSectionControl
 
     var titleFooter: String {
         L10n.Localizable.Participants.Section.Name
-            .footer(ZMConversation.getMaxParticipants(isChannel: conversation.isChannel))
+            .footer(ZMConversation.getMaxParticipants(isChannel: conversation.isChannel).formatted(.number))
     }
 
     init(conversation: GroupDetailsConversationType, userSession: UserSession) {

Original file line number	Diff line number	Diff line change
`@@ -1172,13 +1172,13 @@ internal enum L10n {`
`1172`	`1172`	`/// The conversation is full`
`1173`	`1173`	`internal static let title = L10n.tr("Localizable", "add_participants.alert.title", fallback: "The conversation is full")`
`1174`	`1174`	`internal enum Message {`
`1175`		`- /// Up to %1$d people can join a conversation. Currently there is only room for %2$d more.`
`1176`		`- internal static func existingConversation(_ p1: Int, _ p2: Int) -> String {`
`1177`		`- return L10n.tr("Localizable", "add_participants.alert.message.existing_conversation", p1, p2, fallback: "Up to %1$d people can join a conversation. Currently there is only room for %2$d more.")`
	`1175`	`+ /// Up to %@ people can join a conversation. Currently there is only room for %@ more.`
	`1176`	`+ internal static func existingConversation(_ p1: Any, _ p2: Any) -> String {`
	`1177`	`+ return L10n.tr("Localizable", "add_participants.alert.message.existing_conversation", String(describing: p1), String(describing: p2), fallback: "Up to %@ people can join a conversation. Currently there is only room for %@ more.")`
`1178`	`1178`	`}`
`1179`		`- /// Up to %d people can join a conversation.`
`1180`		`- internal static func newConversation(_ p1: Int) -> String {`
`1181`		`- return L10n.tr("Localizable", "add_participants.alert.message.new_conversation", p1, fallback: "Up to %d people can join a conversation.")`
	`1179`	`+ /// Up to %@ people can join a conversation.`
	`1180`	`+ internal static func newConversation(_ p1: Any) -> String {`
	`1181`	`+ return L10n.tr("Localizable", "add_participants.alert.message.new_conversation", String(describing: p1), fallback: "Up to %@ people can join a conversation.")`
`1182`	`1182`	`}`
`1183`	`1183`	`}`
`1184`	`1184`	`}`
`@@ -4469,9 +4469,9 @@ internal enum L10n {`
`4469`	`4469`	`internal static let footer = L10n.tr("Localizable", "participants.section.members.footer", fallback: "There are no members.")`
`4470`	`4470`	`}`
`4471`	`4471`	`internal enum Name {`
`4472`		`- /// Up to %1$d participants can join a conversation.`
`4473`		`- internal static func footer(_ p1: Int) -> String {`
`4474`		`- return L10n.tr("Localizable", "participants.section.name.footer", p1, fallback: "Up to %1$d participants can join a conversation.")`
	`4472`	`+ /// Up to %@ participants can join a conversation.`
	`4473`	`+ internal static func footer(_ p1: Any) -> String {`
	`4474`	`+ return L10n.tr("Localizable", "participants.section.name.footer", String(describing: p1), fallback: "Up to %@ participants can join a conversation.")`
`4475`	`4475`	`}`
`4476`	`4476`	`}`
`4477`	`4477`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ final class RenameGroupSectionController: NSObject, CollectionViewSectionControl`
`35`	`35`
`36`	`36`	`var titleFooter: String {`
`37`	`37`	`L10n.Localizable.Participants.Section.Name`
`38`		`- .footer(ZMConversation.getMaxParticipants(isChannel: conversation.isChannel))`
	`38`	`+ .footer(ZMConversation.getMaxParticipants(isChannel: conversation.isChannel).formatted(.number))`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`init(conversation: GroupDetailsConversationType, userSession: UserSession) {`