attempt to show locale when using default values for showRequiredDate

Erik Gomez · Erik Gomez · commit 84fb1653d686 · 2024-07-24T09:59:58.000-05:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,8 @@ Requires macOS 12.0 and higher.
   - Ex: Device is on 14.3 and needing to go to 14.5.
     - While 14.4.1 -> 14.5 are not under active exploit, 14.4 contains fixes for 14.3 that were under active exploit.
   - Addresses [610](https://github.com/macadmins/nudge/issues/610) and [613](https://github.com/macadmins/nudge/issues/613)
+- When `showRequiredDate` is set to `True` and the admin is using the default values for `requiredInstallationDisplayFormat`, Nudge will attempt to understand the current locale and display the menu item appropriately.
+  - Addresses [615](https://github.com/macadmins/nudge/issues/615)
 
 ## [2.0.4] - 2024-07-23
 Requires macOS 12.0 and higher.
diff --git a/Nudge/Utilities/Utils.swift b/Nudge/Utilities/Utils.swift
@@ -553,10 +553,20 @@ struct DateManager {
         return formatter
     }()
 
-    func coerceDateToString(date: Date, formatterString: String) -> String {
-        let formatter = DateFormatter()
-        formatter.dateFormat = formatterString
-        return formatter.string(from: date)
+    func coerceDateToString(date: Date, formatterString: String, locale: Locale? = nil) -> String {
+        if formatterString == "MM/dd/yyyy" {
+            // Use the specified locale or the current locale if none is provided
+            let dateFormatter = DateFormatter()
+            dateFormatter.dateStyle = .short
+            dateFormatter.timeStyle = .none
+            dateFormatter.locale = locale ?? Locale.current
+            return dateFormatter.string(from: date)
+        } else {
+            let formatter = DateFormatter()
+            formatter.dateFormat = formatterString
+            formatter.locale = locale ?? Locale.current
+            return formatter.string(from: date)
+        }
     }
 
     func coerceStringToDate(dateString: String) -> Date {
