Select the TTS voice using locale matching based on RFC 4647. Fixes #…

…2352 (#4197) Signed-off-by: Henning Treu <henning.treu@telekom.de>
eclipse-archived · Sep 5, 2017 · 89a78cb · 89a78cb
1 parent 0704122
commit 89a78cb
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/....core.voice/src/main/java/org/eclipse/smarthome/core/voice/internal/VoiceManagerImpl.java b/....core.voice/src/main/java/org/eclipse/smarthome/core/voice/internal/VoiceManagerImpl.java
@@ -97,7 +97,8 @@ protected void modified(Map<String, Object> config) {
         if (config != null) {
             this.keyword = config.containsKey(CONFIG_KEYWORD) ? config.get(CONFIG_KEYWORD).toString() : DEFAULT_KEYWORD;
             this.listeningItem = config.containsKey(CONFIG_LISTENING_ITEM)
-                    ? config.get(CONFIG_LISTENING_ITEM).toString() : null;
+                    ? config.get(CONFIG_LISTENING_ITEM).toString()
+                    : null;
             this.defaultTTS = config.containsKey(CONFIG_DEFAULT_TTS) ? config.get(CONFIG_DEFAULT_TTS).toString() : null;
             this.defaultSTT = config.containsKey(CONFIG_DEFAULT_STT) ? config.get(CONFIG_DEFAULT_STT).toString() : null;
             this.defaultKS = config.containsKey(CONFIG_DEFAULT_KS) ? config.get(CONFIG_DEFAULT_KS).toString() : null;
@@ -339,15 +340,13 @@ public Voice getPreferredVoice(Set<Voice> voices) {
             locales.add(currentVoice.getLocale());
         }
 
-        // TODO: This can be activated for Java 8
         // Determine preferred locale based on RFC 4647
-        // String ranges = locale.toLanguageTag();
-        // List<Locale.LanguageRange> languageRanges = Locale.LanguageRange.parse(ranges);
-        // Locale preferedLocale = Locale.lookup(languageRanges,locales);
-        Locale preferredLocale = locale;
+        String ranges = locale.toLanguageTag();
+        List<Locale.LanguageRange> languageRanges = Locale.LanguageRange.parse(ranges + "-*");
+        Locale preferredLocale = Locale.lookup(languageRanges, locales);
 
         // As a last resort choose some Locale
-        if (null == preferredLocale) {
+        if (preferredLocale == null) {
             preferredLocale = locales.iterator().next();
         }