From c24e28d9ce2d957aea1bbc87d5471cb61039cfe5 Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Fri, 5 May 2023 17:42:24 -0700 Subject: [PATCH 1/2] Fix localization mistake --- Meshtastic/Helpers/BLEManager.swift | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Meshtastic/Helpers/BLEManager.swift b/Meshtastic/Helpers/BLEManager.swift index 007fcc99..107e6f1b 100644 --- a/Meshtastic/Helpers/BLEManager.swift +++ b/Meshtastic/Helpers/BLEManager.swift @@ -679,7 +679,8 @@ class BLEManager: NSObject, CBPeripheralDelegate, ObservableObject { let binaryData: Data = try! toRadio.serializedData() if connectedPeripheral!.peripheral.state == CBPeripheralState.connected { connectedPeripheral.peripheral.writeValue(binaryData, for: TORADIO_characteristic, type: .withResponse) - let logString = String.localizedStringWithFormat("mesh.log.textmessage.sent %@ %@ %@".localized, String(fromUserNum), String(toUserNum)) + let logString = String.localizedStringWithFormat("mesh.log.textmessage.sent %@ %@ %@".localized, String(newMessage.messageId), String(fromUserNum), String(toUserNum)) + MeshLogger.log("💬 \(logString)") do { try context!.save() From 0775bc178c4b1a605fccbbf9a08defa8c2fe6b50 Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Fri, 5 May 2023 17:46:24 -0700 Subject: [PATCH 2/2] Fix channel received logging bug --- Meshtastic/Helpers/MeshPackets.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Meshtastic/Helpers/MeshPackets.swift b/Meshtastic/Helpers/MeshPackets.swift index d6b6f36e..ba393038 100644 --- a/Meshtastic/Helpers/MeshPackets.swift +++ b/Meshtastic/Helpers/MeshPackets.swift @@ -143,7 +143,7 @@ func channelPacket (channel: Channel, fromNum: Int64, context: NSManagedObjectCo if channel.isInitialized && channel.hasSettings && channel.role != Channel.Role.disabled { - let logString = String.localizedStringWithFormat("mesh.log.channel.received %d %@", channel.index, String(fromNum)) + let logString = String.localizedStringWithFormat("mesh.log.channel.received %d %@".localized, channel.index, String(fromNum)) MeshLogger.log("🎛️ \(logString)") let fetchedMyInfoRequest: NSFetchRequest = NSFetchRequest.init(entityName: "MyInfoEntity")