From 718842bafb713af88c5cae9dc248da0ff6ad5bae Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Tue, 6 Feb 2024 16:47:12 -0800 Subject: [PATCH] Localize new settings --- Meshtastic/Enums/PositionConfigEnums.swift | 2 +- Meshtastic/Views/Settings/AppSettings.swift | 14 +++++++------- .../Views/Settings/Config/PositionConfig.swift | 1 - Meshtastic/Views/Settings/Settings.swift | 2 +- de.lproj/Localizable.strings | 5 +++-- en.lproj/Localizable.strings | 5 +++-- pl.lproj/Localizable.strings | 5 +++-- zh-Hans.lproj/Localizable.strings | 5 +++-- 8 files changed, 21 insertions(+), 18 deletions(-) diff --git a/Meshtastic/Enums/PositionConfigEnums.swift b/Meshtastic/Enums/PositionConfigEnums.swift index 5d6751d2..e9d4fec2 100644 --- a/Meshtastic/Enums/PositionConfigEnums.swift +++ b/Meshtastic/Enums/PositionConfigEnums.swift @@ -91,7 +91,7 @@ enum GpsUpdateIntervals: Int, CaseIterable, Identifiable { case .twentyFourHours: return "interval.twentyfour.hours".localized case .maxInt32: - return "on.boot" + return "on.boot".localized } } } diff --git a/Meshtastic/Views/Settings/AppSettings.swift b/Meshtastic/Views/Settings/AppSettings.swift index 9f4582e7..44b1790f 100644 --- a/Meshtastic/Views/Settings/AppSettings.swift +++ b/Meshtastic/Views/Settings/AppSettings.swift @@ -65,14 +65,14 @@ struct AppSettings: View { } Section(header: Text("Location Settings")) { Toggle(isOn: $provideLocation) { - Label("provide.location", systemImage: "location.circle.fill") + Label("appsettings.provide.location", systemImage: "location.circle.fill") } .toggleStyle(SwitchToggleStyle(tint: .accentColor)) - Toggle(isOn: $enableSmartPosition) { - Label("appsettings.enablesmartposition", systemImage: "brain.fill") - } - .toggleStyle(SwitchToggleStyle(tint: .accentColor)) - if UserDefaults.provideLocation { + if provideLocation { + Toggle(isOn: $enableSmartPosition) { + Label("appsettings.smartposition", systemImage: "brain.fill") + } + .toggleStyle(SwitchToggleStyle(tint: .accentColor)) VStack { Picker("update.interval", selection: $provideLocationInterval) { ForEach(LocationUpdateInterval.allCases) { lu in @@ -135,7 +135,7 @@ struct AppSettings: View { totalDownloadedTileSize = tileManager.getAllDownloadedSize() }) } - .navigationTitle("app.settings") + .navigationTitle("appsettings") .navigationBarItems(trailing: ZStack { ConnectedDevice(bluetoothOn: bleManager.isSwitchedOn, deviceConnected: bleManager.connectedPeripheral != nil, name: (bleManager.connectedPeripheral != nil) ? bleManager.connectedPeripheral.shortName : "?") diff --git a/Meshtastic/Views/Settings/Config/PositionConfig.swift b/Meshtastic/Views/Settings/Config/PositionConfig.swift index 31dd2319..dfbfb9c2 100644 --- a/Meshtastic/Views/Settings/Config/PositionConfig.swift +++ b/Meshtastic/Views/Settings/Config/PositionConfig.swift @@ -156,7 +156,6 @@ struct PositionConfig: View { .padding(.top, 5) .padding(.bottom, 5) - if gpsMode == 1 { Picker("Update Interval", selection: $gpsUpdateInterval) { ForEach(GpsUpdateIntervals.allCases) { ui in diff --git a/Meshtastic/Views/Settings/Settings.swift b/Meshtastic/Views/Settings/Settings.swift index 297e7481..d9d6f598 100644 --- a/Meshtastic/Views/Settings/Settings.swift +++ b/Meshtastic/Views/Settings/Settings.swift @@ -57,7 +57,7 @@ struct Settings: View { } label: { Image(systemName: "gearshape") .symbolRenderingMode(.hierarchical) - Text("app.settings") + Text("appsettings") } .tag(SettingsSidebar.appSettings) if #available(iOS 17.0, macOS 14.0, *) { diff --git a/de.lproj/Localizable.strings b/de.lproj/Localizable.strings index 595e9c03..548a9b04 100644 --- a/de.lproj/Localizable.strings +++ b/de.lproj/Localizable.strings @@ -14,7 +14,9 @@ "always.on"="Immer an"; "ambient.lighting"="Ambient Lighting"; "ambient.lighting.config"="Ambient Lighting Config"; -"app.settings"="App Einstellungen"; +"appsettings"="App Einstellungen"; +"appsettings.provide.location"="Standort im Mesh veröffentlichen"; +"appsettings.smartposition"="Smart Position"; "are.you.sure"="Bist Du sicher?"; "ascii.capable"="ASCII fähig"; "available.radios"="Geräte in der Nähe"; @@ -223,7 +225,6 @@ "position"="Position"; "position.config"="Positionseinstellungen"; "preferred.radio"="Bevorzugtes Gerät"; -"provide.location"="Standort im Mesh veröffentlichen"; "radio.configuration"="Geräteeinstellungen"; "range.test"="Entfernungstest"; "range.test.blocked"="Block Range Test"; diff --git a/en.lproj/Localizable.strings b/en.lproj/Localizable.strings index 5cb9d1ed..028c3069 100644 --- a/en.lproj/Localizable.strings +++ b/en.lproj/Localizable.strings @@ -14,7 +14,9 @@ "always.on"="Always On"; "ambient.lighting"="Ambient Lighting"; "ambient.lighting.config"="Ambient Lighting Config"; -"app.settings"="App Settings"; +"appsettings"="App Settings"; +"appsettings.provide.location"="Share location"; +"appsettings.smartposition"="Smart Position"; "are.you.sure"="Are you sure?"; "ascii.capable"="ASCII Capable"; "available.radios"="Available Radios"; @@ -230,7 +232,6 @@ "position"="Position"; "position.config"="Position Config"; "preferred.radio"="Preferred Radio"; -"provide.location"="Share location"; "radio.configuration"="Radio Configuration"; "range.test"="Range Test"; "range.test.blocked"="Block Range Test"; diff --git a/pl.lproj/Localizable.strings b/pl.lproj/Localizable.strings index a734697b..bea348c0 100644 --- a/pl.lproj/Localizable.strings +++ b/pl.lproj/Localizable.strings @@ -16,7 +16,9 @@ "always.on"="Zawsze włączone"; "ambient.lighting"="Ambient Lighting"; "ambient.lighting.config"="Ambient Lighting Config"; -"app.settings"="Ustawienia aplikacji"; +"appsettings"="Ustawienia aplikacji"; +"appsettings.provide.location"="Udostępnij lokalizację"; +"appsettings.smartposition"="Smart Position"; "are.you.sure"="Jesteś pewny?"; "ascii.capable"="Zgodny z ASCII"; "available.radios"="Dostępne radia"; @@ -224,7 +226,6 @@ "position"="Pozycja"; "position.config"="Konfiguracja pozycji"; "preferred.radio"="Preferowane radio"; -"provide.location"="Udostępnij lokalizację"; "radio.configuration"="Konfiguracja radia"; "range.test"="Test zasięgu"; "range.test.blocked"="Block Range Test"; diff --git a/zh-Hans.lproj/Localizable.strings b/zh-Hans.lproj/Localizable.strings index 60079d48..178833e2 100644 --- a/zh-Hans.lproj/Localizable.strings +++ b/zh-Hans.lproj/Localizable.strings @@ -14,7 +14,9 @@ "always.on"="常亮"; "ambient.lighting"="Ambient Lighting"; "ambient.lighting.config"="Ambient Lighting Config"; -"app.settings"="通用设置"; +"appsettings"="通用设置"; +"appsettings.provide.location"="提供定位到 Mesh 网络"; +"appsettings.smartposition"="Smart Position"; "are.you.sure"="是否确认？"; "ascii.capable"="ASCII Capable"; "available.radios"="可以连接的电台"; @@ -223,7 +225,6 @@ "position"="定位"; "position.config"="定位配置"; "preferred.radio"="首选电台"; -"provide.location"="提供定位到 Mesh 网络"; "radio.configuration"="电台配置"; "range.test"="拉距测试"; "range.test.blocked"="区块范围测试";