pm-19305 Applied plurals

Author: LRNcardozoWDF

BitwardenKit/UI/Platform/Application/Views/SettingsPickerField.swift

@@ -80,7 +80,7 @@ public struct SettingsPickerField: View {
                             .foregroundColor(Color(asset: SharedAsset.Colors.textSecondary))
                     }
                 }
-                .padding(.vertical, 12)
+                .padding(EdgeInsets(top: 12, leading: 16, bottom: 12, trailing: 16))
             }
         }
         .background(SharedAsset.Colors.backgroundSecondary.swiftUIColor)

BitwardenResources/Localizations/en.lproj/Localizable.strings

@@ -1277,4 +1277,5 @@
 "EncryptionSettingsUpdated" = "Encryption settings updated";
 "ThisSettingIsManagedByYourOrganization" = "This setting is managed by your organization.";
 "YourOrganizationHasSetTheDefaultSessionTimeoutToX" = "Your organization has set the default session timeout to %1$@.";
+"YourOrganizationHasSetTheDefaultSessionTimeoutToXAndY" = "Your organization has set the default session timeout to %1$@ and %2$@.";
 "XMinutes" = "%1$@ minute(s)";

BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/AccountSecurityState.swift

@@ -223,15 +223,15 @@ struct AccountSecurityState: Equatable {
         guard isPolicyTimeoutEnabled, let policy = policyTimeoutType else { return nil }
         switch policyTimeoutType {
         case .custom:
-            return Localizations.yourOrganizationHasSetTheDefaultSessionTimeoutToX(customTimeoutMessage)
+            return customTimeoutMessage
         case .immediately:
             return Localizations.thisSettingIsManagedByYourOrganization
         case .never:
             return Localizations.yourOrganizationHasSetTheDefaultSessionTimeoutToX(policy.timeoutType)
         case .onAppRestart:
             return Localizations.yourOrganizationHasSetTheDefaultSessionTimeoutToX(policy.timeoutType)
         default:
-            return Localizations.yourOrganizationHasSetTheDefaultSessionTimeoutToX(customTimeoutMessage)
+            return customTimeoutMessage
         }
     }
 
@@ -256,17 +256,25 @@ struct AccountSecurityState: Equatable {
     var customTimeoutMessage: String {
         switch (policyTimeoutHours, policyTimeoutMinutes) {
         case let (hours, minutes) where hours > 0 && minutes > 0:
-            Localizations.xHoursAndYMinutes(
-                policyTimeoutHours,
-                policyTimeoutMinutes,
+            Localizations.yourOrganizationHasSetTheDefaultSessionTimeoutToXAndY(
+                Localizations.xHours(
+                    policyTimeoutHours,
+                ),
+                Localizations.xMinutes(
+                    policyTimeoutMinutes,
+                ),
             )
         case let (hours, _) where hours > 0:
-            Localizations.xHours(
-                policyTimeoutHours,
+            Localizations.yourOrganizationHasSetTheDefaultSessionTimeoutToX(
+                Localizations.xHours(
+                    policyTimeoutHours,
+                ),
             )
         default:
-            Localizations.xMinutes(
-                policyTimeoutMinutes,
+            Localizations.yourOrganizationHasSetTheDefaultSessionTimeoutToX(
+                Localizations.xMinutes(
+                    policyTimeoutMinutes,
+                ),
             )
         }
     }