From 77ab77e2c7296a553ce75fb3da4f5bc07acec3f4 Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Fri, 30 Dec 2022 17:44:39 -0800 Subject: [PATCH] Localize unset --- Meshtastic/Enums/PositionConfigEnums.swift | 6 ++++++ Meshtastic/Enums/SerialConfigEnums.swift | 2 +- Meshtastic/Views/Settings/Config/DeviceConfig.swift | 4 ++-- .../Config/Module/CannedMessagesConfig.swift | 12 +++--------- .../Config/Module/ExternalNotificationConfig.swift | 6 +++--- .../Views/Settings/Config/Module/SerialConfig.swift | 12 ++---------- 6 files changed, 17 insertions(+), 25 deletions(-) diff --git a/Meshtastic/Enums/PositionConfigEnums.swift b/Meshtastic/Enums/PositionConfigEnums.swift index e353e88f..f4d7f4fa 100644 --- a/Meshtastic/Enums/PositionConfigEnums.swift +++ b/Meshtastic/Enums/PositionConfigEnums.swift @@ -132,6 +132,8 @@ enum GpsAttemptTimes: Int, CaseIterable, Identifiable { case oneMinute = 60 case twoMinutes = 120 case fiveMinutes = 300 + case tenMinutes = 600 + case fifteenMinutes = 900 var id: Int { self.rawValue } var description: String { @@ -158,6 +160,10 @@ enum GpsAttemptTimes: Int, CaseIterable, Identifiable { return NSLocalizedString("interval.two.minutes", comment: "Two Minutes") case .fiveMinutes: return NSLocalizedString("interval.five.minutes", comment: "Five Minutes") + case .tenMinutes: + return NSLocalizedString("interval.ten.minutes", comment: "Ten Minutes") + case .fifteenMinutes: + return NSLocalizedString("interval.fifteen.minutes", comment: "Fifteen Minutes") } } } diff --git a/Meshtastic/Enums/SerialConfigEnums.swift b/Meshtastic/Enums/SerialConfigEnums.swift index f6c4dded..38a54de9 100644 --- a/Meshtastic/Enums/SerialConfigEnums.swift +++ b/Meshtastic/Enums/SerialConfigEnums.swift @@ -165,7 +165,7 @@ enum SerialTimeoutIntervals: Int, CaseIterable, Identifiable { get { switch self { case .unset: - return "Unset" + return NSLocalizedString("unset", comment: "Unset") case .oneSecond: return NSLocalizedString("interval.one.second", comment: "One Second") case .fiveSeconds: diff --git a/Meshtastic/Views/Settings/Config/DeviceConfig.swift b/Meshtastic/Views/Settings/Config/DeviceConfig.swift index 7a06d1c2..34ae0231 100644 --- a/Meshtastic/Views/Settings/Config/DeviceConfig.swift +++ b/Meshtastic/Views/Settings/Config/DeviceConfig.swift @@ -63,7 +63,7 @@ struct DeviceConfig: View { Picker("Button GPIO", selection: $buttonGPIO) { ForEach(0..<40) { if $0 == 0 { - Text("Unset") + Text("unset") } else { Text("Pin \($0)") } @@ -73,7 +73,7 @@ struct DeviceConfig: View { Picker("Buzzer GPIO", selection: $buzzerGPIO) { ForEach(0..<40) { if $0 == 0 { - Text("Unset") + Text("unset") } else { Text("Pin \($0)") } diff --git a/Meshtastic/Views/Settings/Config/Module/CannedMessagesConfig.swift b/Meshtastic/Views/Settings/Config/Module/CannedMessagesConfig.swift index db08f329..5996f3ff 100644 --- a/Meshtastic/Views/Settings/Config/Module/CannedMessagesConfig.swift +++ b/Meshtastic/Views/Settings/Config/Module/CannedMessagesConfig.swift @@ -124,9 +124,7 @@ struct CannedMessagesConfig: View { ForEach(0..<40) { if $0 == 0 { - - Text("Unset") - + Text("unset") } else { Text("Pin \($0)") @@ -141,9 +139,7 @@ struct CannedMessagesConfig: View { ForEach(0..<40) { if $0 == 0 { - - Text("Unset") - + Text("unset") } else { Text("Pin \($0)") @@ -158,9 +154,7 @@ struct CannedMessagesConfig: View { ForEach(0..<40) { if $0 == 0 { - - Text("Unset") - + Text("unset") } else { Text("Pin \($0)") diff --git a/Meshtastic/Views/Settings/Config/Module/ExternalNotificationConfig.swift b/Meshtastic/Views/Settings/Config/Module/ExternalNotificationConfig.swift index bcca6a96..15233435 100644 --- a/Meshtastic/Views/Settings/Config/Module/ExternalNotificationConfig.swift +++ b/Meshtastic/Views/Settings/Config/Module/ExternalNotificationConfig.swift @@ -65,7 +65,7 @@ struct ExternalNotificationConfig: View { Picker("Output pin GPIO", selection: $output) { ForEach(0..<40) { if $0 == 0 { - Text("Unset") + Text("unset") } else { Text("Pin \($0)") } @@ -110,7 +110,7 @@ struct ExternalNotificationConfig: View { Picker("Output pin buzzer GPIO ", selection: $outputBuzzer) { ForEach(0..<40) { if $0 == 0 { - Text("Unset") + Text("unset") } else { Text("Pin \($0)") } @@ -120,7 +120,7 @@ struct ExternalNotificationConfig: View { Picker("Output pin vibra GPIO", selection: $outputVibra) { ForEach(0..<40) { if $0 == 0 { - Text("Unset") + Text("unset") } else { Text("Pin \($0)") } diff --git a/Meshtastic/Views/Settings/Config/Module/SerialConfig.swift b/Meshtastic/Views/Settings/Config/Module/SerialConfig.swift index d86fca71..a3d50d07 100644 --- a/Meshtastic/Views/Settings/Config/Module/SerialConfig.swift +++ b/Meshtastic/Views/Settings/Config/Module/SerialConfig.swift @@ -74,13 +74,9 @@ struct SerialConfig: View { Picker("Receive data (rxd) GPIO pin", selection: $rxd) { ForEach(0..<40) { - if $0 == 0 { - - Text("Unset") - + Text("unset") } else { - Text("Pin \($0)") } } @@ -89,13 +85,9 @@ struct SerialConfig: View { Picker("Transmit data (txd) GPIO pin", selection: $txd) { ForEach(0..<40) { - if $0 == 0 { - - Text("Unset") - + Text("unset") } else { - Text("Pin \($0)") } }