scratchfoundation/scratch-vm
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-vm.git synced 2025-01-11 10:39:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #1573 from ericrosenbaum/feature/no-puppy

Browse source 
Bark bark woof ruff bark. Bark bark bark! (remove puppy voice)
This commit is contained in:
Andrew Sliwinski 2018-09-12 16:40:29 -04:00 committed by GitHub
commit c00d70a470
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -50,11 +50,6 @@ const MONSTER_ID = 'MONSTER';
*/ */
const KITTEN_ID = 'KITTEN'; const KITTEN_ID = 'KITTEN';
/**
* An id for one of the voices.
*/
const PUPPY_ID = 'PUPPY';
/** /**
* Class for the text2speech blocks. * Class for the text2speech blocks.
* @constructor * @constructor
@ -133,15 +128,6 @@ class Scratch3SpeakBlocks {
}), }),
gender: 'female', gender: 'female',
playbackRate: 1.4 playbackRate: 1.4
},
[PUPPY_ID]: {
name: formatMessage({
id: 'text2speech.puppy',
default: 'puppy',
description: 'A baby dog.'
}),
gender: 'male',
playbackRate: 1.4
} }
}; };
} }
@ -312,24 +298,14 @@ class Scratch3SpeakBlocks {
const gender = this.VOICE_INFO[state.voiceId].gender; const gender = this.VOICE_INFO[state.voiceId].gender;
const playbackRate = this.VOICE_INFO[state.voiceId].playbackRate; const playbackRate = this.VOICE_INFO[state.voiceId].playbackRate;
let locale = this.getViewerLanguageCode();
// @todo localize this? // @todo localize this?
if (state.voiceId === KITTEN_ID) { if (state.voiceId === KITTEN_ID) {
words = words.replace(/\w+/g, 'meow'); words = words.replace(/\w+/g, 'meow');
} }
// @todo localize this?
if (state.voiceId === PUPPY_ID) {
words = words.replace(/\w+/g, 'bark');
words = words.split(' ').map(() => ['bark', 'woof', 'ruff'][Math.floor(Math.random() * 3)])
.join(' ');
locale = 'en-GB';
}
// Build up URL // Build up URL
let path = `${SERVER_HOST}/synth`; let path = `${SERVER_HOST}/synth`;
path += `?locale=${locale}`; path += `?locale=${this.getViewerLanguageCode()}`;
path += `&gender=${gender}`; path += `&gender=${gender}`;
path += `&text=${encodeURI(words.substring(0, 128))}`; path += `&text=${encodeURI(words.substring(0, 128))}`;