Fix setting voice and language

Author: mickael-menu

Sources/Navigator/TTS/AVTTSEngine.swift

@@ -79,7 +79,7 @@ public class AVTTSEngine: NSObject, TTSEngine, AVSpeechSynthesizerDelegate, Logg
 
     private func voice(for utterance: TTSUtterance) -> AVSpeechSynthesisVoice? {
         let language = utterance.language ?? config.defaultLanguage
-        if let voice = config.voice, voice.language == language {
+        if let voice = config.voice, voice.language.removingRegion() == language.removingRegion() {
             return AVSpeechSynthesisVoice(identifier: voice.identifier)
         } else {
             return AVSpeechSynthesisVoice(language: language)

Sources/Navigator/TTS/TTSEngine.swift

@@ -24,7 +24,10 @@ public protocol TTSEngineDelegate: AnyObject {
 
 public struct TTSConfiguration {
     public var defaultLanguage: Language {
-        didSet { voice = nil }
+        didSet {
+            defaultLanguage = defaultLanguage.removingRegion()
+            voice = nil
+        }
     }
     public var rate: Double
     public var pitch: Double
@@ -38,7 +41,7 @@ public struct TTSConfiguration {
         voice: TTSVoice? = nil,
         delay: TimeInterval = 0
     ) {
-        self.defaultLanguage = defaultLanguage
+        self.defaultLanguage = defaultLanguage.removingRegion()
         self.rate = rate
         self.pitch = pitch
         self.voice = voice

Sources/Shared/Toolkit/Language.swift

@@ -21,24 +21,40 @@ public struct Language: Hashable {
                 return code
             }
         }
+
+        public func removingRegion() -> Code {
+            .bcp47(String(bcp47.prefix { $0 != "-" && $0 != "_" }))
+        }
     }
 
     public let code: Code
 
     public var locale: Locale { Locale(identifier: code.bcp47) }
 
-    public var localizedName: String {
-        Locale.current.localizedString(forIdentifier: code.bcp47)
+    public func localizedDescription(in locale: Locale = Locale.current) -> String {
+        locale.localizedString(forIdentifier: code.bcp47)
             ?? code.bcp47
     }
 
+    public func localizedLanguage(in targetLocale: Locale = Locale.current) -> String? {
+        locale.languageCode.flatMap { targetLocale.localizedString(forLanguageCode: $0) }
+    }
+
+    public func localizedRegion(in targetLocale: Locale = Locale.current) -> String? {
+        locale.regionCode.flatMap { targetLocale.localizedString(forRegionCode: $0) }
+    }
+
     public init(code: Code) {
         self.code = code
     }
 
     public init(locale: Locale) {
         self.init(code: .bcp47(locale.identifier))
     }
+
+    public func removingRegion() -> Language {
+        Language(code: code.removingRegion())
+    }
 }
 
 extension Language: CustomStringConvertible {

TestApp/Sources/Reader/Common/TTS/TTSView.swift

@@ -87,14 +87,14 @@ struct TTSSettings: View {
                     caption: "Language",
                     for: \.defaultLanguage,
                     choices: viewModel.availableLanguages,
-                    choiceLabel: { $0.localizedName }
+                    choiceLabel: { $0.localizedDescription() }
                 )
 
                 ConfigPicker(
                     caption: "Voice",
                     for: \.voice,
-                    choices: viewModel.availableVoices(for: viewModel.config.defaultLanguage),
-                    choiceLabel: { $0?.name ?? "Default" }
+                    choices: viewModel.availableVoices,
+                    choiceLabel: { $0.localizedDescription() }
                 )
             }
         }
@@ -143,3 +143,16 @@ struct TTSSettings: View {
         }
     }
 }
+
+private extension Optional where Wrapped == TTSVoice {
+    func localizedDescription() -> String {
+        guard case let .some(voice) = self else {
+            return "Default"
+        }
+        var desc = voice.name
+        if let region = voice.language.localizedRegion() {
+            desc += " (\(region))"
+        }
+        return desc
+    }
+}

TestApp/Sources/Reader/Common/TTS/TTSViewModel.swift

@@ -58,15 +58,16 @@ final class TTSViewModel: ObservableObject, Loggable {
 
     var defaultConfig: TTSConfiguration { tts.defaultConfig }
 
-    func availableVoices(for language: Language) -> [TTSVoice?] {
-        [nil] + tts.availableVoices.filter { $0.language == language }
+    var availableVoices: [TTSVoice?] {
+        [nil] + tts.availableVoices
+            .filter { $0.language.removingRegion() == config.defaultLanguage }
     }
 
     lazy var availableLanguages: [Language] =
         tts.availableVoices
-            .map { $0.language }
+            .map { $0.language.removingRegion() }
             .removingDuplicates()
-            .sorted { $0.localizedName < $1.localizedName }
+            .sorted { $0.localizedDescription() < $1.localizedDescription() }
 
     @objc func play() {
         navigator.findLocationOfFirstVisibleContent { [self] locator in