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

60 stupid keys remaining

Browse source
This commit is contained in:
Garth Vander Houwen 2025-05-08 20:34:25 -07:00
parent 219a84cd62
commit ffb3296ddf
15 changed files with 962 additions and 1215 deletions
Download patch file Download diff file Expand all files Collapse all files

2123
Localizable.xcstrings
View file

File diff suppressed because it is too large Load diff

8
Meshtastic/Enums/DisplayEnums.swift
View file

@ -149,13 +149,13 @@ enum DisplayModes: Int, CaseIterable, Identifiable {
var description: String {
switch self {
case .defaultMode:
return "default.128x64.screen.layout".localized
return "Default 128x64 screen layout".localized
case .twoColor:
return "optimized.for.2.color.displays".localized
return "Optimized for 2 color displays".localized
case .inverted:
return "inverted.top.bar.for.2.color.display".localized
return "Inverted top bar for 2 Color display".localized
case .color:
return "tft.full.color.displays".localized
return "TFT Full Color Displays".localized
}
}
func protoEnumValue() -> Config.DisplayConfig.DisplayMode {

2
Meshtastic/Helpers/BLEManager.swift
View file

@ -498,7 +498,7 @@ class BLEManager: NSObject, CBPeripheralDelegate, MqttClientProxyManagerDelegate
guard connectedPeripheral?.peripheral.state ?? CBPeripheralState.disconnected == CBPeripheralState.connected else { return }
if FROMRADIO_characteristic == nil {
Logger.mesh.error("🚨 \("firmware.version.unsupported".localized, privacy: .public)")
Logger.mesh.error("🚨 \("Unsupported Firmware Version Detected, unable to connect to device.".localized, privacy: .public)")
invalidVersion = true
return
} else {

6
Meshtastic/Helpers/MeshPackets.swift
View file

@ -209,7 +209,7 @@ func channelPacket (channel: Channel, fromNum: Int64, context: NSManagedObjectCo
func deviceMetadataPacket (metadata: DeviceMetadata, fromNum: Int64, sessionPasskey: Data? = Data(), context: NSManagedObjectContext) {
if metadata.isInitialized {
let logString = String.localizedStringWithFormat("mesh.log.device.metadata.received %@".localized, fromNum.toHex())
let logString = String.localizedStringWithFormat("Device Metadata received from: %@".localized, fromNum.toHex())
Logger.mesh.info("🏷️ \(logString, privacy: .public)")
let fetchedNodeRequest = NodeInfoEntity.fetchRequest()
@ -472,7 +472,7 @@ func adminAppPacket (packet: MeshPacket, context: NSManagedObjectContext) {
if !cmmc.messages.isEmpty {
let logString = String.localizedStringWithFormat("mesh.log.cannedmessages.messages.received %@".localized, packet.from.toHex())
let logString = String.localizedStringWithFormat("Canned Messages Messages Received For: %@".localized, packet.from.toHex())
Logger.mesh.info("🥫 \(logString, privacy: .public)")
let fetchNodeRequest = NodeInfoEntity.fetchRequest()
@ -1037,7 +1037,7 @@ func textMessageAppPacket(
func waypointPacket (packet: MeshPacket, context: NSManagedObjectContext) {
let logString = String.localizedStringWithFormat("mesh.log.waypoint.received %@".localized, String(packet.from))
let logString = String.localizedStringWithFormat("Waypoint Packet received from node: %@".localized, String(packet.from))
Logger.mesh.info("📍 \(logString, privacy: .public)")
let fetchWaypointRequest = WaypointEntity.fetchRequest()

10
Meshtastic/Persistence/UpdateCoreData.swift
View file

@ -505,7 +505,7 @@ func upsertDeviceConfigPacket(config: Config.DeviceConfig, nodeNum: Int64, sessi
func upsertDisplayConfigPacket(config: Config.DisplayConfig, nodeNum: Int64, sessionPasskey: Data? = Data(), context: NSManagedObjectContext) {
let logString = String.localizedStringWithFormat("mesh.log.display.config %@".localized, nodeNum.toHex())
let logString = String.localizedStringWithFormat("Display config received: %@".localized, nodeNum.toHex())
Logger.data.info("🖥️ \(logString, privacy: .public)")
let fetchNodeInfoRequest = NodeInfoEntity.fetchRequest()
@ -916,7 +916,7 @@ func upsertAmbientLightingModuleConfigPacket(config: ModuleConfig.AmbientLightin
func upsertCannedMessagesModuleConfigPacket(config: ModuleConfig.CannedMessageConfig, nodeNum: Int64, sessionPasskey: Data? = Data(), context: NSManagedObjectContext) {
let logString = String.localizedStringWithFormat("mesh.log.cannedmessage.config %@".localized, String(nodeNum))
let logString = String.localizedStringWithFormat("Canned Message module config received: %@".localized, String(nodeNum))
Logger.data.info("🥫 \(logString, privacy: .public)")
let fetchNodeInfoRequest = NodeInfoEntity.fetchRequest()
@ -975,7 +975,7 @@ func upsertCannedMessagesModuleConfigPacket(config: ModuleConfig.CannedMessageCo
func upsertDetectionSensorModuleConfigPacket(config: ModuleConfig.DetectionSensorConfig, nodeNum: Int64, sessionPasskey: Data? = Data(), context: NSManagedObjectContext) {
let logString = String.localizedStringWithFormat("mesh.log.detectionsensor.config %@".localized, String(nodeNum))
let logString = String.localizedStringWithFormat("Detection Sensor module config received: %@".localized, String(nodeNum))
Logger.data.info("🕵️ \(logString, privacy: .public)")
let fetchNodeInfoRequest = NodeInfoEntity.fetchRequest()
@ -1032,7 +1032,7 @@ func upsertDetectionSensorModuleConfigPacket(config: ModuleConfig.DetectionSenso
func upsertExternalNotificationModuleConfigPacket(config: ModuleConfig.ExternalNotificationConfig, nodeNum: Int64, sessionPasskey: Data? = Data(), context: NSManagedObjectContext) {
let logString = String.localizedStringWithFormat("mesh.log.externalnotification.config %@".localized, String(nodeNum))
let logString = String.localizedStringWithFormat("External Notification module config received: %@".localized, String(nodeNum))
Logger.data.info("📣 \(logString, privacy: .public)")
let fetchNodeInfoRequest = NodeInfoEntity.fetchRequest()
@ -1344,7 +1344,7 @@ func upsertSerialModuleConfigPacket(config: ModuleConfig.SerialConfig, nodeNum:
func upsertStoreForwardModuleConfigPacket(config: ModuleConfig.StoreForwardConfig, nodeNum: Int64, sessionPasskey: Data? = Data(), context: NSManagedObjectContext) {
let logString = String.localizedStringWithFormat("mesh.log.storeforward.config %@".localized, String(nodeNum))
let logString = String.localizedStringWithFormat("Store & Forward module config received: %@".localized, String(nodeNum))
Logger.data.info("📬 \(logString, privacy: .public)")
let fetchNodeInfoRequest = NodeInfoEntity.fetchRequest()

2
Meshtastic/Views/Messages/Messages.swift
View file

@ -50,7 +50,7 @@ struct Messages: View {
}
NavigationLink(value: MessagesNavigationState.directMessages()) {
Label {
Text("direct.messages")
Text("Direct Messages")
.badge(unreadDirectMessages)
.font(.title2)
.padding()

4
Meshtastic/Views/Nodes/DetectionSensorLog.swift
View file

@ -118,7 +118,7 @@ struct DetectionSensorLog: View {
.padding(.bottom)
.padding(.trailing)
}
.navigationTitle("detection.sensor.log")
.navigationTitle("Detection Sensor Log")
.navigationBarTitleDisplayMode(.inline)
.navigationBarItems(trailing:
ZStack {
@ -128,7 +128,7 @@ struct DetectionSensorLog: View {
isPresented: $isExporting,
document: CsvDocument(emptyCsv: exportString),
contentType: .commaSeparatedText,
defaultFilename: String("\(node.user?.longName ?? "Node") \("detection.sensor.log".localized)"),
defaultFilename: String("\(node.user?.longName ?? "Node") \("Detection Sensor Log".localized)"),
onCompletion: { result in
switch result {
case .success:

4
Meshtastic/Views/Nodes/DeviceMetricsLog.swift
View file

@ -240,7 +240,7 @@ struct DeviceMetricsLog: View {
ContentUnavailableView("No Device Metrics", systemImage: "slash.circle")
}
}
.navigationTitle("device.metrics.log")
.navigationTitle("Device Metrics Log")
.navigationBarTitleDisplayMode(.inline)
.navigationBarItems(trailing:
ZStack {
@ -250,7 +250,7 @@ struct DeviceMetricsLog: View {
isPresented: $isExporting,
document: CsvDocument(emptyCsv: exportString),
contentType: .commaSeparatedText,
defaultFilename: String("\(node.user?.longName ?? "Node") \("device.metrics.log".localized)"),
defaultFilename: String("\(node.user?.longName ?? "Node") \("Device Metrics Log".localized)"),
onCompletion: { result in
switch result {
case .success:

2
Meshtastic/Views/Nodes/PaxCounterLog.swift
View file

@ -174,7 +174,7 @@ struct PaxCounterLog: View {
isPresented: $isPresentingClearLogConfirm,
titleVisibility: .visible
) {
Button("paxcounter.delete", role: .destructive) {
Button("Delete all pax data?", role: .destructive) {
if clearPax(destNum: node.num, context: context) {
Logger.services.info("Cleared Pax Counter for \(node.num, privacy: .public)")
} else {

2
Meshtastic/Views/Settings/About.swift
View file

@ -48,7 +48,7 @@ struct AboutMeshtastic: View {
}
.font(.title2)
Text("Version: \(Bundle.main.appVersionLong) (\(Bundle.main.appBuild)) ")
Text("Version: \(Bundle.main.appVersionLong) (\(Bundle.main.appBuild))")
}
Section(header: Text("Project information")) {

2
Meshtastic/Views/Settings/Config/DeviceConfig.swift
View file

@ -247,7 +247,7 @@ struct DeviceConfig: View {
}
Spacer()
}
.navigationTitle("device.config")
.navigationTitle("Device Config")
.navigationBarItems(
trailing: ZStack {
ConnectedDevice(

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

@ -181,7 +181,7 @@ struct DetectionSensorConfig: View {
}
}
}
.navigationTitle("detection.sensor.config")
.navigationTitle("Detection Sensor Config")
.navigationBarItems(
trailing: ZStack {
ConnectedDevice(

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

@ -126,7 +126,7 @@ struct SerialConfig: View {
}
}
}
.navigationTitle("serial.config")
.navigationTitle("Serial Config")
.navigationBarItems(
trailing: ZStack {
ConnectedDevice(

2
Meshtastic/Views/Settings/RouteRecorder.swift
View file

@ -191,7 +191,7 @@ struct RouteRecorder: View {
Logger.data.error("Error Saving RouteEntity from the Route Recorder \(nsError, privacy: .public)")
}
} label: {
Label("start", systemImage: "play")
Label("Start", systemImage: "play")
}
.buttonStyle(.bordered)
.buttonBorderShape(.capsule)

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

@ -189,7 +189,7 @@ struct Settings: View {
if isModuleSupported(.detectionsensorConfig) {
NavigationLink(value: SettingsNavigationState.detectionSensor) {
Label {
Text("detection.sensor")
Text("Detection Sensor")
} icon: {
Image(systemName: "sensor")
}
@ -199,7 +199,7 @@ struct Settings: View {
if isModuleSupported(.extnotifConfig) {
NavigationLink(value: SettingsNavigationState.externalNotification) {
Label {
Text("external.notification")
Text("External Notification")
} icon: {
Image(systemName: "megaphone")
}
@ -219,7 +219,7 @@ struct Settings: View {
if isModuleSupported(.rangetestConfig) {
NavigationLink(value: SettingsNavigationState.rangeTest) {
Label {
Text("range.test")
Text("Range Test")
} icon: {
Image(systemName: "point.3.connected.trianglepath.dotted")
}