Merge branch 'main' of ssh://code.freedombone.net:2222/bashrc/epicyon into main

main
Bob Mottram 2021-03-11 11:35:39 +00:00
commit ba78920359
2 changed files with 11 additions and 4 deletions

View File

@ -580,7 +580,8 @@ def runNotificationsClient(baseDir: str, proxyType: str, httpPrefix: str,
screenreader, systemLanguage, espeak) screenreader, systemLanguage, espeak)
print('') print('')
elif (keyPress == 'repeat' or keyPress == 'replay' or elif (keyPress == 'repeat' or keyPress == 'replay' or
keyPress == 'rp'): keyPress == 'rp' or keyPress == 'again' or
keyPress == 'say again'):
if screenreader and nameStr and \ if screenreader and nameStr and \
gender and messageStr and content: gender and messageStr and content:
sayStr = 'Repeating ' + nameStr sayStr = 'Repeating ' + nameStr
@ -592,12 +593,16 @@ def runNotificationsClient(baseDir: str, proxyType: str, httpPrefix: str,
systemLanguage, espeak, systemLanguage, espeak,
nameStr, gender) nameStr, gender)
print('') print('')
elif keyPress == 'sounds on' or keyPress == 'sound': elif (keyPress == 'sounds on' or
keyPress == 'sound on' or
keyPress == 'sound'):
sayStr = 'Notification sounds on' sayStr = 'Notification sounds on'
_sayCommand(sayStr, sayStr, screenreader, _sayCommand(sayStr, sayStr, screenreader,
systemLanguage, espeak) systemLanguage, espeak)
notificationSounds = True notificationSounds = True
elif keyPress == 'sounds off' or keyPress == 'nosound': elif (keyPress == 'sounds off' or
keyPress == 'sound off' or
keyPress == 'nosound'):
sayStr = 'Notification sounds off' sayStr = 'Notification sounds off'
_sayCommand(sayStr, sayStr, screenreader, _sayCommand(sayStr, sayStr, screenreader,
systemLanguage, espeak) systemLanguage, espeak)

View File

@ -168,12 +168,14 @@ def speakerReplaceLinks(sayText: str, translate: {},
linkedStr = 'Linked' linkedStr = 'Linked'
prevWord = '' prevWord = ''
for word in wordsList: for word in wordsList:
if word.startswith('v='):
replacements[word] = ''
if word.startswith(':'): if word.startswith(':'):
if word.endswith(':'): if word.endswith(':'):
replacements[word] = ', emowji ' + word.replace(':', '') + ',' replacements[word] = ', emowji ' + word.replace(':', '') + ','
continue continue
# replace mentions, but not re-tweets
if word.startswith('@') and not prevWord.endswith('RT'): if word.startswith('@') and not prevWord.endswith('RT'):
# replace mentions, but not re-tweets
if translate.get('mentioning'): if translate.get('mentioning'):
replacements[word] = \ replacements[word] = \
translate['mentioning'] + ' ' + word[1:] + ', ' translate['mentioning'] + ' ' + word[1:] + ', '