|
@@ -1358,8 +1358,8 @@ private extension ViewController {
|
|
|
|
|
|
|
|
private func showSimpleAlert(title: String, message: String) {
|
|
private func showSimpleAlert(title: String, message: String) {
|
|
|
let alert = NSAlert()
|
|
let alert = NSAlert()
|
|
|
- alert.messageText = title.localized
|
|
|
|
|
- alert.informativeText = message.localized
|
|
|
|
|
|
|
+ alert.messageText = title
|
|
|
|
|
+ alert.informativeText = message
|
|
|
alert.addButton(withTitle: "OK".localized)
|
|
alert.addButton(withTitle: "OK".localized)
|
|
|
alert.runModal()
|
|
alert.runModal()
|
|
|
}
|
|
}
|
|
@@ -4667,15 +4667,17 @@ 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 = AppLanguageManager.systemLanguagePopupIdentifier
|
|
|
|
|
+
|
|
|
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
|
|
|
|
|
- ?? AppLanguageManager.availableLanguageCodes.first
|
|
|
|
|
- ?? "en"
|
|
|
|
|
- selectSettingsPageLanguage(identifier: selectedCode, in: popup)
|
|
|
|
|
|
|
+ let selectedIdentifier = AppLanguageManager.selectedLanguageCode
|
|
|
|
|
+ ?? AppLanguageManager.systemLanguagePopupIdentifier
|
|
|
|
|
+ selectSettingsPageLanguage(identifier: selectedIdentifier, in: popup)
|
|
|
settingsPageAppLanguagePopup = popup
|
|
settingsPageAppLanguagePopup = popup
|
|
|
|
|
|
|
|
row.addSubview(titleLabel)
|
|
row.addSubview(titleLabel)
|
|
@@ -4757,10 +4759,13 @@ private extension ViewController {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@objc private func settingsPageAppLanguageChanged(_ sender: NSPopUpButton) {
|
|
@objc private func settingsPageAppLanguageChanged(_ sender: NSPopUpButton) {
|
|
|
- let code = sender.selectedItem?.representedObject as? String
|
|
|
|
|
- ?? AppLanguageManager.availableLanguageCodes.first
|
|
|
|
|
- ?? "en"
|
|
|
|
|
- AppLanguageManager.setLanguage(code: code)
|
|
|
|
|
|
|
+ let identifier = sender.selectedItem?.representedObject as? String
|
|
|
|
|
+ ?? AppLanguageManager.systemLanguagePopupIdentifier
|
|
|
|
|
+ if identifier.isEmpty {
|
|
|
|
|
+ AppLanguageManager.setLanguage(code: nil)
|
|
|
|
|
+ } else {
|
|
|
|
|
+ AppLanguageManager.setLanguage(code: identifier)
|
|
|
|
|
+ }
|
|
|
reloadTheme()
|
|
reloadTheme()
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -10269,12 +10274,12 @@ private extension ViewController {
|
|
|
DispatchQueue.main.async {
|
|
DispatchQueue.main.async {
|
|
|
let alert = NSAlert()
|
|
let alert = NSAlert()
|
|
|
alert.alertStyle = .warning
|
|
alert.alertStyle = .warning
|
|
|
- alert.messageText = title.localized
|
|
|
|
|
|
|
+ alert.messageText = title
|
|
|
var lines: [String] = []
|
|
var lines: [String] = []
|
|
|
lines.append(error.localizedUserFacingMessage)
|
|
lines.append(error.localizedUserFacingMessage)
|
|
|
|
|
|
|
|
if let localizedError = error as? LocalizedError, let reason = localizedError.failureReason, reason.isEmpty == false {
|
|
if let localizedError = error as? LocalizedError, let reason = localizedError.failureReason, reason.isEmpty == false {
|
|
|
- lines.append(reason)
|
|
|
|
|
|
|
+ lines.append(reason.localized)
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
let nsError = error as NSError
|
|
let nsError = error as NSError
|