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

Start of localization

Browse source
This commit is contained in:
Garth Vander Houwen 2022-12-12 20:35:38 -08:00
parent b71a30b97d
commit 0892214bcd
25 changed files with 91 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Meshtastic.xcodeproj/project.pbxproj
View file

@ -98,6 +98,7 @@
DDC2E1A726CEB3400042C5E4 /* LocationHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDC2E1A626CEB3400042C5E4 /* LocationHelper.swift */; };
DDC3B274283F411B00AC321C /* LastHeardText.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDC3B273283F411B00AC321C /* LastHeardText.swift */; };
DDC4D568275499A500A4208E /* Persistence.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDC4D567275499A500A4208E /* Persistence.swift */; };
DDCDC6CB29481FCC004C1DDA /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = DDCDC6CD29481FCC004C1DDA /* Localizable.strings */; };
DDCE4E2C2869F92900BE9F8F /* UserConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDCE4E2B2869F92900BE9F8F /* UserConfig.swift */; };
DDCFF601285453A7005FA625 /* localonly.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDCFF600285453A7005FA625 /* localonly.pb.swift */; };
DDD3BBD5292D763200D609B3 /* MeshtasticTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDD3BBD4292D763200D609B3 /* MeshtasticTests.swift */; };
@ -222,6 +223,8 @@
DDC3B273283F411B00AC321C /* LastHeardText.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LastHeardText.swift; sourceTree = "<group>"; };
DDC4D567275499A500A4208E /* Persistence.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Persistence.swift; sourceTree = "<group>"; };
DDCDC69A29467643004C1DDA /* MeshtasticDataModelV3.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = MeshtasticDataModelV3.xcdatamodel; sourceTree = "<group>"; };
DDCDC6CC29481FCC004C1DDA /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
DDCDC6CE294821AD004C1DDA /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Localizable.strings; sourceTree = "<group>"; };
DDCE4E2B2869F92900BE9F8F /* UserConfig.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserConfig.swift; sourceTree = "<group>"; };
DDCFF600285453A7005FA625 /* localonly.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = localonly.pb.swift; sourceTree = "<group>"; };
DDD3BBD4292D763200D609B3 /* MeshtasticTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MeshtasticTests.swift; sourceTree = "<group>"; };
@ -401,6 +404,7 @@
DDC2E14B26CE248E0042C5E4 = {
isa = PBXGroup;
children = (
DDCDC6CD29481FCC004C1DDA /* Localizable.strings */,
DD3CC6BA28E366DF00FA9159 /* Meshtastic.xcdatamodeld */,
DDC2E15626CE248E0042C5E4 /* Meshtastic */,
DDC2E16D26CE248F0042C5E4 /* MeshtasticTests */,
@ -641,6 +645,7 @@
hasScannedForEncodings = 0;
knownRegions = (
en,
de,
Base,
);
mainGroup = DDC2E14B26CE248E0042C5E4;
@ -665,6 +670,7 @@
buildActionMask = 2147483647;
files = (
DDC2E15F26CE248F0042C5E4 /* Preview Assets.xcassets in Resources */,
DDCDC6CB29481FCC004C1DDA /* Localizable.strings in Resources */,
DDC2E15C26CE248F0042C5E4 /* Assets.xcassets in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
@ -835,11 +841,24 @@
};
/* End PBXTargetDependency section */
/* Begin PBXVariantGroup section */
DDCDC6CD29481FCC004C1DDA /* Localizable.strings */ = {
isa = PBXVariantGroup;
children = (
DDCDC6CC29481FCC004C1DDA /* en */,
DDCDC6CE294821AD004C1DDA /* de */,
);
name = Localizable.strings;
sourceTree = "<group>";
};
/* End PBXVariantGroup section */
/* Begin XCBuildConfiguration section */
DDC2E17C26CE248F0042C5E4 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
@ -901,6 +920,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";

4
Meshtastic/Views/Bluetooth/Connect.swift
View file

@ -28,7 +28,7 @@ struct Connect: View {
VStack {
List {
if bleManager.isSwitchedOn {
Section(header: Text("Connected Radio").font(.title)) {
Section(header: Text("connected.radio").font(.title)) {
if bleManager.connectedPeripheral != nil && bleManager.connectedPeripheral.peripheral.state == .connected {
HStack {
Image(systemName: "antenna.radiowaves.left.and.right")
@ -160,7 +160,7 @@ struct Connect: View {
.textCase(nil)
if !self.bleManager.isConnected {
Section(header: Text("Available Radios").font(.title)) {
Section(header: Text("available.radios").font(.title)) {
ForEach(bleManager.peripherals.filter({ $0.peripheral.state == CBPeripheralState.disconnected }).sorted(by: { $0.name > $1.name })) { peripheral in
HStack {
Image(systemName: "circle.fill")

12
Meshtastic/Views/Helpers/LastHeardText.swift
View file

@ -17,7 +17,17 @@ struct LastHeardText: View {
} else {
Text("Unknown Age")
Text("unknown.age")
}
}
}
struct LastHeardText_Previews: PreviewProvider {
static var previews: some View {
LastHeardText(lastHeard: Date())
.previewLayout(.fixed(width: 300, height: 100))
.environment(\.locale, .init(identifier: "en"))
LastHeardText(lastHeard: Date())
.previewLayout(.fixed(width: 300, height: 100))
.environment(\.locale, .init(identifier: "de"))
}
}

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

@ -144,7 +144,7 @@ struct ChannelMessageList: View {
self.deleteMessageId = message.messageId
print(deleteMessageId)
}) {
Text("Delete")
Text("delete")
Image(systemName: "trash")
}
}

12
Meshtastic/Views/Messages/Contacts.swift
View file

@ -28,7 +28,7 @@ struct Contacts: View {
NavigationSplitView {
List {
Section(header: Text("Channels (groups)")) {
Section(header: Text("channels")) {
// Display Contacts for the rest of the non admin channels
if node != nil && node!.myInfo != nil && node!.myInfo!.channels != nil {
ForEach(node!.myInfo!.channels!.array as! [ChannelEntity], id: \.self) { (channel: ChannelEntity) in
@ -128,7 +128,7 @@ struct Contacts: View {
deleteChannelMessages(channelIndex: channel.index, context: context)
context.refreshAllObjects()
} label: {
Text("Delete")
Text("delete")
}
}
}
@ -137,7 +137,7 @@ struct Contacts: View {
}
}
Section(header: Text("Direct Messages")) {
Section(header: Text("direct.messages")) {
ForEach(users) { (user: UserEntity) in
if user.num != bleManager.userSettings?.preferredNodeNum ?? 0 {
NavigationLink(destination: UserMessageList(user: user)) {
@ -214,7 +214,7 @@ struct Contacts: View {
deleteUserMessages(user: user, context: context)
} label: {
Text("Delete")
Text("delete")
}
}
}
@ -227,7 +227,7 @@ struct Contacts: View {
}
}
}
.navigationTitle("Contacts")
.navigationTitle("contacts")
.navigationBarItems(leading:
MeshtasticLogo()
)
@ -260,7 +260,7 @@ struct Contacts: View {
UserMessageList(user:user)
} else {
Text("Select a Contact")
Text("select.contact")
}
}
}

4
Meshtastic/Views/Messages/UserMessageList.swift
View file

@ -127,7 +127,7 @@ struct UserMessageList: View {
if ackDate >= sixMonthsAgo! {
Text((ackDate.formattedDate(format: "h:mm:ss a"))).font(.caption2).foregroundColor(.gray)
} else {
Text("Unknown Age").font(.caption2).foregroundColor(.gray)
Text("unknown.age").font(.caption2).foregroundColor(.gray)
}
}
}
@ -145,7 +145,7 @@ struct UserMessageList: View {
self.deleteMessageId = message.messageId
print(deleteMessageId)
}) {
Text("Delete")
Text("delete")
Image(systemName: "trash")
}
}

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

@ -148,7 +148,7 @@ struct DeviceMetricsLog: View {
exportString = TelemetryToCsvFile(telemetry: node.telemetries!.array as! [TelemetryEntity], metricsType: 0)
isExporting = true
} label: {
Label("Save", systemImage: "square.and.arrow.down")
Label("save", systemImage: "square.and.arrow.down")
}
.buttonStyle(.bordered)
.buttonBorderShape(.capsule)

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

@ -156,7 +156,7 @@ struct EnvironmentMetricsLog: View {
} label: {
Label("Save", systemImage: "square.and.arrow.down")
Label("save", systemImage: "square.and.arrow.down")
}
.buttonStyle(.bordered)
.buttonBorderShape(.capsule)

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

@ -137,7 +137,7 @@ struct PositionLog: View {
} label: {
Label("Save", systemImage: "square.and.arrow.down")
Label("save", systemImage: "square.and.arrow.down")
}
.buttonStyle(.bordered)
.buttonBorderShape(.capsule)

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

@ -87,7 +87,7 @@ struct BluetoothConfig: View {
Button {
isPresentingSaveConfirm = true
} label: {
Label("Save", systemImage: "square.and.arrow.down")
Label("save", systemImage: "square.and.arrow.down")
}
.disabled(bleManager.connectedPeripheral == nil || !hasChanges || shortPin)
.buttonStyle(.bordered)

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

@ -143,7 +143,7 @@ struct DeviceConfig: View {
} label: {
Label("Save", systemImage: "square.and.arrow.down")
Label("save", systemImage: "square.and.arrow.down")
}
.disabled(bleManager.connectedPeripheral == nil || !hasChanges)
.buttonStyle(.bordered)

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

@ -97,7 +97,7 @@ struct DisplayConfig: View {
} label: {
Label("Save", systemImage: "square.and.arrow.down")
Label("save", systemImage: "square.and.arrow.down")
}
.disabled(bleManager.connectedPeripheral == nil || !hasChanges)
.buttonStyle(.bordered)

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

@ -63,7 +63,7 @@ struct LoRaConfig: View {
Button {
isPresentingSaveConfirm = true
} label: {
Label("Save", systemImage: "square.and.arrow.down")
Label("save", systemImage: "square.and.arrow.down")
}
.disabled(bleManager.connectedPeripheral == nil || !hasChanges)
.buttonStyle(.bordered)

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

@ -212,7 +212,7 @@ struct CannedMessagesConfig: View {
isPresentingSaveConfirm = true
} label: {
Label("Save", systemImage: "square.and.arrow.down")
Label("save", systemImage: "square.and.arrow.down")
}
.disabled(bleManager.connectedPeripheral == nil || (!hasChanges && !hasMessagesChanges))
.buttonStyle(.bordered)

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

@ -123,7 +123,7 @@ struct ExternalNotificationConfig: View {
Button {
isPresentingSaveConfirm = true
} label: {
Label("Save", systemImage: "square.and.arrow.down")
Label("save", systemImage: "square.and.arrow.down")
}
.disabled(bleManager.connectedPeripheral == nil || !hasChanges)
.buttonStyle(.bordered)

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

@ -144,7 +144,7 @@ struct MQTTConfig: View {
} label: {
Label("Save", systemImage: "square.and.arrow.down")
Label("save", systemImage: "square.and.arrow.down")
}
.disabled(bleManager.connectedPeripheral == nil || !hasChanges)
.buttonStyle(.bordered)

4
Meshtastic/Views/Settings/Config/Module/RangeTestConfig.swift
View file

@ -76,7 +76,7 @@ struct RangeTestConfig: View {
Text("This device will send out range test messages on the selected interval.")
.font(.caption)
Toggle(isOn: $save) {
Label("Save", systemImage: "square.and.arrow.down.fill")
Label("save", systemImage: "square.and.arrow.down.fill")
}
.toggleStyle(SwitchToggleStyle(tint: .accentColor))
.disabled(!(node != nil && node!.myInfo?.hasWifi ?? false))
@ -88,7 +88,7 @@ struct RangeTestConfig: View {
Button {
isPresentingSaveConfirm = true
} label: {
Label("Save", systemImage: "square.and.arrow.down")
Label("save", systemImage: "square.and.arrow.down")
}
.disabled(bleManager.connectedPeripheral == nil || !hasChanges || !(node?.myInfo?.hasWifi ?? false))
.buttonStyle(.bordered)

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

@ -113,7 +113,7 @@ struct SerialConfig: View {
} label: {
Label("Save", systemImage: "square.and.arrow.down")
Label("save", systemImage: "square.and.arrow.down")
}
.disabled(bleManager.connectedPeripheral == nil || !hasChanges)
.buttonStyle(.bordered)

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

@ -125,7 +125,7 @@ struct TelemetryConfig: View {
Button {
isPresentingSaveConfirm = true
} label: {
Label("Save", systemImage: "square.and.arrow.down")
Label("save", systemImage: "square.and.arrow.down")
}
.disabled(bleManager.connectedPeripheral == nil || !hasChanges || node!.telemetryConfig == nil)
.buttonStyle(.bordered)

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

@ -96,7 +96,7 @@ struct NetworkConfig: View {
Button {
isPresentingSaveConfirm = true
} label: {
Label("Save", systemImage: "square.and.arrow.down")
Label("save", systemImage: "square.and.arrow.down")
}
.disabled(bleManager.connectedPeripheral == nil || !hasChanges)
.buttonStyle(.bordered)

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

@ -193,7 +193,7 @@ struct PositionConfig: View {
} label: {
Label("Save", systemImage: "square.and.arrow.down")
Label("save", systemImage: "square.and.arrow.down")
}
.disabled(bleManager.connectedPeripheral == nil || !hasChanges)
.buttonStyle(.bordered)

4
Meshtastic/Views/Settings/SaveChannelQRCode.swift
View file

@ -32,7 +32,7 @@ struct SaveChannelQRCode: View {
}
} label: {
Label("Save", systemImage: "square.and.arrow.down")
Label("save", systemImage: "square.and.arrow.down")
}
.buttonStyle(.bordered)
.buttonBorderShape(.capsule)
@ -44,7 +44,7 @@ struct SaveChannelQRCode: View {
Button {
dismiss()
} label: {
Label("Cancel", systemImage: "xmark")
Label("cancel", systemImage: "xmark")
}
.buttonStyle(.bordered)

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

@ -72,7 +72,7 @@ struct UserConfig: View {
Button {
isPresentingSaveConfirm = true
} label: {
Label("Save", systemImage: "square.and.arrow.down")
Label("save", systemImage: "square.and.arrow.down")
}
.disabled(bleManager.connectedPeripheral == nil || !hasChanges)
.buttonStyle(.bordered)

13
de.lproj/Localizable.strings Normal file
View file

@ -0,0 +1,13 @@
/*
Localizable.strings
Meshtastic
Created by Garth Vander Houwen on 12/12/22.
*/
//"available.radios"="Verfügbare Funkgeräte";
//"cancel"="Absagen";
//"connected.radio"="Verbundenes Radio";
//"delete"="Löschen";
//"save"="Speichern";
//"unknown.age"="Unbekanntes Alter";

17
en.lproj/Localizable.strings Normal file
View file

@ -0,0 +1,17 @@
/*
Localizable.strings
Meshtastic
Copyright(c) Garth Vander Houwen on 12/12/22.
*/
"available.radios"="Available Radios";
"cancel"="Cancel";
"channels"="Channels (groups)";
"connected.radio"="Connected Radio";
"contacts"="Contacts";
"delete"="Delete";
"direct.messages"="Direct Messages";
"save"="Save";
"select.contact"="Select a Contact";
"unknown.age"="Unknown Age";