From 75a84a352906778ee0ef1a8ddbabbe054157fcbf Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Mon, 12 Dec 2022 21:51:43 -0800 Subject: [PATCH] Add menu item strings --- Meshtastic/Views/Bluetooth/Connect.swift | 2 +- Meshtastic/Views/ContentView.swift | 10 +++++----- Meshtastic/Views/Helpers/DistanceText.swift | 2 +- en.lproj/Localizable.strings | 6 ++++++ 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/Meshtastic/Views/Bluetooth/Connect.swift b/Meshtastic/Views/Bluetooth/Connect.swift index 9e409840..cfa38d5e 100644 --- a/Meshtastic/Views/Bluetooth/Connect.swift +++ b/Meshtastic/Views/Bluetooth/Connect.swift @@ -229,7 +229,7 @@ struct Connect: View { } .padding(.bottom, 10) } - .navigationTitle("Bluetooth") + .navigationTitle("bluetooth") .navigationBarItems(leading: MeshtasticLogo(), trailing: ZStack { ConnectedDevice(bluetoothOn: bleManager.isSwitchedOn, deviceConnected: bleManager.connectedPeripheral != nil, name: (bleManager.connectedPeripheral != nil) ? bleManager.connectedPeripheral.shortName : "????") diff --git a/Meshtastic/Views/ContentView.swift b/Meshtastic/Views/ContentView.swift index ba37fb99..a3f99164 100644 --- a/Meshtastic/Views/ContentView.swift +++ b/Meshtastic/Views/ContentView.swift @@ -29,28 +29,28 @@ struct ContentView: View { Contacts() .tabItem { - Label("Messages", systemImage: "message") + Label("messages", systemImage: "message") } .tag(Tab.contacts) } Connect() .tabItem { - Label("Bluetooth", systemImage: "antenna.radiowaves.left.and.right") + Label("bluetooth", systemImage: "antenna.radiowaves.left.and.right") } .tag(Tab.ble) NodeList() .tabItem { - Label("Nodes", systemImage: "flipphone") + Label("nodes", systemImage: "flipphone") } .tag(Tab.nodes) NodeMap() .tabItem { - Label("Mesh Map", systemImage: "map") + Label("map", systemImage: "map") } .tag(Tab.map) Settings() .tabItem { - Label("Settings", systemImage: "gear") + Label("settings", systemImage: "gear") } .tag(Tab.settings) } diff --git a/Meshtastic/Views/Helpers/DistanceText.swift b/Meshtastic/Views/Helpers/DistanceText.swift index 59d58bb8..6028c1e5 100644 --- a/Meshtastic/Views/Helpers/DistanceText.swift +++ b/Meshtastic/Views/Helpers/DistanceText.swift @@ -16,7 +16,7 @@ struct DistanceText: View { var body: some View { let distanceFormatter = MKDistanceFormatter() - Text("Distance: \(distanceFormatter.string(fromDistance: Double(meters)))") + Text("distance")+Text(": \(distanceFormatter.string(fromDistance: Double(meters)))") } } struct DistanceText_Previews: PreviewProvider { diff --git a/en.lproj/Localizable.strings b/en.lproj/Localizable.strings index 228a93e7..6fded5ec 100644 --- a/en.lproj/Localizable.strings +++ b/en.lproj/Localizable.strings @@ -7,6 +7,7 @@ */ "available.radios"="Available Radios"; "ble.name"="BLE Name"; +"bluetooth"="Bluetooth"; "cancel"="Cancel"; "channels"="Channels (groups)"; "connected.radio"="Connected Radio"; @@ -15,11 +16,16 @@ "contacts"="Contacts"; "delete"="Delete"; "direct.messages"="Direct Messages"; +"distance"="Distance"; "disconnect"="Disconnect"; "firmware.version"="Firmware Version"; +"map"="Mesh Map"; +"messages"="Messages"; +"nodes"="Nodes"; "not.connected"="No device connected"; "preferred.radio"="Preferred Radio"; "save"="Save"; +"settings"="Settings"; "subscribed"="Subscribed to mesh"; "select.contact"="Select a Contact"; "set.region"="Set LoRa Region";