From d588d3e9e4494e0750c4dd05b3195954ca5bf149 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 'Users' 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/user.js |  8 +++++++-
 ipaserver/plugins/internal.py  | 15 +++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/install/ui/src/freeipa/user.js b/install/ui/src/freeipa/user.js
index f1e307c62..ecd064211 100644
--- a/install/ui/src/freeipa/user.js
+++ b/install/ui/src/freeipa/user.js
@@ -417,7 +417,8 @@ return {
                 },
                 {
                     $type: 'cert_request',
-                    hide_cond: ['preserved-user']
+                    hide_cond: ['preserved-user'],
+                    title: '@i18n:objects.cert.issue_for_user'
                 }
             ],
             header_actions: [
@@ -464,6 +465,7 @@ return {
             $pre_ops: [ IPA.user.association_facet_ss_pre_op ],
             name: 'memberof_group',
             associator: IPA.serial_associator,
+            add_title: '@i18n:objects.user.add_into_groups',
             remove_title: '@i18n:objects.user.remove_from_groups'
         },
         {
@@ -471,6 +473,7 @@ return {
             $pre_ops: [ IPA.user.association_facet_ss_pre_op ],
             name: 'memberof_netgroup',
             associator: IPA.serial_associator,
+            add_title: '@i18n:objects.user.add_into_netgroups',
             remove_title: '@i18n:objects.user.remove_from_netgroups'
         },
         {
@@ -478,6 +481,7 @@ return {
             $pre_ops: [ IPA.user.association_facet_ss_pre_op ],
             name: 'memberof_role',
             associator: IPA.serial_associator,
+            add_title: '@i18n:objects.user.add_into_roles',
             remove_title: '@i18n:objects.user.remove_from_roles'
         },
         {
@@ -486,6 +490,7 @@ return {
             name: 'memberof_hbacrule',
             associator: IPA.serial_associator,
             add_method: 'add_user',
+            add_title: '@i18n:objects.user.add_into_hbac',
             remove_method: 'remove_user',
             remove_title: '@i18n:objects.user.remove_from_hbac'
         },
@@ -495,6 +500,7 @@ return {
             name: 'memberof_sudorule',
             associator: IPA.serial_associator,
             add_method: 'add_user',
+            add_title: '@i18n:objects.user.add_into_sudo',
             remove_method: 'remove_user',
             remove_title: '@i18n:objects.user.remove_from_sudo'
         }
diff --git a/ipaserver/plugins/internal.py b/ipaserver/plugins/internal.py
index 71f6437e5..83258ba6f 100644
--- a/ipaserver/plugins/internal.py
+++ b/ipaserver/plugins/internal.py
@@ -1235,6 +1235,21 @@ class i18n_messages(Command):
                 "account_status": _("Account Status"),
                 "activeuser_label": _("Active users"),
                 "add": _("Add user"),
+                "add_into_groups": _(
+                    "Add user '${primary_key}' into user groups"
+                ),
+                "add_into_hbac": _(
+                    "Add user '${primary_key}' into HBAC rules"
+                ),
+                "add_into_netgroups": _(
+                    "Add user '${primary_key}' into netgroups"
+                ),
+                "add_into_roles": _(
+                    "Add user '${primary_key}' into roles"
+                ),
+                "add_into_sudo": _(
+                    "Add user '${primary_key}' into sudo rules"
+                ),
                 "contact": _("Contact Settings"),
                 "delete_mode": _("Delete mode"),
                 "employee": _("Employee Information"),