From e11f1b7f89d69276fb638f55a0772b083471db5d Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Sun, 1 Jan 2023 22:58:54 -0800 Subject: [PATCH] Last couple localized mesh log strings --- Meshtastic/Helpers/BLEManager.swift | 10 +++++++--- Meshtastic/Helpers/MeshPackets.swift | 8 ++++++-- de.lproj/Localizable.strings | 4 ++++ en.lproj/Localizable.strings | 4 ++++ 4 files changed, 21 insertions(+), 5 deletions(-) diff --git a/Meshtastic/Helpers/BLEManager.swift b/Meshtastic/Helpers/BLEManager.swift index 6ee4e5b7..0369d2a4 100644 --- a/Meshtastic/Helpers/BLEManager.swift +++ b/Meshtastic/Helpers/BLEManager.swift @@ -539,15 +539,19 @@ class BLEManager: NSObject, CBPeripheralDelegate, ObservableObject { if let routingMessage = try? RouteDiscovery(serializedData: decodedInfo.packet.decoded.payload) { if routingMessage.route.count == 0 { - MeshLogger.log("πŸͺ§ Trace Route request sent to \(decodedInfo.packet.from) was recieived directly.") + let logString = String.localizedStringWithFormat(NSLocalizedString("mesh.log.traceroute.received.direct %@", + comment: "Trace Route request sent to node: %@ was recieived directly."), String(decodedInfo.packet.from)) + MeshLogger.log("πŸͺ§ \(logString)") } else { - var routeString = "πŸͺ§ Trace Route request returned: \(decodedInfo.packet.to) --> " + var routeString = "\(decodedInfo.packet.to) --> " for node in routingMessage.route { routeString += "\(node) --> " } routeString += "\(decodedInfo.packet.from)" - MeshLogger.log(routeString) + let logString = String.localizedStringWithFormat(NSLocalizedString("mesh.log.traceroute.received.route %@", + comment: "Trace Route request returned: %@"), routeString) + MeshLogger.log("πŸͺ§ \(logString)") } } case .UNRECOGNIZED(_): diff --git a/Meshtastic/Helpers/MeshPackets.swift b/Meshtastic/Helpers/MeshPackets.swift index fbf26ac9..eea28e81 100644 --- a/Meshtastic/Helpers/MeshPackets.swift +++ b/Meshtastic/Helpers/MeshPackets.swift @@ -1020,7 +1020,8 @@ func adminAppPacket (packet: MeshPacket, context: NSManagedObjectContext) { func positionPacket (packet: MeshPacket, context: NSManagedObjectContext) { - MeshLogger.log("πŸ“ Position Packet received from node: \(packet.from)") + let logString = String.localizedStringWithFormat(NSLocalizedString("mesh.log.position.received %@", comment: "Position Packet received from node: %@"), String(packet.from)) + MeshLogger.log("πŸ“ \(logString)") let fetchNodePositionRequest: NSFetchRequest = NSFetchRequest.init(entityName: "NodeInfoEntity") fetchNodePositionRequest.predicate = NSPredicate(format: "num == %lld", Int64(packet.from)) @@ -1078,8 +1079,11 @@ func routingPacket (packet: MeshPacket, connectedNodeNum: Int64, context: NSMana if let routingMessage = try? Routing(serializedData: packet.decoded.payload) { let routingError = RoutingError(rawValue: routingMessage.errorReason.rawValue) + + let routingErrorString = routingError?.display ?? NSLocalizedString("unknown", comment: "") + let logString = String.localizedStringWithFormat(NSLocalizedString("mesh.log.routing.message %@ %@", comment: "Routing received for RequestID: %@ Ack Status: %@"), String(packet.decoded.requestID), routingErrorString) + MeshLogger.log("πŸ•ΈοΈ \(logString)") - MeshLogger.log("πŸ•ΈοΈ Routing received for RequestID: \(packet.decoded.requestID) Ack Status: \(routingError?.display ?? NSLocalizedString("unknown", comment: ""))") let fetchMessageRequest: NSFetchRequest = NSFetchRequest.init(entityName: "MessageEntity") fetchMessageRequest.predicate = NSPredicate(format: "messageId == %lld", Int64(packet.decoded.requestID)) diff --git a/de.lproj/Localizable.strings b/de.lproj/Localizable.strings index 0fd8411d..07a91d39 100644 --- a/de.lproj/Localizable.strings +++ b/de.lproj/Localizable.strings @@ -149,7 +149,9 @@ "mesh.log.network.config %@"="Network config received: %@"; "mesh.log.nodeinfo.received %@"="Node info received for: %@"; "mesh.log.position.config %@"="Positon config received: %@"; +"mesh.log.position.received %@"="Position Packet received from node: %@"; "mesh.log.rangetest.config %@"="Range Test module config received: %@"; +"mesh.log.routing.message %@ %@"="Routing received for RequestID: %@ Ack Status: %@"; "mesh.log.serial.config %@"="Serial module config received: %@"; "mesh.log.sharelocation %@"="Sent a Position Packet from the Apple device GPS to node: %@"; "mesh.log.telemetry.config %@"="Telemetry module config received: %@"; @@ -158,6 +160,8 @@ "mesh.log.textmessage.send.failed %@"="Message Send Failed, not properly connected to %@"; "mesh.log.textmessage.sent %@ %@ %@"="Sent message %@ from %@ to %@"; "mesh.log.traceroute.sent %@"="Sent a Trace Route Request to node: %@"; +"mesh.log.traceroute.received.direct %@"="Trace Route request sent to node: %@ was recieived directly."; +"mesh.log.traceroute.received.route %@"="Trace Route request returned: %@"; "mesh.log.wantconfig %@"="Issuing Want Config to %@"; "mesh.log.waypoint.sent %@"="Sent a Waypoint Packet from: %@"; "message"="Nachricht"; diff --git a/en.lproj/Localizable.strings b/en.lproj/Localizable.strings index fef9802c..a2c58ba0 100644 --- a/en.lproj/Localizable.strings +++ b/en.lproj/Localizable.strings @@ -149,7 +149,9 @@ "mesh.log.network.config %@"="Network config received: %@"; "mesh.log.nodeinfo.received %@"="Node info received for: %@"; "mesh.log.position.config %@"="Positon config received: %@"; +"mesh.log.position.received %@"="Position Packet received from node: %@"; "mesh.log.rangetest.config %@"="Range Test module config received: %@"; +"mesh.log.routing.message %@ %@"="Routing received for RequestID: %@ Ack Status: %@"; "mesh.log.serial.config %@"="Serial module config received: %@"; "mesh.log.sharelocation %@"="Sent a Position Packet from the Apple device GPS to node: %@"; "mesh.log.telemetry.config %@"="Telemetry module config received: %@"; @@ -157,6 +159,8 @@ "mesh.log.textmessage.received"="Message received from the text message app."; "mesh.log.textmessage.send.failed %@"="Message Send Failed, not properly connected to %@"; "mesh.log.textmessage.sent %@ %@ %@"="Sent message %@ from %@ to %@"; +"mesh.log.traceroute.received.direct %@"="Trace Route request sent to node: %@ was recieived directly."; +"mesh.log.traceroute.received.route %@"="Trace Route request returned: %@"; "mesh.log.traceroute.sent %@"="Sent a Trace Route Request to node: %@"; "mesh.log.wantconfig %@"="Issuing Want Config to %@"; "mesh.log.waypoint.sent %@"="Sent a Waypoint Packet from: %@";