From 22f830576d7d9f6585842818ea33379fd1674091 Mon Sep 17 00:00:00 2001 From: Martin Basti Date: Thu, 13 Nov 2014 14:02:02 +0100 Subject: [PATCH] Fix warning message should not contain CLI commands Message is now universal for both CLI and WebUI Ticket: https://fedorahosted.org/freeipa/ticket/4647 Reviewed-By: Petr Vobornik --- ipalib/messages.py | 4 ++-- ipalib/plugins/dns.py | 9 ++++----- ipatests/test_xmlrpc/test_dns_plugin.py | 9 ++++++--- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/ipalib/messages.py b/ipalib/messages.py index 5eeab3c54caf3a7318d89a4aeaee1357fceb787f..102e35275dbe37328c84ecb3cd5b2a8d8578056f 100644 --- a/ipalib/messages.py +++ b/ipalib/messages.py @@ -175,8 +175,8 @@ class OptionSemanticChangedWarning(PublicMessage): errno = 13005 type = "warning" - format = _(u"semantic of '%(option)s' option was changed: " - u"%(current_behavior)s.\n%(hint)s") + format = _(u"Semantic of %(label)s was changed. %(current_behavior)s\n" + u"%(hint)s") class DNSServerNotRespondingWarning(PublicMessage): diff --git a/ipalib/plugins/dns.py b/ipalib/plugins/dns.py index dd1e640f4062a32921bf1edf316e122b81a6d485..c5d96a8c4fcdf101254ecefb60cb83d63bee6310 100644 --- a/ipalib/plugins/dns.py +++ b/ipalib/plugins/dns.py @@ -2369,11 +2369,10 @@ class dnszone(DNSZoneBase): messages.add_message( options['version'], result, messages.OptionSemanticChangedWarning( - option=u"--name-server", - current_behavior=_(u"the option is used only for " - u"setting up the SOA MNAME attribute"), - hint=_(u"To edit NS record(s) in zone apex, use command " - u"'dnsrecord-mod [zone] @ --ns-rec=nameserver'.") + label=_(u"setting Authoritative nameserver"), + current_behavior=_(u"It is used only for setting the " + u"SOA MNAME attribute."), + hint=_(u"NS record(s) can be edited in zone apex - '@'. ") ) ) diff --git a/ipatests/test_xmlrpc/test_dns_plugin.py b/ipatests/test_xmlrpc/test_dns_plugin.py index a34d11a3278c67a3d00ca8f59bb8d8d19cf8a46e..fb53853147ecf663cf7015867131445f32364cfb 100644 --- a/ipatests/test_xmlrpc/test_dns_plugin.py +++ b/ipatests/test_xmlrpc/test_dns_plugin.py @@ -497,9 +497,12 @@ class test_dns(Declarative): 'objectclass': objectclasses.dnszone, }, 'messages': ( - {'message': u"semantic of '--name-server' option was changed: the option is used only for setting up" - u" the SOA MNAME attribute.\nTo edit NS record(s) in zone apex, use command " - u"'dnsrecord-mod [zone] @ --ns-rec=nameserver'.", + {'message': u"Semantic of setting Authoritative nameserver " + u"was changed. " + u"It is used only for setting the SOA MNAME " + u"attribute.\n" + u"NS record(s) can be edited in zone " + u"apex - '@'. ", 'code': 13005, 'type': u'warning', 'name': u'OptionSemanticChangedWarning'}, -- 2.1.0