scratchfoundation/scratch-vm
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-vm.git synced 2024-12-24 06:52:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

WIP updating to use new language info data

Browse source
This commit is contained in:
Eric Rosenbaum 2019-03-05 15:11:14 -05:00
parent bc9e215ee8
commit ab633d3448
1 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/extensions/scratch3_text2speech/index.js
View file

@ -453,8 +453,8 @@ class Scratch3Text2SpeechBlocks {
} }
/** /**
* Get the language for speech synthesis. * Get the language code currently set for the extension.
* @returns {string} the language code. * @returns {string} a Scratch locale code.
*/ */
getCurrentLanguage () { getCurrentLanguage () {
const stage = this.runtime.getTargetForStage(); const stage = this.runtime.getTargetForStage();
@ -467,9 +467,9 @@ class Scratch3Text2SpeechBlocks {
} }
/** /**
* Set the language for speech synthesis. * Set the language code for the extension.
* It is stored in the stage so it can be saved and loaded with the project. * It is stored in the stage so it can be saved and loaded with the project.
* @param {string} languageCode a locale code to set. * @param {string} languageCode a Scratch locale code.
*/ */
setCurrentLanguage (languageCode) { setCurrentLanguage (languageCode) {
const stage = this.runtime.getTargetForStage(); const stage = this.runtime.getTargetForStage();
@ -486,6 +486,19 @@ class Scratch3Text2SpeechBlocks {
} }
} }
/**
* Get the locale code used by the speech synthesis server corresponding to
* the current language code set for the extension.
* @returns {string} the speech synthesis locale.
*/
_getSpeechSynthLocale () {
let speechSynthLocale = this.LANGUAGE_INFO[this.DEFAULT_LANGUAGE].speechSynthLocale;
if (this.LANGUAGE_INFO[this.getCurrentLanguage()]) {
speechSynthLocale = this.LANGUAGE_INFO[this.getCurrentLanguage()].speechSynthLocale;
}
return speechSynthLocale;
}
/** /**
* Check if a language code is in the list of supported languages for the * Check if a language code is in the list of supported languages for the
* speech synthesis service. * speech synthesis service.
@ -568,13 +581,16 @@ class Scratch3Text2SpeechBlocks {
speakAndWait (args, util) { speakAndWait (args, util) {
// Cast input to string // Cast input to string
let words = Cast.toString(args.WORDS); let words = Cast.toString(args.WORDS);
let locale = this.localeToPolly(this.getCurrentLanguage()); let locale = this._getSpeechSynthLocale();
const state = this._getState(util.target); const state = this._getState(util.target);
let gender = this.VOICE_INFO[state.voiceId].gender; let gender = this.VOICE_INFO[state.voiceId].gender;
let playbackRate = this.VOICE_INFO[state.voiceId].playbackRate; let playbackRate = this.VOICE_INFO[state.voiceId].playbackRate;
// Special case for voices where the synthesis service only provides a
// single gender voice. In that case, always request the female voice,
// and set special playback rates for the tenor and giant voices.
if (this.LANGUAGE_INFO[this.getCurrentLanguage()].singleGender) { if (this.LANGUAGE_INFO[this.getCurrentLanguage()].singleGender) {
gender = 'female'; gender = 'female';
if (state.voiceId === TENOR_ID) { if (state.voiceId === TENOR_ID) {
@ -587,7 +603,7 @@ class Scratch3Text2SpeechBlocks {
if (state.voiceId === KITTEN_ID) { if (state.voiceId === KITTEN_ID) {
words = words.replace(/\S+/g, 'meow'); words = words.replace(/\S+/g, 'meow');
locale = 'en-US'; locale = this.LANGUAGE_INFO[this.DEFAULT_LANGUAGE].speechSynthLocale;
} }
// Build up URL // Build up URL