From b3ac23041814213d50db646c37079f4f9dd54d4e Mon Sep 17 00:00:00 2001
From: Stanislav Levin <slev@altlinux.org>
Date: Mon, 24 Sep 2018 11:41:58 +0300
Subject: [PATCH] Add title to 'add' dialog for details of 'RBAC' entity

To improve translation quality the title of 'Add' dialog,
which is initialized within details 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/aci.js |  9 +++++++++
 ipaserver/plugins/internal.py | 27 +++++++++++++++++++++++++++
 2 files changed, 36 insertions(+)

diff --git a/install/ui/src/freeipa/aci.js b/install/ui/src/freeipa/aci.js
index 26040cad8..1c6ed6ec4 100644
--- a/install/ui/src/freeipa/aci.js
+++ b/install/ui/src/freeipa/aci.js
@@ -206,6 +206,7 @@ return {
             $type: 'association',
             name: 'member_privilege',
             facet_group: 'privilege',
+            add_title: '@i18n:objects.acipermission.add_privileges',
             remove_title: '@i18n:objects.acipermission.remove_privileges'
         }
     ],
@@ -354,6 +355,7 @@ return {
             name: 'member_role',
             facet_group: 'role',
             add_method: 'add_privilege',
+            add_title: '@i18n:objects.aciprivilege.add_roles',
             remove_method: 'remove_privilege',
             associator: IPA.serial_associator,
             remove_title: '@i18n:objects.aciprivilege.remove_roles'
@@ -363,6 +365,7 @@ return {
             name: 'memberof_permission',
             facet_group: 'permission',
             add_method: 'add_permission',
+            add_title: '@i18n:objects.aciprivilege.add_into_permissions',
             remove_method: 'remove_permission',
             remove_title: '@i18n:objects.aciprivilege.remove_from_permissions'
         }
@@ -414,26 +417,31 @@ return {
         {
             $type: 'association',
             name: 'member_user',
+            add_title: '@i18n:objects.acirole.add_users',
             remove_title: '@i18n:objects.acirole.remove_users'
         },
         {
             $type: 'association',
             name: 'member_group',
+            add_title: '@i18n:objects.acirole.add_groups',
             remove_title: '@i18n:objects.acirole.remove_groups'
         },
         {
             $type: 'association',
             name: 'member_host',
+            add_title: '@i18n:objects.acirole.add_hosts',
             remove_title: '@i18n:objects.acirole.remove_hosts'
         },
         {
             $type: 'association',
             name: 'member_hostgroup',
+            add_title: '@i18n:objects.acirole.add_hostgroups',
             remove_title: '@i18n:objects.acirole.remove_hostgroups'
         },
         {
             $type: 'association',
             name: 'member_service',
+            add_title: '@i18n:objects.acirole.add_services',
             remove_title: '@i18n:objects.acirole.remove_services'
         },
         {
@@ -441,6 +449,7 @@ return {
             name: 'memberof_privilege',
             facet_group: 'privilege',
             add_method: 'add_privilege',
+            add_title: '@i18n:objects.acirole.add_into_privileges',
             remove_method: 'remove_privilege',
             remove_title: '@i18n:objects.acirole.remove_from_privileges'
         }
diff --git a/ipaserver/plugins/internal.py b/ipaserver/plugins/internal.py
index 03b1f1f35..5328af78a 100644
--- a/ipaserver/plugins/internal.py
+++ b/ipaserver/plugins/internal.py
@@ -419,6 +419,9 @@ class i18n_messages(Command):
             },
             "acipermission": {
                 "add": _("Add permission"),
+                "add_privileges": _(
+                    "Add privileges into permission '${primary_key}'"
+                ),
                 "remove": _("Remove permissions"),
                 "remove_privileges": _(
                     "Remove privileges from permission '${primary_key}'"
@@ -426,6 +429,12 @@ class i18n_messages(Command):
             },
             "aciprivilege": {
                 "add": _("Add privilege"),
+                "add_into_permissions": _(
+                    "Add privilege '${primary_key}' into permissions"
+                ),
+                "add_roles": _(
+                    "Add roles into privilege '${primary_key}'"
+                ),
                 "remove": _("Remove privileges"),
                 "remove_from_permissions": _(
                     "Remove privilege '${primary_key}' from permissions"
@@ -437,6 +446,24 @@ class i18n_messages(Command):
             "acirole": {
                 "identity": _("Role Settings"),
                 "add": _("Add role"),
+                "add_groups": _(
+                    "Add user groups into role '${primary_key}'"
+                ),
+                "add_hosts": _(
+                    "Add hosts into role '${primary_key}'"
+                ),
+                "add_hostgroups": _(
+                    "Add host groups into role '${primary_key}'"
+                ),
+                "add_into_privileges": _(
+                    "Add role '${primary_key}' into privileges"
+                ),
+                "add_services": _(
+                    "Add services into role '${primary_key}'"
+                ),
+                "add_users": _(
+                    "Add users into role '${primary_key}'"
+                ),
                 "remove": _("Remove roles"),
                 "remove_from_privileges": _(
                     "Remove role '${primary_key}' from privileges"