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

main
Bob Mottram 2021-03-13 11:13:48 +00:00
commit 48b2aadc22
2 changed files with 7 additions and 2 deletions

View File

@ -11,6 +11,7 @@ import shutil
import sys import sys
import time import time
import argparse import argparse
import getpass
from person import getActorJson from person import getActorJson
from person import createPerson from person import createPerson
from person import createGroup from person import createGroup
@ -1793,8 +1794,10 @@ if args.notifications:
sys.exit() sys.exit()
if not args.password: if not args.password:
print('Specify a password with the --password option') args.password = getpass.getpass('Password: ')
sys.exit() if not args.password:
print('Specify a password with the --password option')
sys.exit()
proxyType = None proxyType = None
if args.tor or domain.endswith('.onion'): if args.tor or domain.endswith('.onion'):

View File

@ -87,8 +87,10 @@ def _speakerPronounce(baseDir: str, sayText: str, translate: {}) -> str:
"PSQL": "Postgres S-Q-L", "PSQL": "Postgres S-Q-L",
"SQL": "S-Q-L", "SQL": "S-Q-L",
"gdpr": "G-D-P-R", "gdpr": "G-D-P-R",
"kde": "K-D-E",
"coop": "co-op", "coop": "co-op",
"KMail": "K-Mail", "KMail": "K-Mail",
"kmail": "K-Mail",
"gmail": "G-mail", "gmail": "G-mail",
"Gmail": "G-mail", "Gmail": "G-mail",
"OpenPGP": "Open P-G-P", "OpenPGP": "Open P-G-P",