diff --git a/Packages/BarometryKit/Sources/BarometryKit/Settings/Preferences.swift b/Packages/BarometryKit/Sources/BarometryKit/Settings/Preferences.swift index 8223cf9..fdf194e 100644 --- a/Packages/BarometryKit/Sources/BarometryKit/Settings/Preferences.swift +++ b/Packages/BarometryKit/Sources/BarometryKit/Settings/Preferences.swift @@ -69,7 +69,6 @@ public final class Preferences { /// The unavailable modules are ones this Mac can't show, such as battery on a desktop. public init( defaults: UserDefaults = .standard, - locale: Locale = .autoupdatingCurrent, unavailableMenuBarModules: Set = [] ) { self.defaults = defaults @@ -81,8 +80,7 @@ public final class Preferences { unavailable: unavailableMenuBarModules ) refreshInterval = RefreshInterval(rawValue: defaults.integer(forKey: Key.refreshInterval)) ?? .twoSeconds - temperatureUnit = defaults.string(forKey: Key.temperatureUnit).flatMap(TemperatureUnit.init(rawValue:)) - ?? (locale.measurementSystem == .us ? .fahrenheit : .celsius) + temperatureUnit = defaults.string(forKey: Key.temperatureUnit).flatMap(TemperatureUnit.init(rawValue:)) ?? .celsius networkInterface = defaults.string(forKey: Key.networkInterface).map(NetworkInterfaceChoice.named) ?? .automatic dashboardStyle = defaults.string(forKey: Key.dashboardStyle).flatMap(DashboardStyle.init(rawValue:)) ?? .cluster dashboardSectionOrder = Self.complete(Self.decode(defaults.stringArray(forKey: Key.dashboardSectionOrder)) ?? []) diff --git a/Packages/BarometryKit/Tests/BarometryKitTests/PreferencesTests.swift b/Packages/BarometryKit/Tests/BarometryKitTests/PreferencesTests.swift index 3e9028f..a8ad7d0 100644 --- a/Packages/BarometryKit/Tests/BarometryKitTests/PreferencesTests.swift +++ b/Packages/BarometryKit/Tests/BarometryKitTests/PreferencesTests.swift @@ -55,9 +55,8 @@ struct PreferencesTests { #expect(Preferences(defaults: defaults).networkInterface == .automatic) } - @Test(arguments: [("en_US", TemperatureUnit.fahrenheit), ("en_GB", .celsius)]) - func temperatureUnitDefaultsToTheLocale(identifier: String, expected: TemperatureUnit) { - #expect(Preferences(defaults: defaults, locale: Locale(identifier: identifier)).temperatureUnit == expected) + @Test func temperatureUnitDefaultsToCelsius() { + #expect(Preferences(defaults: defaults).temperatureUnit == .celsius) } @Test func dashboardStyleDefaultsToTheCluster() {