From 6ac82f318325fe42a2a50fb55da9e856065b8dec Mon Sep 17 00:00:00 2001 From: Eric Rosenbaum Date: Wed, 12 Sep 2018 13:23:26 -0400 Subject: [PATCH 1/2] bark bark woof ruff bark. bark bark bark! --- src/extensions/scratch3_text2speech/index.js | 22 -------------------- 1 file changed, 22 deletions(-) diff --git a/src/extensions/scratch3_text2speech/index.js b/src/extensions/scratch3_text2speech/index.js index b3fd08fca..6cc28406f 100644 --- a/src/extensions/scratch3_text2speech/index.js +++ b/src/extensions/scratch3_text2speech/index.js @@ -50,11 +50,6 @@ const MONSTER_ID = 'MONSTER'; */ const KITTEN_ID = 'KITTEN'; -/** - * An id for one of the voices. - */ -const PUPPY_ID = 'PUPPY'; - /** * Class for the text2speech blocks. * @constructor @@ -133,15 +128,6 @@ class Scratch3SpeakBlocks { }), gender: 'female', playbackRate: 1.4 - }, - [PUPPY_ID]: { - name: formatMessage({ - id: 'text2speech.puppy', - default: 'puppy', - description: 'A baby dog.' - }), - gender: 'male', - playbackRate: 1.4 } }; } @@ -319,14 +305,6 @@ class Scratch3SpeakBlocks { 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 let path = `${SERVER_HOST}/synth`; path += `?locale=${locale}`; From f58e9276e8a5355e8f9af4296f19fac8a5a4a441 Mon Sep 17 00:00:00 2001 From: Eric Rosenbaum Date: Wed, 12 Sep 2018 13:49:29 -0400 Subject: [PATCH 2/2] Cleanup --- src/extensions/scratch3_text2speech/index.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/extensions/scratch3_text2speech/index.js b/src/extensions/scratch3_text2speech/index.js index 6cc28406f..4313c4fbd 100644 --- a/src/extensions/scratch3_text2speech/index.js +++ b/src/extensions/scratch3_text2speech/index.js @@ -298,8 +298,6 @@ class Scratch3SpeakBlocks { const gender = this.VOICE_INFO[state.voiceId].gender; const playbackRate = this.VOICE_INFO[state.voiceId].playbackRate; - let locale = this.getViewerLanguageCode(); - // @todo localize this? if (state.voiceId === KITTEN_ID) { words = words.replace(/\w+/g, 'meow'); @@ -307,7 +305,7 @@ class Scratch3SpeakBlocks { // Build up URL let path = `${SERVER_HOST}/synth`; - path += `?locale=${locale}`; + path += `?locale=${this.getViewerLanguageCode()}`; path += `&gender=${gender}`; path += `&text=${encodeURI(words)}`;