From 8dddc003bdd42ed2d379e7c7f276dae7b0145330 Mon Sep 17 00:00:00 2001
From: Stanislav Levin <slev@altlinux.org>
Date: Fri, 21 Sep 2018 11:45:28 +0300
Subject: [PATCH] Add title to 'add' dialog for 'DNS' entity

To improve translation quality the title of 'Add' dialog should be
specified explicitly in the spec and should be an entire sentence.

Fixes: https://pagure.io/freeipa/issue/7707
Reviewed-By: Serhii Tsymbaliuk <stsymbal@redhat.com>
---
 install/ui/src/freeipa/dns.js | 8 ++++----
 ipaserver/plugins/internal.py | 7 +++++--
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/install/ui/src/freeipa/dns.js b/install/ui/src/freeipa/dns.js
index b7b265ce2..200bcdfcf 100644
--- a/install/ui/src/freeipa/dns.js
+++ b/install/ui/src/freeipa/dns.js
@@ -290,6 +290,7 @@ return {
     ],
     standard_association_facets: true,
     adder_dialog: {
+        title: '@i18n:objects.dnszone.add',
         height: 300,
         sections: [
             {
@@ -436,6 +437,7 @@ return {
         }
     ],
     adder_dialog: {
+        title: '@i18n:objects.dnsforwardzone.add',
         sections: [
             {
                 name: 'name',
@@ -1348,6 +1350,7 @@ return {
         }
     ],
     adder_dialog: {
+        title: '@i18n:objects.dnsrecord.add',
         $factory: IPA.dns.record_adder_dialog,
         fields: [
             {
@@ -2006,15 +2009,12 @@ IPA.dns.record_type_table_widget = function(spec) {
 
     that.create_add_dialog = function() {
 
-        var title = text.get('@i18n:dialogs.add_title');
-        var label = that.entity.metadata.label_singular;
-
         var dialog_spec = {
             entity: that.entity,
             fields: [],
             widgets: [],
             retry: false,
-            title: title.replace('${entity}', label)
+            title: text.get('@i18n:objects.dnsrecord.add')
         };
 
         var dnstype = that.dnstype.toLowerCase();
diff --git a/ipaserver/plugins/internal.py b/ipaserver/plugins/internal.py
index dad2b9b6f..0c22294e9 100644
--- a/ipaserver/plugins/internal.py
+++ b/ipaserver/plugins/internal.py
@@ -667,9 +667,11 @@ class i18n_messages(Command):
                 "updated_dns": _("System DNS records updated"),
             },
             "dnsforwardzone": {
+                "add": _("Add DNS forward zone"),
                 "remove": _("Remove DNS forward zones"),
             },
             "dnsrecord": {
+                "add": _("Add DNS resource record"),
                 "data": _("Data"),
                 "deleted_no_data": _("DNS record was deleted because it contained no data."),
                 "other": _("Other Record Types"),
@@ -691,9 +693,10 @@ class i18n_messages(Command):
                 "type": _("Record Type"),
             },
             "dnszone": {
-                "identity": _("DNS Zone Settings"),
-                "add_permission":_("Add Permission"),
+                "add": _("Add DNS zone"),
+                "add_permission": _("Add permission"),
                 "add_permission_confirm":_("Are you sure you want to add permission for DNS Zone ${object}?"),
+                "identity": _("DNS Zone Settings"),
                 "remove": _("Remove DNS zones"),
                 "remove_permission": _("Remove Permission"),
                 "remove_permission_confirm": _("Are you sure you want to remove permission for DNS Zone ${object}?"),