mirror of
https://github.com/permissionlesstech/bitchat.git
synced 2026-07-26 01:25:20 +00:00
Add Persian (fa) localization and an in-app language picker (#1443)
* Add Persian (fa) localization and an in-app language picker Persian was the one notable gap in the 29-language catalog. Translate all 381 strings (plus the share extension) with proper plural substitutions, and register fa in knownRegions. Settings gains a LANGUAGE section: a picker over every language the bundle ships (native names via Locale), backed by an AppleLanguages override so users can run bitchat in a language different from the device's. Localization resolves at process start, so the picker surfaces a restart note. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * Remove unused AppLanguageSettings.currentOverride (Periphery) AppInfoView reads the override via @AppStorage, so the accessor was dead code and failed the Periphery CI scan. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> --------- Co-authored-by: Claude Fable 5 <noreply@anthropic.com> Co-authored-by: jack <jackjackbits@users.noreply.github.com> Co-authored-by: jack <212554440+jackjackbits@users.noreply.github.com>
This commit is contained in:
Rod Bahmanyari
co-authored by
Claude Fable 5
jack
jack
Claude Fable 5
jack
jack
parent
593fd7d737
commit
ca18843bb0
Generated
+1
@@ -337,6 +337,7 @@
|
||||
es,
|
||||
ar,
|
||||
de,
|
||||
fa,
|
||||
fr,
|
||||
he,
|
||||
id,
|
||||
|
||||
+3099
-1
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,40 @@
|
||||
import Foundation
|
||||
|
||||
/// In-app override for the UI language, on top of the system per-app
|
||||
/// language. Apple resolves localization from the AppleLanguages default at
|
||||
/// process start, so a new choice takes effect on the next launch — callers
|
||||
/// surface a "restart to apply" note after changing it.
|
||||
enum AppLanguageSettings {
|
||||
/// "" means no override: follow the device (or per-app system) language.
|
||||
static let overrideKey = "app.languageOverride"
|
||||
private static let appleLanguagesKey = "AppleLanguages"
|
||||
|
||||
/// Language codes the app ships translations for, straight from the
|
||||
/// built bundle so this never drifts from the string catalog.
|
||||
static var availableLanguages: [String] {
|
||||
Bundle.main.localizations
|
||||
.filter { $0 != "Base" }
|
||||
.sorted { endonym(for: $0).localizedCaseInsensitiveCompare(endonym(for: $1)) == .orderedAscending }
|
||||
}
|
||||
|
||||
/// The language's name in that language ("فارسی", "한국어") so every user
|
||||
/// can find their own entry regardless of the current UI language.
|
||||
static func endonym(for code: String) -> String {
|
||||
let locale = Locale(identifier: code)
|
||||
let name = locale.localizedString(forIdentifier: code) ?? code
|
||||
return name.lowercased(with: locale)
|
||||
}
|
||||
|
||||
/// Persists the override (nil clears it). AppleLanguages drives the
|
||||
/// actual localization lookup on next launch.
|
||||
static func setOverride(_ code: String?) {
|
||||
let defaults = UserDefaults.standard
|
||||
if let code, !code.isEmpty {
|
||||
defaults.set(code, forKey: overrideKey)
|
||||
defaults.set([code], forKey: appleLanguagesKey)
|
||||
} else {
|
||||
defaults.removeObject(forKey: overrideKey)
|
||||
defaults.removeObject(forKey: appleLanguagesKey)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -26,6 +26,10 @@ struct AppInfoView: View {
|
||||
/// introduction), and afterwards the sheet reopens wherever it was left.
|
||||
@AppStorage("appInfo.selectedPane") private var selectedPane: Pane = .info
|
||||
@State private var showPanicConfirmation = false
|
||||
@AppStorage(AppLanguageSettings.overrideKey) private var languageOverride = ""
|
||||
/// The override changed this session; localization resolves at process
|
||||
/// start, so surface the restart hint.
|
||||
@State private var showLanguageRestartNote = false
|
||||
|
||||
private enum Pane: String {
|
||||
case settings
|
||||
@@ -55,6 +59,11 @@ struct AppInfoView: View {
|
||||
|
||||
static let connectivityTitle = String(localized: "app_info.settings.connectivity.title", defaultValue: "CONNECTIVITY", comment: "Section header (uppercase) for the connectivity toggles: mesh bridge, internet gateway, tor routing")
|
||||
|
||||
static let languageTitle = String(localized: "app_info.settings.language.title", defaultValue: "LANGUAGE", comment: "Section header (uppercase) for the app language picker in settings")
|
||||
static let languagePickerLabel = String(localized: "app_info.settings.language.picker_label", defaultValue: "app language", comment: "Label of the app language picker row in settings")
|
||||
static let languageSystem = String(localized: "app_info.settings.language.system", defaultValue: "system default", comment: "Menu option that clears the in-app language override so the app follows the device language")
|
||||
static let languageRestartNote = String(localized: "app_info.settings.language.restart_note", defaultValue: "restart bitchat to apply the new language", comment: "Caption shown after the user picks a different app language; the change takes effect on next launch")
|
||||
|
||||
static let bridgeTitle = String(localized: "app_info.settings.bridge.title", defaultValue: "mesh bridge", comment: "Title of the mesh bridge toggle in settings")
|
||||
static let bridgeSubtitle = String(localized: "app_info.settings.bridge.subtitle", defaultValue: "joins nearby mesh islands over the internet: what you say in the mesh channel also reaches people in your area beyond radio range, and their messages appear here marked with the network glyph. while you have internet, your device also carries bridge and location-channel traffic for phones around you that have none.", comment: "Subtitle explaining what the mesh bridge toggle does")
|
||||
static func bridgeCell(_ cell: String) -> String {
|
||||
@@ -313,6 +322,52 @@ struct AppInfoView: View {
|
||||
}
|
||||
}
|
||||
|
||||
// Language — an in-app override so the UI language can differ
|
||||
// from the device language (takes effect on next launch).
|
||||
VStack(alignment: .leading, spacing: 12) {
|
||||
SectionHeader(verbatim: Strings.Settings.languageTitle)
|
||||
|
||||
settingsCard {
|
||||
Menu {
|
||||
Button {
|
||||
selectLanguage(nil)
|
||||
} label: {
|
||||
menuItemLabel(Strings.Settings.languageSystem, isSelected: languageOverride.isEmpty)
|
||||
}
|
||||
Divider()
|
||||
ForEach(AppLanguageSettings.availableLanguages, id: \.self) { code in
|
||||
Button {
|
||||
selectLanguage(code)
|
||||
} label: {
|
||||
menuItemLabel(AppLanguageSettings.endonym(for: code), isSelected: languageOverride == code)
|
||||
}
|
||||
}
|
||||
} label: {
|
||||
HStack {
|
||||
Text(Strings.Settings.languagePickerLabel)
|
||||
.bitchatFont(size: 12, weight: .semibold)
|
||||
.foregroundColor(textColor)
|
||||
Spacer()
|
||||
Text(languageOverride.isEmpty ? Strings.Settings.languageSystem : AppLanguageSettings.endonym(for: languageOverride))
|
||||
.bitchatFont(size: 12)
|
||||
.foregroundColor(palette.accent)
|
||||
Image(systemName: "chevron.up.chevron.down")
|
||||
.font(.system(size: 10))
|
||||
.foregroundColor(secondaryTextColor)
|
||||
}
|
||||
.contentShape(Rectangle())
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
|
||||
if showLanguageRestartNote {
|
||||
Text(Strings.Settings.languageRestartNote)
|
||||
.bitchatFont(size: 11)
|
||||
.foregroundColor(secondaryTextColor)
|
||||
.fixedSize(horizontal: false, vertical: true)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Voice — same card + IRC pill as every other toggle setting.
|
||||
VStack(alignment: .leading, spacing: 12) {
|
||||
SectionHeader(Strings.Voice.title)
|
||||
@@ -458,6 +513,24 @@ struct AppInfoView: View {
|
||||
.padding()
|
||||
}
|
||||
|
||||
private func selectLanguage(_ code: String?) {
|
||||
let previous = languageOverride
|
||||
AppLanguageSettings.setOverride(code)
|
||||
languageOverride = code ?? ""
|
||||
if languageOverride != previous {
|
||||
showLanguageRestartNote = true
|
||||
}
|
||||
}
|
||||
|
||||
private func menuItemLabel(_ title: String, isSelected: Bool) -> some View {
|
||||
HStack {
|
||||
Text(title)
|
||||
if isSelected {
|
||||
Image(systemName: "checkmark")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private var bridgeToggleBinding: Binding<Bool> {
|
||||
Binding(
|
||||
get: { bridgeService.isEnabled },
|
||||
|
||||
@@ -38,6 +38,12 @@
|
||||
"comment" : "Fallback title when saving a shared link"
|
||||
}
|
||||
},
|
||||
"fa" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "پیوند اشتراکگذاریشده"
|
||||
}
|
||||
},
|
||||
"fil" : {
|
||||
"stringUnit" : {
|
||||
"state" : "needs_review",
|
||||
@@ -233,6 +239,12 @@
|
||||
"comment" : "Shown when the share payload cannot be encoded"
|
||||
}
|
||||
},
|
||||
"fa" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "کدگذاری پیوند ناموفق بود"
|
||||
}
|
||||
},
|
||||
"fil" : {
|
||||
"stringUnit" : {
|
||||
"state" : "needs_review",
|
||||
@@ -428,6 +440,12 @@
|
||||
"comment" : "Shown when provided content cannot be shared"
|
||||
}
|
||||
},
|
||||
"fa" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "محتوای قابل اشتراکگذاری وجود ندارد"
|
||||
}
|
||||
},
|
||||
"fil" : {
|
||||
"stringUnit" : {
|
||||
"state" : "needs_review",
|
||||
@@ -623,6 +641,12 @@
|
||||
"comment" : "Shown when the share extension receives no content"
|
||||
}
|
||||
},
|
||||
"fa" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "چیزی برای اشتراکگذاری نیست"
|
||||
}
|
||||
},
|
||||
"fil" : {
|
||||
"stringUnit" : {
|
||||
"state" : "needs_review",
|
||||
@@ -818,6 +842,12 @@
|
||||
"comment" : "Confirmation after successfully sharing a link"
|
||||
}
|
||||
},
|
||||
"fa" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "✓ پیوند در bitchat به اشتراک گذاشته شد"
|
||||
}
|
||||
},
|
||||
"fil" : {
|
||||
"stringUnit" : {
|
||||
"state" : "needs_review",
|
||||
@@ -1013,6 +1043,12 @@
|
||||
"comment" : "Confirmation after successfully sharing text"
|
||||
}
|
||||
},
|
||||
"fa" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "✓ متن در bitchat به اشتراک گذاشته شد"
|
||||
}
|
||||
},
|
||||
"fil" : {
|
||||
"stringUnit" : {
|
||||
"state" : "needs_review",
|
||||
|
||||
Reference in New Issue
Block a user