From 302bbb9eead13a7a63d7a380ebe01253cc3d4f5e Mon Sep 17 00:00:00 2001 From: John Dennis Date: Wed, 17 Aug 2011 18:51:38 -0400 Subject: ticket 1659 - invalid i18n string in dns.py dns.py at line 976 has an invalid i18n string and cannot be processed during message extraction causing message catalog generation to fail. The format parameters are trapped inside the i18n string. Also it's not necessary to promote the i18n string literal to unicode via the u prefix because the _() function returns unicode. --- ipalib/plugins/dns.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ipalib/plugins/dns.py b/ipalib/plugins/dns.py index e967c5c03..b4eee1139 100644 --- a/ipalib/plugins/dns.py +++ b/ipalib/plugins/dns.py @@ -71,7 +71,7 @@ EXAMPLES: A record: 1.2.3.4, 11.22.33.44 - Delete A record '1.2.3.4'? Yes/No (default No): + Delete A record '1.2.3.4'? Yes/No (default No): Delete A record '11.22.33.44'? Yes/No (default No): y Record name: www A record: 1.2.3.4 (A record 11.22.33.44 has been deleted) @@ -974,8 +974,7 @@ class dnsrecord_del(dnsrecord_mod_record): deleted_values = [] for rec_value in dns_record[param.name]: user_del_value = self.Backend.textui.prompt_yesno( - _(u"Delete %s '%s'?" - % (param.label, rec_value)), default=False) + _("Delete %s '%s'?") % (param.label, rec_value), default=False) if user_del_value is True: deleted_values.append(rec_value) if deleted_values: -- cgit