fix: Use plural form for titleMyAccount

Infomaniak · Sep 11, 2024 · 0ae6d4f · 0ae6d4f
1 parent 6a78d3c
commit 0ae6d4f
Show file tree

Hide file tree

Showing 12 changed files with 92 additions and 14 deletions.
diff --git a/Mail/Components/Custom Buttons/AccountButton.swift b/Mail/Components/Custom Buttons/AccountButton.swift
@@ -35,7 +35,7 @@ struct AccountButton: View {
             if let currentAccountUser = mailboxManager.account.user {
                 AvatarView(mailboxManager: mailboxManager,
                            contactConfiguration: .user(user: currentAccountUser))
-                    .accessibilityLabel(MailResourcesStrings.Localizable.titleMyAccount)
+                    .accessibilityLabel(MailResourcesStrings.Localizable.titleMyAccount(1))
             }
         }
         .floatingPanel(isPresented: $isShowingNewAccountListView) {

diff --git a/Mail/Views/Switch User/AccountListView.swift b/Mail/Views/Switch User/AccountListView.swift
@@ -77,8 +77,7 @@ struct AccountListView: View {
 
     var body: some View {
         ScrollView {
-            Text(viewModel.accounts.count > 1 ? MailResourcesStrings.Localizable.titleMyAccounts : MailResourcesStrings
-                .Localizable.titleMyAccount)
+            Text(MailResourcesStrings.Localizable.titleMyAccount(viewModel.accounts.count))
                 .textStyle(.bodyMedium)
 
             VStack(spacing: IKPadding.small) {
@@ -92,7 +91,6 @@ struct AccountListView: View {
 
             AccountActionsView()
         }
-        .navigationBarTitle(MailResourcesStrings.Localizable.titleMyAccounts, displayMode: .inline)
         .fullScreenCover(isPresented: $isShowingNewAccountView, onDismiss: {
             orientationManager.setOrientationLock(.all)
         }, content: {

diff --git a/MailResources/Localizable/de.lproj/Localizable.strings b/MailResources/Localizable/de.lproj/Localizable.strings
@@ -4,7 +4,7 @@
  * Locale: de, German
  * Tagged: ios
  * Exported by: elena willen
- * Exported at: Wed, 31 Jul 2024 15:28:16 +0200
+ * Exported at: Wed, 04 Sep 2024 11:22:24 +0200
  */
 
 /* loco:62bb154d7513e127cb2e9c94 */
@@ -1664,7 +1664,7 @@
 "titleMyAccount" = "Mein Konto";
 
 /* loco:62860a56f6ea2c34fb742092 */
-"titleMyAccounts" = "Meine Konten";
+"titleMyAccount-plural" = "Meine Konten";
 
 /* loco:62665fa13789aa7e8353ad62 */
 "toTitle" = "An:";

diff --git a/MailResources/Localizable/de.lproj/Localizable.stringsdict b/MailResources/Localizable/de.lproj/Localizable.stringsdict
@@ -2,6 +2,22 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>titleMyAccount</key>
+	<dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@items@</string>
+		<key>items</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>Mein Konto</string>
+			<key>other</key>
+			<string>Meine Konten</string>
+		</dict>
+	</dict>
 	<key>attachmentQuantity</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>

diff --git a/MailResources/Localizable/en.lproj/Localizable.strings b/MailResources/Localizable/en.lproj/Localizable.strings
@@ -4,7 +4,7 @@
  * Locale: en, English
  * Tagged: ios
  * Exported by: elena willen
- * Exported at: Wed, 31 Jul 2024 15:28:16 +0200
+ * Exported at: Wed, 04 Sep 2024 11:22:24 +0200
  */
 
 /* loco:62bb154d7513e127cb2e9c94 */
@@ -1664,7 +1664,7 @@
 "titleMyAccount" = "My account";
 
 /* loco:62860a56f6ea2c34fb742092 */
-"titleMyAccounts" = "My accounts";
+"titleMyAccount-plural" = "My accounts";
 
 /* loco:62665fa13789aa7e8353ad62 */
 "toTitle" = "To:";

diff --git a/MailResources/Localizable/en.lproj/Localizable.stringsdict b/MailResources/Localizable/en.lproj/Localizable.stringsdict
@@ -130,5 +130,21 @@
 			<string>%d files sent by SwissTransfer</string>
 		</dict>
 	</dict>
+	<key>titleMyAccount</key>
+	<dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@items@</string>
+		<key>items</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>My account</string>
+			<key>other</key>
+			<string>My accounts</string>
+		</dict>
+	</dict>
 </dict>
 </plist>
diff --git a/MailResources/Localizable/es.lproj/Localizable.strings b/MailResources/Localizable/es.lproj/Localizable.strings
@@ -4,7 +4,7 @@
  * Locale: es, Spanish
  * Tagged: ios
  * Exported by: elena willen
- * Exported at: Wed, 31 Jul 2024 15:28:16 +0200
+ * Exported at: Wed, 04 Sep 2024 11:22:24 +0200
  */
 
 /* loco:62bb154d7513e127cb2e9c94 */
@@ -1664,7 +1664,7 @@
 "titleMyAccount" = "Mi cuenta";
 
 /* loco:62860a56f6ea2c34fb742092 */
-"titleMyAccounts" = "Mis cuentas";
+"titleMyAccount-plural" = "Mis cuentas";
 
 /* loco:62665fa13789aa7e8353ad62 */
 "toTitle" = "Para:";

diff --git a/MailResources/Localizable/es.lproj/Localizable.stringsdict b/MailResources/Localizable/es.lproj/Localizable.stringsdict
@@ -130,5 +130,21 @@
 			<string>%d archivos enviados por SwissTransfer</string>
 		</dict>
 	</dict>
+	<key>titleMyAccount</key>
+	<dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@items@</string>
+		<key>items</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>Mi cuenta</string>
+			<key>other</key>
+			<string>Mis cuentas</string>
+		</dict>
+	</dict>
 </dict>
 </plist>
diff --git a/MailResources/Localizable/fr.lproj/Localizable.strings b/MailResources/Localizable/fr.lproj/Localizable.strings
@@ -4,7 +4,7 @@
  * Locale: fr, French
  * Tagged: ios
  * Exported by: elena willen
- * Exported at: Wed, 31 Jul 2024 15:28:16 +0200
+ * Exported at: Wed, 04 Sep 2024 11:22:24 +0200
  */
 
 /* loco:62bb154d7513e127cb2e9c94 */
@@ -1664,7 +1664,7 @@
 "titleMyAccount" = "Mon compte";
 
 /* loco:62860a56f6ea2c34fb742092 */
-"titleMyAccounts" = "Mes comptes";
+"titleMyAccount-plural" = "Mes comptes";
 
 /* loco:62665fa13789aa7e8353ad62 */
 "toTitle" = "À :";

diff --git a/MailResources/Localizable/fr.lproj/Localizable.stringsdict b/MailResources/Localizable/fr.lproj/Localizable.stringsdict
@@ -2,6 +2,22 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>titleMyAccount</key>
+	<dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@items@</string>
+		<key>items</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>Mon compte</string>
+			<key>other</key>
+			<string>Mes comptes</string>
+		</dict>
+	</dict>
 	<key>attachmentQuantity</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>

diff --git a/MailResources/Localizable/it.lproj/Localizable.strings b/MailResources/Localizable/it.lproj/Localizable.strings
@@ -4,7 +4,7 @@
  * Locale: it, Italian
  * Tagged: ios
  * Exported by: elena willen
- * Exported at: Tue, 03 Sep 2024 11:04:35 +0200
+ * Exported at: Wed, 04 Sep 2024 11:22:24 +0200
  */
 
 /* loco:62bb154d7513e127cb2e9c94 */
@@ -1664,7 +1664,7 @@
 "titleMyAccount" = "Il mio account";
 
 /* loco:62860a56f6ea2c34fb742092 */
-"titleMyAccounts" = "I miei conti";
+"titleMyAccount-plural" = "I miei conti";
 
 /* loco:62665fa13789aa7e8353ad62 */
 "toTitle" = "A:";

diff --git a/MailResources/Localizable/it.lproj/Localizable.stringsdict b/MailResources/Localizable/it.lproj/Localizable.stringsdict
@@ -130,5 +130,21 @@
 			<string>%d file inviati da SwissTransfer</string>
 		</dict>
 	</dict>
+	<key>titleMyAccount</key>
+	<dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@items@</string>
+		<key>items</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>Il mio account</string>
+			<key>other</key>
+			<string>I miei conti</string>
+		</dict>
+	</dict>
 </dict>
 </plist>