Merge pull request #93 from FolioReader/feature/tts-voice-language-#87

Closes #87 TTS voice language
FolioReader · Jul 12, 2016 · ef3f317 · ef3f317
2 parents 2398d4f + edab660
commit ef3f317
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/Source/EPUBCore/FREpubParser.swift b/Source/EPUBCore/FREpubParser.swift
@@ -253,7 +253,8 @@ class FREpubParser: NSObject, SSZipArchiveDelegate {
             }
 
             if tag.name == "dc:language" {
-                metadata.language = tag.value ?? ""
+                let language = tag.value ?? metadata.language
+                metadata.language = language != "en" ? language : metadata.language
             }
 
             if tag.name == "dc:creator" {

diff --git a/Source/EPUBCore/FRMetadata.swift b/Source/EPUBCore/FRMetadata.swift
@@ -85,7 +85,7 @@ class FRMetadata: NSObject {
     var creators = [Author]()
     var contributors = [Author]()
     var dates = [Date]()
-    var language = "en"
+    var language = "en-US"
     var titles = [String]()
     var identifiers = [Identifier]()
     var subjects = [String]()

diff --git a/Source/FolioReaderAudioPlayer.swift b/Source/FolioReaderAudioPlayer.swift
@@ -348,6 +348,8 @@ class FolioReaderAudioPlayer: NSObject, AVAudioPlayerDelegate, AVSpeechSynthesiz
 
         let utterance = AVSpeechUtterance(string: text)
         utterance.rate = utteranceRate
+        utterance.voice = AVSpeechSynthesisVoice(language: book.metadata.language)
+
         if(synthesizer.speaking){
             synthesizer.stopSpeakingAtBoundary(AVSpeechBoundary.Word)
         }