From e555d6bf507b507b82f84819f3649dbde82a5ad6 Mon Sep 17 00:00:00 2001 From: Roger Pettett Date: Wed, 31 Jan 2024 15:03:26 +0000 Subject: [PATCH 1/5] Update Localizable.strings --- en.lproj/Localizable.strings | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/en.lproj/Localizable.strings b/en.lproj/Localizable.strings index 3a5ab36e..9d8671a1 100644 --- a/en.lproj/Localizable.strings +++ b/en.lproj/Localizable.strings @@ -170,7 +170,7 @@ "mesh.log.devicemetadata %@"="Requesting Device Metadata for %@"; "mesh.log.device.metadata.received %@"="Device Metadata received from: %@"; "mesh.log.detectionsensor.config %@"="Detection Sensor module config received: %@"; -"mesh.log.externalnotification.config %@"="External Notifiation module config received: %@"; +"mesh.log.externalnotification.config %@"="External Notification module config received: %@"; "mesh.log.lora.config %@"="LoRa config received: %@"; "mesh.log.lora.config.sent %@"="Sent a LoRa.Config for: %@"; "mesh.log.mqtt.config %@"="MQTT module config received: %@"; From 2bb0a7342b5d1a260649908da3671274415922b3 Mon Sep 17 00:00:00 2001 From: Roger Pettett Date: Wed, 31 Jan 2024 15:04:33 +0000 Subject: [PATCH 2/5] Update UpdateCoreData.swift --- Meshtastic/Persistence/UpdateCoreData.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Meshtastic/Persistence/UpdateCoreData.swift b/Meshtastic/Persistence/UpdateCoreData.swift index 0794cbea..b7edbb4a 100644 --- a/Meshtastic/Persistence/UpdateCoreData.swift +++ b/Meshtastic/Persistence/UpdateCoreData.swift @@ -877,7 +877,7 @@ func upsertExternalNotificationModuleConfigPacket(config: Meshtastic.ModuleConfi print("💥 Error Updating Core Data ExternalNotificationConfigEntity: \(nsError)") } } else { - print("💥 No Nodes found in local database matching node number \(nodeNum) unable to save External Notifiation Module Config") + print("💥 No Nodes found in local database matching node number \(nodeNum) unable to save External Notification Module Config") } } catch { let nsError = error as NSError From b1bb8735d965bbe1f1ac100acc6a022d430525e4 Mon Sep 17 00:00:00 2001 From: Roger Pettett Date: Wed, 31 Jan 2024 15:05:41 +0000 Subject: [PATCH 3/5] Update Localizable.strings --- zh-Hans.lproj/Localizable.strings | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh-Hans.lproj/Localizable.strings b/zh-Hans.lproj/Localizable.strings index 1b9411d7..811cb242 100644 --- a/zh-Hans.lproj/Localizable.strings +++ b/zh-Hans.lproj/Localizable.strings @@ -166,7 +166,7 @@ "mesh.log.devicemetadata %@"="Requesting Device Metadata for %@"; "mesh.log.device.metadata.received %@"="Device Metadata admin message received from: %@"; "mesh.log.detectionsensor.config %@"="Detection Sensor module config received: %@"; -"mesh.log.externalnotification.config %@"="External Notifiation module config received: %@"; +"mesh.log.externalnotification.config %@"="External Notification module config received: %@"; "mesh.log.lora.config %@"="LoRa config received: %@"; "mesh.log.lora.config.sent %@"="Sent a LoRa.Config for: %@"; "mesh.log.mqtt.config %@"="MQTT module config received: %@"; From fac15ae88c984e6e78e0487418bbf72651022715 Mon Sep 17 00:00:00 2001 From: Roger Pettett Date: Wed, 31 Jan 2024 15:06:15 +0000 Subject: [PATCH 4/5] Update Localizable.strings --- de.lproj/Localizable.strings | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/de.lproj/Localizable.strings b/de.lproj/Localizable.strings index 8ef6b857..7a3be89c 100644 --- a/de.lproj/Localizable.strings +++ b/de.lproj/Localizable.strings @@ -166,7 +166,7 @@ "mesh.log.devicemetadata %@"="Anforderung der Geräte Metadaten für %@"; "mesh.log.device.metadata.received %@"="Device Metadata received from: %@"; "mesh.log.detectionsensor.config %@"="Detection Sensor module config received: %@"; -"mesh.log.externalnotification.config %@"="External Notifiation module config received: %@"; +"mesh.log.externalnotification.config %@"="External Notification module config received: %@"; "mesh.log.lora.config %@"="LoRa config received: %@"; "mesh.log.lora.config.sent %@"="Sent a LoRa.Config for: %@"; "mesh.log.mqtt.config %@"="MQTT module config received: %@"; From 1b51795cf82e9e1960a6062a292e3de3fdbdc176 Mon Sep 17 00:00:00 2001 From: Austin Payne Date: Wed, 31 Jan 2024 23:11:28 -0700 Subject: [PATCH 5/5] fix: offline map type option getting out of sync Fixes a bug where the offline map picker option was getting inverted until another action was taken, e.g. close options, change map type, etc. --- Meshtastic/Views/Nodes/NodeMap.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Meshtastic/Views/Nodes/NodeMap.swift b/Meshtastic/Views/Nodes/NodeMap.swift index 109fc225..96697ddf 100644 --- a/Meshtastic/Views/Nodes/NodeMap.swift +++ b/Meshtastic/Views/Nodes/NodeMap.swift @@ -86,7 +86,7 @@ struct NodeMap: View { Section(header: Text("Map Options")) { Picker(selection: $selectedMapLayer, label: Text("")) { ForEach(MapLayer.allCases, id: \.self) { layer in - if layer == MapLayer.offline && UserDefaults.enableOfflineMaps { + if layer == MapLayer.offline && enableOfflineMaps { Text(layer.localized) } else if layer != MapLayer.offline { Text(layer.localized)