|
@@ -4659,14 +4659,14 @@ private extension ViewController {
|
|
|
popup.target = self
|
|
popup.target = self
|
|
|
popup.action = #selector(settingsPageAppLanguageChanged(_:))
|
|
popup.action = #selector(settingsPageAppLanguageChanged(_:))
|
|
|
|
|
|
|
|
- popup.addItem(withTitle: "System Language".localized)
|
|
|
|
|
- popup.lastItem?.representedObject = ""
|
|
|
|
|
for code in AppLanguageManager.availableLanguageCodes {
|
|
for code in AppLanguageManager.availableLanguageCodes {
|
|
|
popup.addItem(withTitle: AppLanguageManager.displayName(for: code))
|
|
popup.addItem(withTitle: AppLanguageManager.displayName(for: code))
|
|
|
popup.lastItem?.representedObject = code
|
|
popup.lastItem?.representedObject = code
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- let selectedCode = AppLanguageManager.selectedLanguageCode ?? ""
|
|
|
|
|
|
|
+ let selectedCode = AppLanguageManager.selectedLanguageCode
|
|
|
|
|
+ ?? AppLanguageManager.availableLanguageCodes.first
|
|
|
|
|
+ ?? "en"
|
|
|
selectSettingsPageLanguage(identifier: selectedCode, in: popup)
|
|
selectSettingsPageLanguage(identifier: selectedCode, in: popup)
|
|
|
settingsPageAppLanguagePopup = popup
|
|
settingsPageAppLanguagePopup = popup
|
|
|
|
|
|
|
@@ -4748,8 +4748,9 @@ private extension ViewController {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@objc private func settingsPageAppLanguageChanged(_ sender: NSPopUpButton) {
|
|
@objc private func settingsPageAppLanguageChanged(_ sender: NSPopUpButton) {
|
|
|
- let raw = sender.selectedItem?.representedObject as? String ?? ""
|
|
|
|
|
- let code: String? = raw.isEmpty ? nil : raw
|
|
|
|
|
|
|
+ let code = sender.selectedItem?.representedObject as? String
|
|
|
|
|
+ ?? AppLanguageManager.availableLanguageCodes.first
|
|
|
|
|
+ ?? "en"
|
|
|
AppLanguageManager.setLanguage(code: code)
|
|
AppLanguageManager.setLanguage(code: code)
|
|
|
reloadTheme()
|
|
reloadTheme()
|
|
|
}
|
|
}
|