From 5eea5354ca2fbd8496f6acf853bfe90d60e394fc Mon Sep 17 00:00:00 2001
From: Stanislav Levin <slev@altlinux.org>
Date: Thu, 13 Sep 2018 20:10:03 +0300
Subject: [PATCH] Add title to remove dialog of 'Users' entity

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

Fixes: https://pagure.io/freeipa/issue/7699
Reviewed-By: Serhii Tsymbaliuk <stsymbal@redhat.com>
---
 install/ui/src/freeipa/stageuser.js | 12 ++++++++++--
 install/ui/src/freeipa/user.js      |  1 +
 ipaserver/plugins/internal.py       |  3 +++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/install/ui/src/freeipa/stageuser.js b/install/ui/src/freeipa/stageuser.js
index f45618990..75f03bb89 100644
--- a/install/ui/src/freeipa/stageuser.js
+++ b/install/ui/src/freeipa/stageuser.js
@@ -87,7 +87,11 @@ return {
             ],
             policies: [
                 mod_user.stageuser_sidebar_policy
-            ]
+            ],
+            deleter_dialog: {
+                title: '@i18n:objects.stageuser.remove',
+                $factory: IPA.search_deleter_dialog,
+            },
         },
         {
             $type: 'details',
@@ -329,7 +333,11 @@ stageuser.search_preserved_facet_spec = {
     ],
     policies: [
         mod_user.stageuser_sidebar_policy
-    ]
+    ],
+    deleter_dialog: {
+        title: '@i18n:objects.stageuser.preserved_remove',
+        $factory: IPA.search_deleter_dialog,
+    },
 };
 
 mod_user.entity_spec.policies = mod_user.entity_spec.policies || {};
diff --git a/install/ui/src/freeipa/user.js b/install/ui/src/freeipa/user.js
index 30ab40fb3..37740e830 100644
--- a/install/ui/src/freeipa/user.js
+++ b/install/ui/src/freeipa/user.js
@@ -146,6 +146,7 @@ return {
                 IPA.user.stageuser_sidebar_policy
             ],
             deleter_dialog: {
+                title: '@i18n:objects.user.remove',
                 $factory: IPA.user.deleter_dialog
             }
         },
diff --git a/ipaserver/plugins/internal.py b/ipaserver/plugins/internal.py
index 256f04b9a..4c0907371 100644
--- a/ipaserver/plugins/internal.py
+++ b/ipaserver/plugins/internal.py
@@ -831,6 +831,8 @@ class i18n_messages(Command):
                 "activate_success": _("${count} user(s) activated"),
                 "label": _("Stage users"),
                 "preserved_label": _("Preserved users"),
+                "preserved_remove": _("Remove preserved users"),
+                "remove": _("Remove stage users"),
                 "stage_confirm": _("Are you sure you want to stage selected users?"),
                 "stage_success": _("${count} users(s) staged"),
                 "stage_one_confirm": _("Are you sure you want to stage ${object}?"),
@@ -908,6 +910,7 @@ class i18n_messages(Command):
                 "mode_delete": _("delete"),
                 "mode_preserve": _("preserve"),
                 "noprivate": _("No private group"),
+                "remove": _("Remove users"),
                 "status_confirmation": _("Are you sure you want to ${action} the user?<br/>The change will take effect immediately."),
                 "status_link": _("Click to ${action}"),
                 "unlock": _("Unlock"),