From cb619b2de6fc44c27d945dab5b1a6b53284b252f Mon Sep 17 00:00:00 2001
From: Howard Griffith <howardgriffith@yahoo.com>
Date: Thu, 12 Dec 2024 14:37:40 -0600
Subject: [PATCH 1/2] Potential Fix for issue #666

Resolves a problem with the Active CVE calculation if the current version of macOS on the machine was one in which there were previously addressed active CVEs.
---
 Nudge/UI/Main.swift | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Nudge/UI/Main.swift b/Nudge/UI/Main.swift
index 0ba5a4bd..32b41d4d 100644
--- a/Nudge/UI/Main.swift
+++ b/Nudge/UI/Main.swift
@@ -229,17 +229,17 @@ class AppDelegate: NSObject, NSApplicationDelegate {
                     allVersions.sort { VersionManager.versionLessThan(currentVersion: $0, newVersion: $1) }
 
                     // Filter versions between current and selected OS version
-                    let filteredVersions = VersionManager().removeDuplicates(from: allVersions.filter {
+                    var filteredVersions = VersionManager().removeDuplicates(from: allVersions.filter {
                         VersionManager.versionGreaterThanOrEqual(currentVersion: $0, newVersion: currentInstalledVersion) &&
                         VersionManager.versionLessThanOrEqual(currentVersion: $0, newVersion: selectedOSVersion)
                     })
+                    // Remove the current installed version from filteredVersions
+                    filteredVersions.removeAll(where: {$0 == currentInstalledVersion} )
 
                     // Filter versions with the same major version as the current installed version
                     var minorVersions = VersionManager().removeDuplicates(from: filteredVersions.filter { version in
                         VersionManager.getMajorVersion(from: version) == currentMajorVersion
                     })
-                    // Remove the current installed version from minorVersions
-                    minorVersions.removeAll { $0 == currentInstalledVersion }
 
                     // Count actively exploited CVEs in the filtered versions
                     LogManager.notice("Assessing macOS version range for active exploits: \(filteredVersions) ", logger: sofaLog)

From 267b7fc402f3edea0a319102efb005148f8dcf1f Mon Sep 17 00:00:00 2001
From: Howard Griffith <howardgriffith@yahoo.com>
Date: Fri, 20 Dec 2024 10:08:19 -0600
Subject: [PATCH 2/2] Fix for issue #664

Updates the Swedish translation for Required Date to a more appropriate translation.
---
 Localizable.xcstrings | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Localizable.xcstrings b/Localizable.xcstrings
index 4f7ca7e7..a233cfc9 100644
--- a/Localizable.xcstrings
+++ b/Localizable.xcstrings
@@ -3324,7 +3324,7 @@
         "sv" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Nödvändiga Datumet:"
+            "value" : "Sista datum:"
           }
         },
         "uk" : {