From c14ef57307da188d57ec9ea0dda5f6ea3f93ed62 Mon Sep 17 00:00:00 2001
From: Stanislav Levin <slev@altlinux.org>
Date: Tue, 25 Sep 2018 11:11:48 +0300
Subject: [PATCH] Add title to 'add' dialog for 'association_table' widget of
 Groups entity

To improve translation quality the title of 'Add' dialog,
which is initialized within details table of the entity, should be
specified explicitly in the spec and should be an entire sentence.

Fixes: https://pagure.io/freeipa/issue/7712
Fixes: https://pagure.io/freeipa/issue/7714
Reviewed-By: Serhii Tsymbaliuk <stsymbal@redhat.com>
---
 install/ui/src/freeipa/netgroup.js |  8 ++++----
 ipaserver/plugins/internal.py      | 12 ++++++++++++
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/install/ui/src/freeipa/netgroup.js b/install/ui/src/freeipa/netgroup.js
index 245795339..db01890d4 100644
--- a/install/ui/src/freeipa/netgroup.js
+++ b/install/ui/src/freeipa/netgroup.js
@@ -190,7 +190,7 @@ var add_netgroup_details_facet_widgets = function (spec) {
                             name: 'memberuser_user',
                             add_method: 'add_member',
                             remove_method: 'remove_member',
-                            add_title: '@i18n:association.add.member',
+                            add_title: '@i18n:objects.netgroup.add_users',
                             remove_title: '@i18n:objects.netgroup.remove_users',
                             columns: [
                                 {
@@ -206,7 +206,7 @@ var add_netgroup_details_facet_widgets = function (spec) {
                             name: 'memberuser_group',
                             add_method: 'add_member',
                             remove_method: 'remove_member',
-                            add_title: '@i18n:association.add.member',
+                            add_title: '@i18n:objects.netgroup.add_groups',
                             remove_title: '@i18n:objects.netgroup.remove_groups',
                             columns: [
                                 {
@@ -279,7 +279,7 @@ var add_netgroup_details_facet_widgets = function (spec) {
                             add_method: 'add_member',
                             remove_method: 'remove_member',
                             external: 'externalhost',
-                            add_title: '@i18n:association.add.member',
+                            add_title: '@i18n:objects.netgroup.add_hosts',
                             remove_title: '@i18n:objects.netgroup.remove_hosts',
                             columns: [
                                 {
@@ -301,7 +301,7 @@ var add_netgroup_details_facet_widgets = function (spec) {
                             name: 'memberhost_hostgroup',
                             add_method: 'add_member',
                             remove_method: 'remove_member',
-                            add_title: '@i18n:association.add.member',
+                            add_title: '@i18n:objects.netgroup.add_hostgroups',
                             remove_title: '@i18n:objects.netgroup.remove_hostgroups',
                             columns: [
                                 {
diff --git a/ipaserver/plugins/internal.py b/ipaserver/plugins/internal.py
index 05631f037..db52f58e5 100644
--- a/ipaserver/plugins/internal.py
+++ b/ipaserver/plugins/internal.py
@@ -1056,6 +1056,18 @@ class i18n_messages(Command):
                 "add_netgroups": _(
                     "Add netgroups into netgroup '${primary_key}'"
                 ),
+                "add_groups": _(
+                    "Add user groups into netgroup '${primary_key}'"
+                ),
+                "add_hosts": _(
+                    "Add hosts into netgroup '${primary_key}'"
+                ),
+                "add_hostgroups": _(
+                    "Add host groups into netgroup '${primary_key}'"
+                ),
+                "add_users": _(
+                    "Add users into netgroup '${primary_key}'"
+                ),
                 "any_host": _("Any Host"),
                 "anyone": _("Anyone"),
                 "external": _("External"),