meshtastic/Meshtastic-Apple
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Apple.git synced 2026-04-20 22:13:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '2.6.2'

Browse source
This commit is contained in:
Garth Vander Houwen 2025-05-08 15:20:58 -07:00
commit da4d69b24e
5 changed files with 20 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

80
Localizable.xcstrings
View file

@ -8891,7 +8891,7 @@
}
}
},
"device" : {
"Device" : {
"localizations" : {
"de" : {
"stringUnit" : {
@ -8899,12 +8899,6 @@
"value" : "Gerät"
}
},
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "Device"
}
},
"fr" : {
"stringUnit" : {
"state" : "translated",
@ -16255,7 +16249,7 @@
}
}
},
"logging" : {
"Logging" : {
"localizations" : {
"de" : {
"stringUnit" : {
@ -16263,12 +16257,6 @@
"value" : "Logging"
}
},
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "Logging"
}
},
"fr" : {
"stringUnit" : {
"state" : "translated",
@ -17349,7 +17337,7 @@
}
}
},
"mesh.log.bluetooth.config %@" : {
"Bluetooth config received: %@" : {
"localizations" : {
"de" : {
"stringUnit" : {
@ -17357,12 +17345,6 @@
"value" : "Bluetooth Konfiguration empfangen: %@"
}
},
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "Bluetooth config received: %@"
}
},
"fr" : {
"stringUnit" : {
"state" : "translated",
@ -17703,7 +17685,7 @@
}
}
},
"mesh.log.device.config %@" : {
"Device config received: %@" : {
"localizations" : {
"de" : {
"stringUnit" : {
@ -17711,12 +17693,6 @@
"value" : "Gerätekonfiguration empfangen: %@"
}
},
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "Device config received: %@"
}
},
"fr" : {
"stringUnit" : {
"state" : "translated",
@ -18935,7 +18911,7 @@
}
}
},
"mesh.log.telemetry.config %@" : {
"Telemetry module config received: %@" : {
"localizations" : {
"de" : {
"stringUnit" : {
@ -18943,12 +18919,6 @@
"value" : "Telemetrie Modul Konfiguration empfangen: %@"
}
},
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "Telemetry module config received: %@"
}
},
"fr" : {
"stringUnit" : {
"state" : "translated",
@ -20172,7 +20142,7 @@
}
}
},
"module.configuration" : {
"Module Configuration" : {
"localizations" : {
"de" : {
"stringUnit" : {
@ -20180,12 +20150,6 @@
"value" : "Modul Konfiguration"
}
},
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "Module Configuration"
}
},
"fr" : {
"stringUnit" : {
"state" : "translated",
@ -20680,7 +20644,7 @@
}
}
},
"network" : {
"Network" : {
"localizations" : {
"de" : {
"stringUnit" : {
@ -20688,12 +20652,6 @@
"value" : "Netzwerk"
}
},
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "Network"
}
},
"fr" : {
"stringUnit" : {
"state" : "translated",
@ -21692,7 +21650,7 @@
}
}
},
"nodelist.filter.distance %@" : {
"up to %@ away" : {
"localizations" : {
"de" : {
"stringUnit" : {
@ -21700,12 +21658,6 @@
"value" : "bis zu %@ entfernt"
}
},
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "up to %@ away"
}
},
"fr" : {
"stringUnit" : {
"state" : "translated",
@ -30875,7 +30827,7 @@
}
}
},
"telemetry" : {
"Telemetry" : {
"localizations" : {
"de" : {
"stringUnit" : {
@ -30883,12 +30835,6 @@
"value" : "Telemetrie (Sensoren)"
}
},
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "Telemetry (Sensors)"
}
},
"fr" : {
"stringUnit" : {
"state" : "translated",
@ -30939,7 +30885,7 @@
}
}
},
"telemetry.config" : {
"Telemetry Config" : {
"localizations" : {
"de" : {
"stringUnit" : {
@ -30947,12 +30893,6 @@
"value" : "Telemetrie Einstellungen"
}
},
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "Telemetry Config"
}
},
"fr" : {
"stringUnit" : {
"state" : "translated",

2
Meshtastic/Enums/AppSettingsEnums.swift
View file

@ -66,7 +66,7 @@ enum MeshMapDistances: Double, CaseIterable, Identifiable {
var id: Double { self.rawValue }
var description: String {
let distanceFormatter = MKDistanceFormatter()
return String.localizedStringWithFormat("nodelist.filter.distance %@".localized, distanceFormatter.string(fromDistance: Double(self.rawValue)))
return String.localizedStringWithFormat("up to %@ away".localized, distanceFormatter.string(fromDistance: Double(self.rawValue)))
}
}

6
Meshtastic/Persistence/UpdateCoreData.swift
View file

@ -406,7 +406,7 @@ func upsertPositionPacket (packet: MeshPacket, context: NSManagedObjectContext)
func upsertBluetoothConfigPacket(config: Config.BluetoothConfig, nodeNum: Int64, sessionPasskey: Data? = Data(), context: NSManagedObjectContext) {
let logString = String.localizedStringWithFormat("mesh.log.bluetooth.config %@".localized, String(nodeNum))
let logString = String.localizedStringWithFormat("Bluetooth config received: %@".localized, String(nodeNum))
Logger.mesh.info("📶 \(logString, privacy: .public)")
let fetchNodeInfoRequest = NodeInfoEntity.fetchRequest()
@ -450,7 +450,7 @@ func upsertBluetoothConfigPacket(config: Config.BluetoothConfig, nodeNum: Int64,
func upsertDeviceConfigPacket(config: Config.DeviceConfig, nodeNum: Int64, sessionPasskey: Data? = Data(), context: NSManagedObjectContext) {
let logString = String.localizedStringWithFormat("mesh.log.device.config %@".localized, String(nodeNum))
let logString = String.localizedStringWithFormat("Device config received: %@".localized, String(nodeNum))
Logger.mesh.info("📟 \(logString, privacy: .public)")
let fetchNodeInfoRequest = NodeInfoEntity.fetchRequest()
fetchNodeInfoRequest.predicate = NSPredicate(format: "num == %lld", Int64(nodeNum))
@ -1393,7 +1393,7 @@ func upsertStoreForwardModuleConfigPacket(config: ModuleConfig.StoreForwardConfi
func upsertTelemetryModuleConfigPacket(config: ModuleConfig.TelemetryConfig, nodeNum: Int64, sessionPasskey: Data? = Data(), context: NSManagedObjectContext) {
let logString = String.localizedStringWithFormat("mesh.log.telemetry.config %@".localized, String(nodeNum))
let logString = String.localizedStringWithFormat("Telemetry module config received: %@".localized, String(nodeNum))
Logger.data.info("📈 \(logString, privacy: .public)")
let fetchNodeInfoRequest = NodeInfoEntity.fetchRequest()

2
Meshtastic/Views/Settings/Config/Module/TelemetryConfig.swift
View file

@ -124,7 +124,7 @@ struct TelemetryConfig: View {
}
}
}
.navigationTitle("telemetry.config")
.navigationTitle("Telemetry Config")
.navigationBarItems(
trailing: ZStack {
ConnectedDevice(

10
Meshtastic/Views/Settings/Settings.swift
View file

@ -124,7 +124,7 @@ struct Settings: View {
NavigationLink(value: SettingsNavigationState.device) {
Label {
Text("device")
Text("Device")
} icon: {
Image(systemName: "flipphone")
}
@ -140,7 +140,7 @@ struct Settings: View {
NavigationLink(value: SettingsNavigationState.network) {
Label {
Text("network")
Text("Network")
} icon: {
Image(systemName: "network")
}
@ -269,7 +269,7 @@ struct Settings: View {
if isModuleSupported(.telemetryConfig) {
NavigationLink(value: SettingsNavigationState.telemetry) {
Label {
Text("telemetry")
Text("Telemetry")
} icon: {
Image(systemName: "chart.xyaxis.line")
}
@ -286,7 +286,7 @@ struct Settings: View {
Text("This node does not support any configurable modules.")
}
} header: {
Text("module.configuration")
Text("Module Configuration")
} footer: {
if moduleOverride {
Text("Currently showing modules that may not be supported by this node.")
@ -295,7 +295,7 @@ struct Settings: View {
}
var loggingSection: some View {
Section(header: Text("logging")) {
Section(header: Text("Logging")) {
NavigationLink(value: SettingsNavigationState.debugLogs) {
Label {
Text("Logs")