From d5979fb24f0b3e062b4535ae2a7f24ac61d05586 Mon Sep 17 00:00:00 2001 From: Stanislav Levin Date: Fri, 14 Sep 2018 11:44:02 +0300 Subject: [PATCH] Add title to remove dialog of 'DNS' entity To improve translation quality the title of Remove dialog should be specified explicitly in the spec and should be an entire sentence. Fixes: https://pagure.io/freeipa/issue/7699 Reviewed-By: Serhii Tsymbaliuk --- install/ui/src/freeipa/dns.js | 17 +++++++++++++---- ipaserver/plugins/internal.py | 4 ++++ 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/install/ui/src/freeipa/dns.js b/install/ui/src/freeipa/dns.js index 1be851368..fe2f27189 100644 --- a/install/ui/src/freeipa/dns.js +++ b/install/ui/src/freeipa/dns.js @@ -268,7 +268,6 @@ return { facet_group: 'dnsrecord', nested_entity : 'dnsrecord', name: 'records', - deleter_dialog: IPA.dns.record_search_deleter_dialog, title: '@mo:dnszone.label_singular', label: '@mo:dnsrecord.label', tab_label: '@mo:dnsrecord.label', @@ -328,7 +327,10 @@ return { policies: [ IPA.add_dns_zone_name_policy ] - } + }, + deleter_dialog: { + title: '@i18n:objects.dnszone.remove', + }, };}; var make_forwardzone_spec = function() { @@ -500,7 +502,10 @@ return { policies: [ IPA.add_dns_zone_name_policy ] - } + }, + deleter_dialog: { + title: '@i18n:objects.dnsforwardzone.remove', + }, };}; @@ -1376,7 +1381,11 @@ return { type_field: 'record_type' } ] - } + }, + deleter_dialog: { + title: '@i18n:objects.dnsrecord.remove', + $factory: IPA.dns.record_search_deleter_dialog, + }, };}; IPA.dns.record_adder_dialog = function(spec) { diff --git a/ipaserver/plugins/internal.py b/ipaserver/plugins/internal.py index b81bceb02..e6fec5e68 100644 --- a/ipaserver/plugins/internal.py +++ b/ipaserver/plugins/internal.py @@ -570,6 +570,9 @@ class i18n_messages(Command): "update_dns_dialog_msg": _("Do you want to update system DNS records?"), "updated_dns": _("System DNS records updated"), }, + "dnsforwardzone": { + "remove": _("Remove DNS forward zones"), + }, "dnsrecord": { "data": _("Data"), "deleted_no_data": _("DNS record was deleted because it contained no data."), @@ -594,6 +597,7 @@ class i18n_messages(Command): "identity": _("DNS Zone Settings"), "add_permission":_("Add Permission"), "add_permission_confirm":_("Are you sure you want to add permission for DNS Zone ${object}?"), + "remove": _("Remove DNS zones"), "remove_permission": _("Remove Permission"), "remove_permission_confirm": _("Are you sure you want to remove permission for DNS Zone ${object}?"), "skip_dns_check": _("Skip DNS check"),