short category displayed as wide, no more one letter

PadelClub/Data/Tournament.swift

@@ -1486,7 +1486,7 @@ defer {
         return unsortedTeams().first(where: { $0.includes(players: players) })
     }
     
-    func tournamentTitle(_ displayStyle: DisplayStyle = .wide) -> String {
+    func tournamentTitle(_ displayStyle: DisplayStyle = .wide, hideSenior: Bool = false) -> String {
         if tournamentLevel == .unlisted, displayStyle == .title {
             if let name {
                 return name
@@ -1494,7 +1494,13 @@ defer {
                 return tournamentLevel.localizedLevelLabel(.title)
             }
         }
-        let title: String = [tournamentLevel.localizedLevelLabel(displayStyle), tournamentCategory.localizedLabel(displayStyle), federalTournamentAge.localizedFederalAgeLabel(displayStyle)].filter({ $0.isEmpty == false }).joined(separator: " ")
+        let displayStyleCategory = hideSenior ? .short : displayStyle
+        var levelCategory = [tournamentLevel.localizedLevelLabel(displayStyle), tournamentCategory.localizedLabel(displayStyle)]
+        if displayStyle == .short {
+            levelCategory = [tournamentLevel.localizedLevelLabel(displayStyle) + tournamentCategory.localizedLabel(displayStyle)]
+        }
+        let array = levelCategory + [federalTournamentAge.localizedFederalAgeLabel(displayStyleCategory)]
+        let title: String = array.filter({ $0.isEmpty == false }).joined(separator: " ")
         if displayStyle == .wide, let name {
             return [title, name].joined(separator: " - ")
         } else {

PadelClub/Utils/ContactManager.swift

@@ -82,7 +82,7 @@ Il est conseillé de vous présenter 10 minutes avant de jouer.\n\nMerci de me c
         let date = startDate ?? tournament?.startDate ?? Date()
 
         if let tournament {
-            text = text.replacingOccurrences(of: "#titre", with: tournament.tournamentTitle(.short))
+            text = text.replacingOccurrences(of: "#titre", with: tournament.tournamentTitle(.title, hideSenior: true))
             text = text.replacingOccurrences(of: "#prix", with: tournament.entryFeeMessage)
         }
         
@@ -132,7 +132,7 @@ Il est conseillé de vous présenter 10 minutes avant de jouer.\n\nMerci de me c
         let intro = reSummon ? "Suite à des forfaits, vous êtes finalement" : "Vous êtes"
 
         if let tournament {
-            return "Bonjour,\n\n\(intro) \(localizedCalled) pour jouer en  \(roundLabel.lowercased()) du \(tournament.tournamentTitle(.short)) au \(clubName) le \(date.formatted(Date.FormatStyle().weekday(.wide).day().month(.wide))) à \(date.formatted(Date.FormatStyle().hour().minute())).\n\n" + computedMessage + "\n\n\(signature)"
+            return "Bonjour,\n\n\(intro) \(localizedCalled) pour jouer en  \(roundLabel.lowercased()) du \(tournament.tournamentTitle(.title, hideSenior: true)) au \(clubName) le \(date.formatted(Date.FormatStyle().weekday(.wide).day().month(.wide))) à \(date.formatted(Date.FormatStyle().hour().minute())).\n\n" + computedMessage + "\n\n\(signature)"
         } else {
             return "Bonjour,\n\n\(intro) \(localizedCalled) \(roundLabel) au \(clubName) le \(date.formatted(Date.FormatStyle().weekday(.wide).day().month(.wide))) à \(date.formatted(Date.FormatStyle().hour().minute())).\n\nMerci de confirmer en répondant à ce message et de prévenir votre partenaire !\n\n\(signature)"
         }

PadelClub/Views/Calling/CallMessageCustomizationView.swift

@@ -56,7 +56,7 @@ struct CallMessageCustomizationView: View {
     
     var finalMessage: String? {
         let localizedCalled = "convoqué" + (tournament.tournamentCategory == .women ? "e" : "") + "s"
-        return "Bonjour,\n\nVous êtes \(localizedCalled) pour jouer en \(RoundRule.roundName(fromRoundIndex: 2).lowercased()) du \(tournament.tournamentTitle(.short)) au \(clubName) le \(tournament.startDate.formatted(Date.FormatStyle().weekday(.wide).day().month(.wide))) à \(tournament.startDate.formatted(Date.FormatStyle().hour().minute())).\n\n" + computedMessage + "\n\n\(customCallMessageSignature)"
+        return "Bonjour,\n\nVous êtes \(localizedCalled) pour jouer en \(RoundRule.roundName(fromRoundIndex: 2).lowercased()) du \(tournament.tournamentTitle(.title, hideSenior: true)) au \(clubName) le \(tournament.startDate.formatted(Date.FormatStyle().weekday(.wide).day().month(.wide))) à \(tournament.startDate.formatted(Date.FormatStyle().hour().minute())).\n\n" + computedMessage + "\n\n\(customCallMessageSignature)"
     }
 
     var body: some View {

PadelClub/Views/Calling/CallView.swift

@@ -387,7 +387,7 @@ struct CallView: View {
                             recipients: tournament.umpireMail(),
                             bccRecipients: teams.flatMap { $0.getMail() },
                                  body: finalMessage(reSummon: reSummon, forcedEmptyMessage: forcedEmptyMessage),
-                            subject: tournament.tournamentTitle(),
+                                 subject: tournament.tournamentTitle(hideSenior: true),
                             tournamentBuild: nil)
     }
 

PadelClub/Views/Calling/SendToAllView.swift

@@ -273,7 +273,7 @@ struct SendToAllView: View {
                 if contactMethod == 0 {
                     contactType = .message(date: nil, recipients: _teams().flatMap { $0.unsortedPlayers() }.compactMap { $0.phoneNumber }, body: finalMessage(), tournamentBuild: nil)
                 } else {
-                    contactType = .mail(date: nil, recipients: tournament.umpireMail(), bccRecipients: _teams().flatMap { $0.unsortedPlayers() }.compactMap { $0.email }, body: finalMessage(), subject: tournament.tournamentTitle(), tournamentBuild: nil)
+                    contactType = .mail(date: nil, recipients: tournament.umpireMail(), bccRecipients: _teams().flatMap { $0.unsortedPlayers() }.compactMap { $0.email }, body: finalMessage(), subject: tournament.tournamentTitle(hideSenior: true), tournamentBuild: nil)
                 }
             }
         }