YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

Polish UX

Browse source
This commit is contained in:
Alexandre Aubin 2020-08-27 17:31:33 +02:00
parent 4a15358ed9
commit dea6a18712
3 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/actionsmap/yunohost.yml
View file

@ -109,7 +109,7 @@ user:
comment: good_practices_about_user_password comment: good_practices_about_user_password
-d: -d:
full: --domain full: --domain
help: Domain for email and xmpp help: Domain for the email address and xmpp account
extra: extra:
pattern: &pattern_domain pattern: &pattern_domain
- !!str ^([^\W_A-Z]+([-]*[^\W_A-Z]+)*\.)+([^\W\d_]{2,})$ - !!str ^([^\W_A-Z]+([-]*[^\W_A-Z]+)*\.)+([^\W\d_]{2,})$

2
locales/en.json
View file

@ -60,7 +60,7 @@
"apps_catalog_failed_to_download": "Unable to download the {apps_catalog} app catalog: {error}", "apps_catalog_failed_to_download": "Unable to download the {apps_catalog} app catalog: {error}",
"apps_catalog_obsolete_cache": "The app catalog cache is empty or obsolete.", "apps_catalog_obsolete_cache": "The app catalog cache is empty or obsolete.",
"apps_catalog_update_success": "The application catalog has been updated!", "apps_catalog_update_success": "The application catalog has been updated!",
"ask_domain": "Choose a domain", "ask_user_domain": "Domain to use for the user's email address and XMPP account",
"ask_email": "E-mail address", "ask_email": "E-mail address",
"ask_firstname": "First name", "ask_firstname": "First name",
"ask_lastname": "Last name", "ask_lastname": "Last name",

12
src/yunohost/user.py
View file

@ -127,14 +127,20 @@ def user_create(operation_logger, username, firstname, lastname, domain, passwor
# Ensure sufficiently complex password # Ensure sufficiently complex password
assert_password_is_strong_enough("user", password) assert_password_is_strong_enough("user", password)
# Validate domain used for email address/xmpp account
if domain is None: if domain is None:
if msettings.get('interface') == 'api': if msettings.get('interface') == 'api':
raise YunohostError('Invalide usage, specify domain argument') raise YunohostError('Invalide usage, specify domain argument')
else: else:
# On affiche les differents domaines possibles # On affiche les differents domaines possibles
for domain_checked in domain_list()['domains'] : msignals.display(m18n.n('domains_available'))
msignals.display("- {}".format(domain_checked)) for domain in domain_list()['domains']:
domain = msignals.prompt(m18n.n('ask_domain')) msignals.display("- {}".format(domain))
maindomain = _get_maindomain()
domain = msignals.prompt(m18n.n('ask_user_domain') + ' (default: %s)' % maindomain)
if not domain:
domain = maindomain
# Check that the domain exists # Check that the domain exists
if domain not in domain_list()['domains']: if domain not in domain_list()['domains']: