From f732085d3fb0ada7bc628a034dc5ed5a30774e1d Mon Sep 17 00:00:00 2001 From: Laurent Peuch Date: Wed, 11 Sep 2019 04:48:53 +0200 Subject: [PATCH] [ux] rename 'yunohost domain maindomain' to 'yunohost domain main-domain' --- data/actionsmap/yunohost.yml | 4 +++- src/yunohost/domain.py | 2 +- src/yunohost/tools.py | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/data/actionsmap/yunohost.yml b/data/actionsmap/yunohost.yml index b7b4eaf88..76500ac13 100644 --- a/data/actionsmap/yunohost.yml +++ b/data/actionsmap/yunohost.yml @@ -442,8 +442,10 @@ domain: - "pattern_positive_number" ### domain_maindomain() - maindomain: + main-domain: action_help: Check the current main domain, or change it + deprecated_alias: + - maindomain api: - GET /domains/main - PUT /domains/main diff --git a/src/yunohost/domain.py b/src/yunohost/domain.py index 8529433ee..bed8e6883 100644 --- a/src/yunohost/domain.py +++ b/src/yunohost/domain.py @@ -236,7 +236,7 @@ def domain_dns_conf(domain, ttl=None): @is_unit_operation() -def domain_maindomain(operation_logger, new_main_domain=None): +def domain_main_domain(operation_logger, new_main_domain=None): """ Check the current main domain, or change it diff --git a/src/yunohost/tools.py b/src/yunohost/tools.py index 5feb04dec..e33ef8e82 100644 --- a/src/yunohost/tools.py +++ b/src/yunohost/tools.py @@ -166,7 +166,8 @@ def tools_adminpw(new_password, check_strength=True): @is_unit_operation() def tools_maindomain(operation_logger, new_main_domain=None): - from yunohost.domain import domain_maindomain + from yunohost.domain import domain_main_domain + logger.warning(m18n.g("deprecated_command_alias", prog="yunohost", old="tools maindomain", new="domain main-domain")) return domain_main_domain(new_main_domain=new_main_domain)