From b324d7ab82a252699c3fa5cf24bd1445f061844a Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Tue, 2 Mar 2021 21:11:56 +0000 Subject: [PATCH 1/2] More generic language detection --- epicyon.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/epicyon.py b/epicyon.py index 2c46383ea..201194eb0 100644 --- a/epicyon.py +++ b/epicyon.py @@ -1959,13 +1959,13 @@ if args.speaker: espeak.synth(html.unescape(nameStr)) elif args.screenreader == 'picospeaker': speakerLang = 'en-GB' - if args.language == 'fr': + if args.language.startswith('fr'): speakerLang = 'fr-FR' - elif args.language == 'es': + elif args.language.startswith('es'): speakerLang = 'es-ES' - elif args.language == 'de': + elif args.language.startswith('de'): speakerLang = 'de-DE' - elif args.language == 'it': + elif args.language.startswith('it'): speakerLang = 'it-IT' speakerCmd = 'picospeaker ' + \ '-l ' + speakerLang + \ From b64f7e1bfafcad72e2cc11994d8eeeb26d4b7b1f Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Tue, 2 Mar 2021 23:06:31 +0000 Subject: [PATCH 2/2] Preserve line endings for speaker --- inbox.py | 1 + 1 file changed, 1 insertion(+) diff --git a/inbox.py b/inbox.py index 6559db0ac..cf8bae050 100644 --- a/inbox.py +++ b/inbox.py @@ -2167,6 +2167,7 @@ def _updateSpeaker(baseDir: str, nickname: str, domain: str, detectedLinks = [] content = urllib.parse.unquote_plus(postJsonObject['object']['content']) content = html.unescape(content) + content = content.replace('

', '').replace('

', ' ') content = removeHtml(htmlReplaceQuoteMarks(content)) content = speakerReplaceLinks(content, translate, detectedLinks) content = speakerPronounce(baseDir, content, translate)