Merge branch 'main' into deployment-target-macOS-13

F1248 · Aug 29, 2024 · eb7cd3e · eb7cd3e
2 parents db97a4d + 2fac5b5
commit eb7cd3e
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 24 deletions.
diff --git a/.github/workflows/Trigger-Deploy-to-Pages.yml b/.github/workflows/Trigger-Deploy-to-Pages.yml
@@ -17,6 +17,7 @@ jobs:
   Trigger-Deploy-to-Pages:
     name: Trigger Deploy to Pages
     runs-on: macos-latest
+
     steps:
 
       - name: Trigger Deploy to Pages

diff --git a/Genius/Extensions/Swift/String.swift b/Genius/Extensions/Swift/String.swift
@@ -10,25 +10,27 @@ import SwiftUI
 extension String {
 
     var localized: String {
-        NSLocalizedString(self, comment: "")
+        if #available(macOS 12, *) {
+            String(localized: LocalizationValue(self))
+        } else {
+            NSLocalizedString(self, comment: "")
+        }
     }
 
     init?(_ string: (any StringProtocol)?) {
         guard let string else { return nil }
         self.init(string)
     }
 
-    init(_ localizedStringKey: LocalizedStringKey) {
-        self = (
-            Mirror(reflecting: localizedStringKey).children.first { $0.label == "key" }?.value as? String ?? "Unknown"
-        ).localized
-    }
-
     init?(_ data: Data?) {
         guard let data else { return nil }
         self.init(decoding: data, as: UTF8.self)
     }
 
+    init?(_ versionNumber: VersionNumber?) {
+        self.init(versionNumber?.versions.map(String.init).joined(separator: "."))
+    }
+
     func contains(any strings: [any StringProtocol]) -> Bool {
         strings.contains { contains($0) }
     }

diff --git a/Genius/Extensions/SwiftUI/LocalizedStringKey.swift b/Genius/Extensions/SwiftUI/LocalizedStringKey.swift
diff --git a/Genius/Types/SystemInformation/Hardware.swift b/Genius/Types/SystemInformation/Hardware.swift
@@ -43,7 +43,7 @@ extension SystemInformation {
                 case _ where name.hasPrefix("Apple Virtual Machine"): "macwindow"
                 default: if #available(macOS 15, *) { "desktopcomputer.and.macbook" } else { "desktopcomputer" }
                 }
-            nonisolated(unsafe) static let marketingName: LocalizedStringKey? = {
+            static let marketingName: String? = {
                 guard let serialNumber = Machine.serialNumber, [11, 12].contains(serialNumber.count) else { return nil }
                 // swiftlint:disable:next explicit_type_interface
                 let url = """
@@ -54,7 +54,7 @@ extension SystemInformation {
                 guard
                     let marketingName = Network.transferURL(url)?.between(start: "<configCode>", end: "</configCode>")
                 else { return nil }
-                return LocalizedStringKey(marketingName)
+                return marketingName
             }()
         }