From 1ccafd487039e97ee9498bbe972d298dcbf960a4 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
 HBAC 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/hbac.js | 12 ++++++------
 ipaserver/plugins/internal.py  | 19 +++++++++++++++++++
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/install/ui/src/freeipa/hbac.js b/install/ui/src/freeipa/hbac.js
index caf9a0e17..911d1f576 100644
--- a/install/ui/src/freeipa/hbac.js
+++ b/install/ui/src/freeipa/hbac.js
@@ -331,7 +331,7 @@ var add_hbacrule_details_facet_widgets = function (spec) {
                             name: 'memberuser_user',
                             add_method: 'add_user',
                             remove_method: 'remove_user',
-                            add_title: '@i18n:association.add.member',
+                            add_title: '@i18n:objects.hbacrule.add_users',
                             remove_title: '@i18n:objects.hbacrule.remove_users'
                         },
                         {
@@ -340,7 +340,7 @@ var add_hbacrule_details_facet_widgets = function (spec) {
                             name: 'memberuser_group',
                             add_method: 'add_user',
                             remove_method: 'remove_user',
-                            add_title: '@i18n:association.add.member',
+                            add_title: '@i18n:objects.hbacrule.add_groups',
                             remove_title: '@i18n:objects.hbacrule.remove_groups'
                         }
                     ]
@@ -404,7 +404,7 @@ var add_hbacrule_details_facet_widgets = function (spec) {
                             name: 'memberhost_host',
                             add_method: 'add_host',
                             remove_method: 'remove_host',
-                            add_title: '@i18n:association.add.member',
+                            add_title: '@i18n:objects.hbacrule.add_hosts',
                             remove_title: '@i18n:objects.hbacrule.remove_hosts'
                         },
                         {
@@ -413,7 +413,7 @@ var add_hbacrule_details_facet_widgets = function (spec) {
                             name: 'memberhost_hostgroup',
                             add_method: 'add_host',
                             remove_method: 'remove_host',
-                            add_title: '@i18n:association.add.member',
+                            add_title: '@i18n:objects.hbacrule.add_hostgroups',
                             remove_title: '@i18n:objects.hbacrule.remove_hostgroups'
                         }
                     ]
@@ -471,7 +471,7 @@ var add_hbacrule_details_facet_widgets = function (spec) {
                             name: 'memberservice_hbacsvc',
                             add_method: 'add_service',
                             remove_method: 'remove_service',
-                            add_title: '@i18n:association.add.member',
+                            add_title: '@i18n:objects.hbacrule.add_services',
                             remove_title: '@i18n:objects.hbacrule.remove_services'
                         },
                         {
@@ -480,7 +480,7 @@ var add_hbacrule_details_facet_widgets = function (spec) {
                             name: 'memberservice_hbacsvcgroup',
                             add_method: 'add_service',
                             remove_method: 'remove_service',
-                            add_title: '@i18n:association.add.member',
+                            add_title: '@i18n:objects.hbacrule.add_servicegroups',
                             remove_title: '@i18n:objects.hbacrule.remove_servicegroups'
                         }
                     ]
diff --git a/ipaserver/plugins/internal.py b/ipaserver/plugins/internal.py
index db52f58e5..7eb456a7e 100644
--- a/ipaserver/plugins/internal.py
+++ b/ipaserver/plugins/internal.py
@@ -827,6 +827,25 @@ class i18n_messages(Command):
             },
             "hbacrule": {
                 "add": _("Add HBAC rule"),
+                "add_groups": _(
+                    "Add user groups into HBAC rule '${primary_key}'"
+                ),
+                "add_hostgroups": _(
+                    "Add host groups into HBAC rule '${primary_key}'"
+                ),
+                "add_hosts": _(
+                    "Add hosts into HBAC rule '${primary_key}'"
+                ),
+                "add_servicegroups": _(
+                    "Add HBAC service groups into HBAC rule "
+                    "'${primary_key}'"
+                ),
+                "add_services": _(
+                    "Add HBAC services into HBAC rule '${primary_key}'"
+                ),
+                "add_users": _(
+                    "Add users into HBAC rule '${primary_key}'"
+                ),
                 "any_host": _("Any Host"),
                 "any_service": _("Any Service"),
                 "anyone": _("Anyone"),