From df1adcfcfbc2e5f3b2814b3cddbab97a2838c30e Mon Sep 17 00:00:00 2001 From: "Reece H. Dunn" Date: Wed, 16 Jan 2013 18:27:07 +0000 Subject: [PATCH] Use zh-HK for Cantonese Chinese as Android does not properly support the yue language code. --- .../eSpeakTests/src/com/reecedunn/espeak/test/VoiceData.java | 4 ++-- android/src/com/reecedunn/espeak/SpeechSynthesis.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/android/eSpeakTests/src/com/reecedunn/espeak/test/VoiceData.java b/android/eSpeakTests/src/com/reecedunn/espeak/test/VoiceData.java index ec963111..4c49cd48 100644 --- a/android/eSpeakTests/src/com/reecedunn/espeak/test/VoiceData.java +++ b/android/eSpeakTests/src/com/reecedunn/espeak/test/VoiceData.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Reece H. Dunn + * Copyright (C) 2012-2013 Reece H. Dunn * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -200,6 +200,6 @@ public class VoiceData new Voice("vi", "vi", "vi", "vie", "", "", "", SpeechSynthesis.GENDER_MALE, "Vietnamese", "vi", "Đây là mẫu văn bản được đọc bằng Tiếng Việt"), new Voice("wo", "test/wo", "wo", "wol", "", "", "", SpeechSynthesis.GENDER_UNSPECIFIED, "Wolof", "wo", "This is a sample of text spoken in Wolof"), new Voice("zh", "zh", "zh", "zho", "", "", "", SpeechSynthesis.GENDER_MALE, "Chinese (Mandarin)", "zh", "This is a sample of text spoken in 中文"), - new Voice("zh-yue", "zh-yue", "yue", "", "", "", "", SpeechSynthesis.GENDER_MALE, "Chinese (Cantonese)", "yue", "This is a sample of text spoken in 中文"), + new Voice("zh-yue", "zh-yue", "zh", "zho", "HK", "HKG", "", SpeechSynthesis.GENDER_MALE, "Chinese (Cantonese)", "zh-HK", "This is a sample of text spoken in 中文 (中華人民共和國香港特別行政區)"), }; } diff --git a/android/src/com/reecedunn/espeak/SpeechSynthesis.java b/android/src/com/reecedunn/espeak/SpeechSynthesis.java index f248ffcc..336ba05c 100644 --- a/android/src/com/reecedunn/espeak/SpeechSynthesis.java +++ b/android/src/com/reecedunn/espeak/SpeechSynthesis.java @@ -245,7 +245,7 @@ public class SpeechSynthesis { locale = new Locale("hy", "", "arevmda"); } else if (name.equals("zh-yue")) { // Android/Java does not support macrolanguages. - locale = new Locale("yue"); + locale = new Locale("zh", "HK"); } else { String[] parts = name.split("-"); switch (parts.length) {