mirror of
https://github.com/permissionlesstech/bitchat.git
synced 2026-07-25 03:05:19 +00:00
* Automated update of relay data - Sun Sep 21 06:26:33 UTC 2025
* chore(l10n): add empty string catalogs
* chore(l10n): populate string catalogs from legacy resources
* test(l10n): add catalog guardrail suite
* chore(l10n): remove legacy localization files
* fix: Add localization resources to Package.swift targets
- Add .process("Localization") to bitchat target resources
- Add .process("Localization") to bitchatTests target resources
- Resolves Bundle.module resource loading for localization files
- Enables proper localization testing in Swift Package Manager builds
* feat: Add Korean localization and convert to UTF-8 format
Korean Language Support:
- Add complete Korean (ko) localization with 191 strings from PR #686
- Include all app strings: UI, features, system messages, alerts
- Include all share extension strings: status messages, errors
- Verified 100% translation coverage for Korean locale
UTF-8 Format Conversion:
- Convert 23,047 Unicode escape sequences to readable UTF-8 characters
- Transform \u sequences (e.g. \u0625\u063a\u0644\u0627\u0642) to native text (إغلاق)
- Improve maintainability across all 15 supported locales
- Preserve all existing translations while enhancing readability
Locales supported: en, ar, de, es, fr, he, id, it, ja, ko, ne, pt-BR, ru, uk, zh-Hans
* test: Enhance dynamic localization test framework
Dynamic Test Framework:
- Replace hardcoded locale tests with data-driven approach
- Add testLocalizationExpectedValues() for dynamic locale validation
- Add testConfiguredLocalesCompleteness() for coverage verification
- Tests now read configuration from PrimaryLocalizationKeys.json
Expanded Test Coverage:
- Increase from 14 to 33 key validations (135% increase)
- Add critical UI strings: common actions, app info, security, sharing
- Cover 364 total string validations across 15 locales
- Include Korean validation with native Korean expected values
Test Categories Added:
- Common UI: cancel, close, copy actions
- App Info: encryption, offline features, app name
- Bluetooth: permission and settings alerts
- Security: verification badges and actions
- Share Extension: all status and error messages
- Content Actions: accessibility and user actions
Maintains 100% test success rate across all supported locales.
* fix: Convert plural strings to correct xcstrings format
Three plural strings (content.accessibility.people_count,
location_channels.row_title, location_notes.header) were using
incorrect format causing runtime String(format:) errors.
Migrated from stringUnit.variations structure to proper
substitutions.variations format across all 14 languages.
* refactor(l10n): migrate to native String(localized:) APIs
Remove L10n.string wrapper in favor of Swift's native localization APIs.
Migrate 100+ localization call sites to use String(localized:) and String(localized:defaultValue:) with string interpolation.
- Update catalog to use interpolation syntax (\(var)) instead of format specifiers (%@)
- Migrate simple strings to String(localized:)
- Migrate strings with arguments to String(localized:defaultValue:) with interpolation
- Keep format strings for plural substitutions (String(format:locale:))
- Remove bitchat/Utils/Localization.swift
Net result: -407 insertions, +130 deletions across 15 files
* fix(l10n): correct interpolation to use format strings
Interpolation in String(localized:defaultValue:) doesn't work as expected -
the interpolation happens at the call site before localization lookup.
Convert dynamic strings to use String(format:String(localized:),args) pattern:
- Update catalog entries from \(var) syntax to %@ placeholders
- Wrap String(localized:) calls with String(format:locale:) for dynamic values
- Affects 17 strings across 6 files
This fixes UI showing literal "\(geohash)" text instead of actual values.
* chore(l10n): remove invalid catalog entries
Remove auto-extracted literal strings (@, #, ✔︎, @%@, bitchat/) that were
generated without proper localization structure. These caused test
decoding failures.
* fix(l10n): remove unused auto-extracted format string
Remove '%@/%@' key that was auto-extracted by Xcode but never used.
This key only existed in English causing locale parity test failures
across all 13 other languages.
Fixes locale parity tests - all 8 localization tests now pass with
only expected failures (incomplete translations in some locales).
* fix(l10n): copy format string to all locales for 100% completion
Add %@/%@ format string to all 14 non-English locales. Format strings
are locale-independent so using the same value everywhere is correct.
This brings all locales to 100% completion (189/189 strings) to prevent
Xcode from reporting incomplete translations when building.
* fix(l10n): prevent auto-extraction of UI literals
Use Text(verbatim:) for non-localizable UI elements:
- App branding ("bitchat/")
- Symbols (@, #, ✔︎)
- Dynamic usernames (@username)
- Count ratios (reached/total)
This prevents Xcode from auto-extracting these literals into the
String Catalog when building through Xcode GUI, which was causing
locales to show 96% completion instead of 100%.
* chore(l10n): remove auto-extracted UI literal entries
Delete 5 auto-extracted keys from catalog that are now using Text(verbatim:):
- @, #, ✔︎, %@, %@/%@
These were showing as stale/incomplete in Xcode causing 97% completion.
All locales now at 100% (188/188 strings).
* fix(l10n): prevent AttributedString from extracting @ symbol
Use string interpolation "\\(at)" instead of literal "@" in
AttributedString to prevent Xcode from auto-extracting it to the
String Catalog during build.
This was the last string causing locales to show 99% instead of 100%.
* fix(l10n): add %@ as non-translatable key in all locales
Mark %@ as non-translatable and add to all 15 locales with same value.
This prevents Xcode from showing incomplete translations when it
auto-extracts this format specifier during GUI builds.
All locales remain at 100% (189/189 strings).
* refactor: move Localizable.xcstrings to bitchat root
Move bitchat/Localization/Localizable.xcstrings to bitchat/ (after LaunchScreen)
and remove empty Localization directory.
* fix(test): update catalog path in localization tests
Update test paths from bitchat/Localization/Localizable.xcstrings to
bitchat/Localizable.xcstrings after moving the file.
---------
Co-authored-by: GitHub Action <action@github.com>
Co-authored-by: jack <jackjackbits@users.noreply.github.com>
120 lines
3.9 KiB
Swift
120 lines
3.9 KiB
Swift
import Foundation
|
|
|
|
/// Levels of location channels mapped to geohash precisions.
|
|
enum GeohashChannelLevel: CaseIterable, Codable, Equatable {
|
|
case building
|
|
case block
|
|
case neighborhood
|
|
case city
|
|
case province // previously .region
|
|
case region // previously .country
|
|
|
|
/// Geohash length used for this level.
|
|
var precision: Int {
|
|
switch self {
|
|
case .building: return 8
|
|
case .block: return 7
|
|
case .neighborhood: return 6
|
|
case .city: return 5
|
|
case .province: return 4
|
|
case .region: return 2
|
|
}
|
|
}
|
|
|
|
var displayName: String {
|
|
switch self {
|
|
case .building:
|
|
return String(localized: "location_levels.building", comment: "Name for building-level location channel")
|
|
case .block:
|
|
return String(localized: "location_levels.block", comment: "Name for block-level location channel")
|
|
case .neighborhood:
|
|
return String(localized: "location_levels.neighborhood", comment: "Name for neighborhood-level location channel")
|
|
case .city:
|
|
return String(localized: "location_levels.city", comment: "Name for city-level location channel")
|
|
case .province:
|
|
return String(localized: "location_levels.province", comment: "Name for province-level location channel")
|
|
case .region:
|
|
return String(localized: "location_levels.region", comment: "Name for region-level location channel")
|
|
}
|
|
}
|
|
}
|
|
// Backward-compatible Codable for renamed cases
|
|
extension GeohashChannelLevel {
|
|
init(from decoder: Decoder) throws {
|
|
let container = try decoder.singleValueContainer()
|
|
if let raw = try? container.decode(String.self) {
|
|
switch raw {
|
|
case "building": self = .building
|
|
case "block": self = .block
|
|
case "neighborhood": self = .neighborhood
|
|
case "city": self = .city
|
|
case "region": self = .province // old "region" maps to new .province
|
|
case "country": self = .region // old "country" maps to new .region
|
|
case "province": self = .province
|
|
default:
|
|
self = .block
|
|
}
|
|
} else if let precision = try? container.decode(Int.self) {
|
|
switch precision {
|
|
case 8: self = .building
|
|
case 7: self = .block
|
|
case 6: self = .neighborhood
|
|
case 5: self = .city
|
|
case 4: self = .province
|
|
case 0...3: self = .region
|
|
default: self = .block
|
|
}
|
|
} else {
|
|
self = .block
|
|
}
|
|
}
|
|
|
|
func encode(to encoder: Encoder) throws {
|
|
var container = encoder.singleValueContainer()
|
|
switch self {
|
|
case .building: try container.encode("building")
|
|
case .block: try container.encode("block")
|
|
case .neighborhood: try container.encode("neighborhood")
|
|
case .city: try container.encode("city")
|
|
case .province: try container.encode("province")
|
|
case .region: try container.encode("region")
|
|
}
|
|
}
|
|
}
|
|
|
|
/// A computed geohash channel option.
|
|
struct GeohashChannel: Codable, Equatable, Hashable, Identifiable {
|
|
let level: GeohashChannelLevel
|
|
let geohash: String
|
|
|
|
var id: String { "\(level)-\(geohash)" }
|
|
|
|
var displayName: String {
|
|
"\(level.displayName) • \(geohash)"
|
|
}
|
|
}
|
|
|
|
/// Identifier for current public chat channel (mesh or a location geohash).
|
|
enum ChannelID: Equatable, Codable {
|
|
case mesh
|
|
case location(GeohashChannel)
|
|
|
|
/// Human readable name for UI.
|
|
var displayName: String {
|
|
switch self {
|
|
case .mesh:
|
|
return "Mesh"
|
|
case .location(let ch):
|
|
return ch.displayName
|
|
}
|
|
}
|
|
|
|
/// Nostr tag value for scoping (geohash), if applicable.
|
|
var nostrGeohashTag: String? {
|
|
switch self {
|
|
case .mesh: return nil
|
|
case .location(let ch): return ch.geohash
|
|
}
|
|
}
|
|
}
|