URL: https://github.com/freeipa/freeipa/pull/2362
Author: stanislavlevin
 Title: #2362: [Translation] not entire sentence of remove dialog
Action: opened

PR body:
"""
Drop concatenated title of remove dialog.
    
As for now the default title of remove dialogs is set to
'Remove ${entity}', where 'entity' is also translatable text.
This construction is used via method 'create_remove_dialog'
of Search facet for the all association 'Delete' actions of
entities (at the top level).
 
Such concatenation leads to a bad quality translation and
should be changed to an entire sentence.

Fixes: https://pagure.io/freeipa/issue/7699

"""

To pull the PR as Git branch:
git remote add ghfreeipa https://github.com/freeipa/freeipa
git fetch ghfreeipa pull/2362/head:pr2362
git checkout pr2362
From f6bd9f1b50ac181e8b017fc4b5bc38ebad3359af Mon Sep 17 00:00:00 2001
From: Stanislav Levin <s...@altlinux.org>
Date: Wed, 12 Sep 2018 17:48:44 +0300
Subject: [PATCH 01/20] Drop concatenated title of remove dialog

As for now the default title of remove dialogs is set to
'Remove ${entity}', where 'entity' is also translatable text.
This construction is used via method 'create_remove_dialog'
of Search facet for the all association 'Delete' actions of
entities.

The such concatenation leads to a bad quality translation and
should be changed to an entire sentence.

Fixes: https://pagure.io/freeipa/issue/7699
---
 install/ui/src/freeipa/search.js | 6 ++----
 install/ui/src/freeipa/sudo.js   | 4 +---
 ipaserver/plugins/internal.py    | 5 ++++-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/install/ui/src/freeipa/search.js b/install/ui/src/freeipa/search.js
index 42303cbf5c..0966403c35 100644
--- a/install/ui/src/freeipa/search.js
+++ b/install/ui/src/freeipa/search.js
@@ -230,10 +230,8 @@ IPA.search_facet = function(spec, no_init) {
         dialog.facet = that;
         dialog.pkey_prefix = that.managed_entity_pkey_prefix();
 
-        title = text.get('@i18n:dialogs.remove_title');
-        var label = that.managed_entity.metadata.label;
-        dialog.title = title.replace('${entity}', label);
-
+        dialog.title = dialog.title ||
+                           text.get('@i18n:dialogs.remove_title_default');
         dialog.set_values(values);
 
         return dialog;
diff --git a/install/ui/src/freeipa/sudo.js b/install/ui/src/freeipa/sudo.js
index 733e4119ca..dd9b7e5e06 100644
--- a/install/ui/src/freeipa/sudo.js
+++ b/install/ui/src/freeipa/sudo.js
@@ -855,7 +855,6 @@ IPA.sudo.options_section = function(spec) {
 
     that.show_remove_dialog = function() {
 
-        var label = IPA.get_command_option('sudorule_add_option', 'ipasudoopt').label;
         var values = that.table.get_selected_values();
 
         if (!values.length) {
@@ -866,8 +865,7 @@ IPA.sudo.options_section = function(spec) {
 
         var pkey = that.facet.get_pkey();
 
-        var title = text.get('@i18n:dialogs.remove_title');
-        title = title.replace('${entity}', label);
+        var title = text.get('@i18n:objects.sudooptions.remove');
 
         var dialog = IPA.deleter_dialog({
             title: title,
diff --git a/ipaserver/plugins/internal.py b/ipaserver/plugins/internal.py
index 8670d6977c..256f04b9a2 100644
--- a/ipaserver/plugins/internal.py
+++ b/ipaserver/plugins/internal.py
@@ -287,7 +287,7 @@ class i18n_messages(Command):
             "prospective": _("Prospective"),
             "redirection": _("Redirection"),
             "remove_empty": _("Select entries to be removed."),
-            "remove_title": _("Remove ${entity}"),
+            "remove_title_default": _("Remove"),
             "result": _("Result"),
             "show_details": _("Show details"),
             "success": _("Success"),
@@ -866,6 +866,9 @@ class i18n_messages(Command):
                 "specified_users": _("Specified Users and Groups"),
                 "user": _("Who"),
             },
+            "sudooptions": {
+                "remove": _("Remove sudo options"),
+            },
             "topology": {
                 "autogenerated": _("Autogenerated"),
                 "segment_details": _("Segment details"),

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

Fixes: https://pagure.io/freeipa/issue/7699
---
 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 f45618990e..75f03bb892 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 30ab40fb33..37740e8305 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 256f04b9a2..4c09073714 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"),

From 47797372615aa7fa329413401ad519529b973a31 Mon Sep 17 00:00:00 2001
From: Stanislav Levin <s...@altlinux.org>
Date: Thu, 13 Sep 2018 20:35:56 +0300
Subject: [PATCH 03/20] Add title to remove dialog of 'Hosts' entity

Fixes: https://pagure.io/freeipa/issue/7699
---
 install/ui/src/freeipa/host.js | 1 +
 ipaserver/plugins/internal.py  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/install/ui/src/freeipa/host.js b/install/ui/src/freeipa/host.js
index 8aa1ef9d8c..2d35700066 100644
--- a/install/ui/src/freeipa/host.js
+++ b/install/ui/src/freeipa/host.js
@@ -477,6 +477,7 @@ return {
         ]
     },
     deleter_dialog: {
+        title: '@i18n:objects.host.remove',
         $factory: IPA.host_deleter_dialog
     }
 };};
diff --git a/ipaserver/plugins/internal.py b/ipaserver/plugins/internal.py
index 4c09073714..32bded1315 100644
--- a/ipaserver/plugins/internal.py
+++ b/ipaserver/plugins/internal.py
@@ -659,6 +659,7 @@ class i18n_messages(Command):
                 "password_set_button": _("Set OTP"),
                 "password_set_success": _("OTP set"),
                 "password_set_title": _("Set One-Time-Password"),
+                "remove": _("Remove hosts"),
                 "status": _("Status"),
                 "unprovision": _("Unprovision"),
                 "unprovision_confirmation": _("Are you sure you want to unprovision this host?"),

From 0302085f08210d477697a26f82062743d873b077 Mon Sep 17 00:00:00 2001
From: Stanislav Levin <s...@altlinux.org>
Date: Thu, 13 Sep 2018 21:41:22 +0300
Subject: [PATCH 04/20] Add title to remove dialog of 'Services' entity

Fixes: https://pagure.io/freeipa/issue/7699
---
 install/ui/src/freeipa/service.js | 5 ++++-
 ipaserver/plugins/internal.py     | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/install/ui/src/freeipa/service.js b/install/ui/src/freeipa/service.js
index 6e377f2c00..9db799ae5d 100644
--- a/install/ui/src/freeipa/service.js
+++ b/install/ui/src/freeipa/service.js
@@ -424,7 +424,10 @@ return {
                 ]
             }
         ]
-    }
+    },
+    deleter_dialog: {
+        title: '@i18n:objects.service.remove',
+    },
 };};
 
 
diff --git a/ipaserver/plugins/internal.py b/ipaserver/plugins/internal.py
index 32bded1315..57fb14775b 100644
--- a/ipaserver/plugins/internal.py
+++ b/ipaserver/plugins/internal.py
@@ -808,6 +808,7 @@ class i18n_messages(Command):
                 "host": _("Host Name"),
                 "missing": _("Kerberos Key Not Present"),
                 "provisioning": _("Provisioning"),
+                "remove": _("Remove services"),
                 "service": _("Service"),
                 "status": _("Status"),
                 "unprovision": _("Unprovision"),

From a29d053c463bd6a4e87018deaf31c3bb4776da3d Mon Sep 17 00:00:00 2001
From: Stanislav Levin <s...@altlinux.org>
Date: Thu, 13 Sep 2018 21:41:34 +0300
Subject: [PATCH 05/20] Add title to remove dialog of 'Groups' entity

Fixes: https://pagure.io/freeipa/issue/7699
---
 install/ui/src/freeipa/group.js     | 5 ++++-
 install/ui/src/freeipa/hostgroup.js | 5 ++++-
 install/ui/src/freeipa/netgroup.js  | 5 ++++-
 ipaserver/plugins/internal.py       | 3 +++
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/install/ui/src/freeipa/group.js b/install/ui/src/freeipa/group.js
index 3030374dde..b530e13397 100644
--- a/install/ui/src/freeipa/group.js
+++ b/install/ui/src/freeipa/group.js
@@ -207,7 +207,10 @@ return {
             },
             'gidnumber'
         ]
-    }
+    },
+    deleter_dialog: {
+        title: '@i18n:objects.group.remove',
+    },
 };};
 
 IPA.group_adder_dialog = function(spec) {
diff --git a/install/ui/src/freeipa/hostgroup.js b/install/ui/src/freeipa/hostgroup.js
index c38281c56b..a7646a4c05 100644
--- a/install/ui/src/freeipa/hostgroup.js
+++ b/install/ui/src/freeipa/hostgroup.js
@@ -97,7 +97,10 @@ return {
                 name: 'description'
             }
         ]
-    }
+    },
+    deleter_dialog: {
+        title: '@i18n:objects.hostgroup.remove',
+    },
 };};
 
 
diff --git a/install/ui/src/freeipa/netgroup.js b/install/ui/src/freeipa/netgroup.js
index 3b32d41244..edb66e550c 100644
--- a/install/ui/src/freeipa/netgroup.js
+++ b/install/ui/src/freeipa/netgroup.js
@@ -72,7 +72,10 @@ var spec = {
                 name: 'description'
             }
         ]
-    }
+    },
+    deleter_dialog: {
+        title: '@i18n:objects.netgroup.remove',
+    },
 };
 
     add_netgroup_details_facet_widgets(spec.facets[1]);
diff --git a/ipaserver/plugins/internal.py b/ipaserver/plugins/internal.py
index 57fb14775b..5becae9658 100644
--- a/ipaserver/plugins/internal.py
+++ b/ipaserver/plugins/internal.py
@@ -604,6 +604,7 @@ class i18n_messages(Command):
                 "make_posix": _("Change to POSIX group"),
                 "nonposix": _("Non-POSIX"),
                 "posix": _("POSIX"),
+                "remove": _("Remove user groups"),
                 "type": _("Group Type"),
                 "user_groups": _("User Groups"),
             },
@@ -669,6 +670,7 @@ class i18n_messages(Command):
             "hostgroup": {
                 "host_group": _("Host Groups"),
                 "identity": _("Host Group Settings"),
+                "remove": _("Remove host groups"),
             },
             "idoverrideuser": {
                 "anchor_label": _("User to override"),
@@ -712,6 +714,7 @@ class i18n_messages(Command):
                 "hosts": _("Hosts"),
                 "identity": _("Netgroup Settings"),
                 "netgroups": _("Netgroups"),
+                "remove": _("Remove netgroups"),
                 "specified_hosts": _("Specified Hosts and Groups"),
                 "specified_users": _("Specified Users and Groups"),
                 "user": _("User"),

From 79bb7a9e75d6c0b9cb5120bea450f3b37b08f1be Mon Sep 17 00:00:00 2001
From: Stanislav Levin <s...@altlinux.org>
Date: Thu, 13 Sep 2018 21:53:29 +0300
Subject: [PATCH 06/20] Add title to remove dialog of 'ID Views' entity

Fixes: https://pagure.io/freeipa/issue/7699
---
 install/ui/src/freeipa/idviews.js | 5 ++++-
 ipaserver/plugins/internal.py     | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/install/ui/src/freeipa/idviews.js b/install/ui/src/freeipa/idviews.js
index afd2dadd20..163cd992d8 100644
--- a/install/ui/src/freeipa/idviews.js
+++ b/install/ui/src/freeipa/idviews.js
@@ -215,7 +215,10 @@ return {
                 name: 'description'
             }
         ]
-    }
+    },
+    deleter_dialog: {
+        title: '@i18n:objects.idview.remove',
+    },
 };};
 
 var make_idoverrideuser_spec = function() {
diff --git a/ipaserver/plugins/internal.py b/ipaserver/plugins/internal.py
index 5becae9658..012fe38619 100644
--- a/ipaserver/plugins/internal.py
+++ b/ipaserver/plugins/internal.py
@@ -693,6 +693,7 @@ class i18n_messages(Command):
                 "apply_hosts_title": _("Apply ID view ${primary_key} on ${entity}"),
                 "ipaassignedidview": _("Assigned ID View"),
                 "overrides_tab": _("${primary_key} overrides:"),
+                "remove": _("Remove ID views"),
                 "unapply_hostgroups": _("Un-apply from host groups"),
                 "unapply_hostgroups_all_title": _("Un-apply ID Views from hosts of hostgroups"),
                 "unapply_hostgroups_title": _("Un-apply ID View ${primary_key} from hosts of ${entity}"),

From 8cd5a54a70ed2295d6e3e7266aed769761ec27c9 Mon Sep 17 00:00:00 2001
From: Stanislav Levin <s...@altlinux.org>
Date: Thu, 13 Sep 2018 22:18:00 +0300
Subject: [PATCH 07/20] Add title to remove dialog of 'Automember' entity

Fixes: https://pagure.io/freeipa/issue/7699
---
 install/ui/src/freeipa/automember.js | 1 +
 ipaserver/plugins/internal.py        | 1 +
 2 files changed, 2 insertions(+)

diff --git a/install/ui/src/freeipa/automember.js b/install/ui/src/freeipa/automember.js
index a1d56a1b15..1a2a8f1bf8 100644
--- a/install/ui/src/freeipa/automember.js
+++ b/install/ui/src/freeipa/automember.js
@@ -117,6 +117,7 @@ return {
         height: '300'
     },
     deleter_dialog: {
+        title: '@i18n:objects.automember.remove',
         $factory: IPA.automember.rule_deleter_dialog
     }
 };};
diff --git a/ipaserver/plugins/internal.py b/ipaserver/plugins/internal.py
index 012fe38619..bdbc97974e 100644
--- a/ipaserver/plugins/internal.py
+++ b/ipaserver/plugins/internal.py
@@ -418,6 +418,7 @@ class i18n_messages(Command):
                 "hostgrouprule": _("Host group rule"),
                 "hostgrouprules": _("Host group rules"),
                 "inclusive": _("Inclusive"),
+                "remove": _("Remove auto membership rules"),
                 "usergrouprule": _("User group rule"),
                 "usergrouprules": _("User group rules"),
             },

From 19329eed034c552b771deb7d84ca34aed8da0e09 Mon Sep 17 00:00:00 2001
From: Stanislav Levin <s...@altlinux.org>
Date: Fri, 14 Sep 2018 09:11:57 +0300
Subject: [PATCH 08/20] Add title to remove dialog of 'HBAC' entity

Fixes: https://pagure.io/freeipa/issue/7699
---
 install/ui/src/freeipa/hbac.js | 17 +++++++++++++----
 ipaserver/plugins/internal.py  |  3 +++
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/install/ui/src/freeipa/hbac.js b/install/ui/src/freeipa/hbac.js
index 6161942b93..674de79d40 100644
--- a/install/ui/src/freeipa/hbac.js
+++ b/install/ui/src/freeipa/hbac.js
@@ -98,7 +98,10 @@ var spec =  {
     ],
     adder_dialog: {
         fields: [ 'cn' ]
-    }
+    },
+    deleter_dialog: {
+        title: '@i18n:objects.hbacrule.remove',
+    },
 };
 
     add_hbacrule_details_facet_widgets(spec.facets[1]);
@@ -162,7 +165,10 @@ return {
                 name: 'description'
             }
         ]
-    }
+    },
+    deleter_dialog: {
+        title: '@i18n:objects.hbacsvc.remove',
+    },
 };};
 
 var make_service_group_spec = function() {
@@ -221,7 +227,10 @@ return {
                 name: 'description'
             }
         ]
-    }
+    },
+    deleter_dialog: {
+        title: '@i18n:objects.hbacsvcgroup.remove',
+    },
 };};
 
 /**
@@ -503,4 +512,4 @@ exp.register = function() {
 phases.on('registration', exp.register);
 
 return exp;
-});
\ No newline at end of file
+});
diff --git a/ipaserver/plugins/internal.py b/ipaserver/plugins/internal.py
index bdbc97974e..779eaa8a71 100644
--- a/ipaserver/plugins/internal.py
+++ b/ipaserver/plugins/internal.py
@@ -615,6 +615,7 @@ class i18n_messages(Command):
                 "anyone": _("Anyone"),
                 "host": _("Accessing"),
                 "ipaenabledflag": _("Rule status"),
+                "remove": _("Remove HBAC rules"),
                 "service": _("Via Service"),
                 "specified_hosts": _("Specified Hosts and Groups"),
                 "specified_services": _("Specified Services and Groups"),
@@ -622,8 +623,10 @@ class i18n_messages(Command):
                 "user": _("Who"),
             },
             "hbacsvc": {
+                "remove": _("Remove HBAC services"),
             },
             "hbacsvcgroup": {
+                "remove": _("Remove HBAC service groups"),
                 "services": _("Services"),
             },
             "hbactest": {

From 829196d67cc7b3038e1d167f8f26355378e44222 Mon Sep 17 00:00:00 2001
From: Stanislav Levin <s...@altlinux.org>
Date: Fri, 14 Sep 2018 09:23:49 +0300
Subject: [PATCH 09/20] Add title to remove dialog of 'Sudo' entity

Fixes: https://pagure.io/freeipa/issue/7699
---
 install/ui/src/freeipa/sudo.js | 15 ++++++++++++---
 ipaserver/plugins/internal.py  |  3 +++
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/install/ui/src/freeipa/sudo.js b/install/ui/src/freeipa/sudo.js
index dd9b7e5e06..497964a08e 100644
--- a/install/ui/src/freeipa/sudo.js
+++ b/install/ui/src/freeipa/sudo.js
@@ -98,7 +98,10 @@ var spec = {
     ],
     adder_dialog: {
         fields: [ 'cn' ]
-    }
+    },
+    deleter_dialog: {
+        title: '@i18n:objects.sudorule.remove',
+    },
 };
 
     add_sudorule_details_facet_widgets(spec.facets[1]);
@@ -163,7 +166,10 @@ return {
                 name: 'description'
             }
         ]
-    }
+    },
+    deleter_dialog: {
+        title: '@i18n:objects.sudocmd.remove',
+    },
 };};
 
 
@@ -223,7 +229,10 @@ return {
                 name: 'description'
             }
         ]
-    }
+    },
+    deleter_dialog: {
+        title: '@i18n:objects.sudocmdgroup.remove',
+    },
 };};
 
 /**
diff --git a/ipaserver/plugins/internal.py b/ipaserver/plugins/internal.py
index 779eaa8a71..2556e3b14f 100644
--- a/ipaserver/plugins/internal.py
+++ b/ipaserver/plugins/internal.py
@@ -853,9 +853,11 @@ class i18n_messages(Command):
             },
             "sudocmd": {
                 "groups": _("Groups"),
+                "remove": _("Remove sudo commands"),
             },
             "sudocmdgroup": {
                 "commands": _("Commands"),
+                "remove": _("Remove sudo command groups"),
             },
             "sudorule": {
                 "allow": _("Allow"),
@@ -871,6 +873,7 @@ class i18n_messages(Command):
                 "option_added": _("Option added"),
                 "option_removed": _("${count} option(s) removed"),
                 "options": _("Options"),
+                "remove": _("Remove sudo rules"),
                 "runas": _("As Whom"),
                 "specified_commands": _("Specified Commands and Groups"),
                 "specified_groups": _("Specified Groups"),

From 70ec569366ea36f9be1d0a653e3b99c826bc2ad3 Mon Sep 17 00:00:00 2001
From: Stanislav Levin <s...@altlinux.org>
Date: Fri, 14 Sep 2018 09:49:29 +0300
Subject: [PATCH 10/20] Add title to remove dialog of 'SELinux User Maps'
 entity

Fixes: https://pagure.io/freeipa/issue/7699
---
 install/ui/src/freeipa/selinux.js | 7 +++++--
 ipaserver/plugins/internal.py     | 1 +
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/install/ui/src/freeipa/selinux.js b/install/ui/src/freeipa/selinux.js
index 9a74a45afc..2fb28826bc 100644
--- a/install/ui/src/freeipa/selinux.js
+++ b/install/ui/src/freeipa/selinux.js
@@ -99,7 +99,10 @@ var spec = {
             'cn',
             'ipaselinuxuser'
         ]
-    }
+    },
+    deleter_dialog: {
+        title: '@i18n:objects.selinuxusermap.remove',
+    },
 };
 
     add_selinux_details_facet_widgets(spec.facets[1]);
@@ -334,4 +337,4 @@ exp.register = function() {
 phases.on('registration', exp.register);
 
 return exp;
-});
\ No newline at end of file
+});
diff --git a/ipaserver/plugins/internal.py b/ipaserver/plugins/internal.py
index 2556e3b14f..5dfa7ce34c 100644
--- a/ipaserver/plugins/internal.py
+++ b/ipaserver/plugins/internal.py
@@ -795,6 +795,7 @@ class i18n_messages(Command):
                 "any_host": _("Any Host"),
                 "anyone": _("Anyone"),
                 "host": _("Host"),
+                "remove": _("Remove selinux user maps"),
                 "specified_hosts": _("Specified Hosts and Groups"),
                 "specified_users": _("Specified Users and Groups"),
                 "user": _("User"),

From 9f54dae3e86d26fcbdcc2bdca71accdb2387431b Mon Sep 17 00:00:00 2001
From: Stanislav Levin <s...@altlinux.org>
Date: Fri, 14 Sep 2018 09:54:31 +0300
Subject: [PATCH 11/20] Add title to remove dialog of 'Password Policies'
 entity

Fixes: https://pagure.io/freeipa/issue/7699
---
 install/ui/src/freeipa/policy.js | 7 +++++--
 ipaserver/plugins/internal.py    | 1 +
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/install/ui/src/freeipa/policy.js b/install/ui/src/freeipa/policy.js
index 83f47e70eb..b890f2bda3 100644
--- a/install/ui/src/freeipa/policy.js
+++ b/install/ui/src/freeipa/policy.js
@@ -93,7 +93,10 @@ return {
             }
         ],
         height: 300
-    }
+    },
+    deleter_dialog: {
+        title: '@i18n:objects.pwpolicy.remove',
+    },
 };};
 
 exp.krbtpolicy = IPA.krbtpolicy = {};
@@ -135,4 +138,4 @@ exp.register = function() {
 phases.on('registration', exp.register);
 
 return exp;
-});
\ No newline at end of file
+});
diff --git a/ipaserver/plugins/internal.py b/ipaserver/plugins/internal.py
index 5dfa7ce34c..52a247c00d 100644
--- a/ipaserver/plugins/internal.py
+++ b/ipaserver/plugins/internal.py
@@ -761,6 +761,7 @@ class i18n_messages(Command):
             },
             "pwpolicy": {
                 "identity": _("Password Policy"),
+                "remove": _("Remove password policies"),
             },
             "idrange": {
                 "details": _("Range Settings"),

From 812d5615a50ac38f74d1a29bdfbf09583a1ec052 Mon Sep 17 00:00:00 2001
From: Stanislav Levin <s...@altlinux.org>
Date: Fri, 14 Sep 2018 11:05:28 +0300
Subject: [PATCH 12/20] Add title to remove dialog of 'Certificates' entity

Fixes: https://pagure.io/freeipa/issue/7699
---
 install/ui/src/freeipa/plugins/ca.js          | 5 ++++-
 install/ui/src/freeipa/plugins/caacl.js       | 5 ++++-
 install/ui/src/freeipa/plugins/certprofile.js | 5 ++++-
 ipaserver/plugins/internal.py                 | 7 +++++++
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/install/ui/src/freeipa/plugins/ca.js b/install/ui/src/freeipa/plugins/ca.js
index 8e2fb702fe..33a21f0109 100644
--- a/install/ui/src/freeipa/plugins/ca.js
+++ b/install/ui/src/freeipa/plugins/ca.js
@@ -63,7 +63,10 @@ function(IPA, $, phases, reg, cert) {
                      name: 'description'
                  }
              ]
-         }
+         },
+         deleter_dialog: {
+             title: '@i18n:objects.ca.remove',
+         },
      };
 
      return spec;
diff --git a/install/ui/src/freeipa/plugins/caacl.js b/install/ui/src/freeipa/plugins/caacl.js
index e101d25fb6..3408693a5c 100644
--- a/install/ui/src/freeipa/plugins/caacl.js
+++ b/install/ui/src/freeipa/plugins/caacl.js
@@ -102,7 +102,10 @@ var spec = {
                 name: 'description'
             }
         ]
-    }
+    },
+    deleter_dialog: {
+        title: '@i18n:objects.caacl.remove',
+    },
 };
 
     add_caacl_details_facet_widgets(spec.facets[1]);
diff --git a/install/ui/src/freeipa/plugins/certprofile.js b/install/ui/src/freeipa/plugins/certprofile.js
index 8f777e8917..330d3504f1 100644
--- a/install/ui/src/freeipa/plugins/certprofile.js
+++ b/install/ui/src/freeipa/plugins/certprofile.js
@@ -58,7 +58,10 @@ return {
                 }
             ]
         }
-    ]
+    ],
+    deleter_dialog: {
+        title: '@i18n:objects.caprofile.remove',
+    },
 };};
 
 
diff --git a/ipaserver/plugins/internal.py b/ipaserver/plugins/internal.py
index 52a247c00d..7271c49774 100644
--- a/ipaserver/plugins/internal.py
+++ b/ipaserver/plugins/internal.py
@@ -432,6 +432,9 @@ class i18n_messages(Command):
                 "direct": _("Direct"),
                 "indirect": _("Indirect"),
             },
+            "ca": {
+                "remove": _("Remove certificate authorities"),
+            },
             "caacl": {
                 "all": _("All"),
                 "any_ca": _("Any CA"),
@@ -442,6 +445,7 @@ class i18n_messages(Command):
                 "ipaenabledflag": _("Rule status"),
                 "no_ca_msg": _("If no CAs are specified, requests to the default CA are allowed."),
                 "profile": _("Profiles"),
+                "remove": _("Remove CA ACLs"),
                 "specified_cas": _("Specified CAs"),
                 "specified_hosts": _("Specified Hosts and Groups"),
                 "specified_profiles": _("Specified Profiles"),
@@ -449,6 +453,9 @@ class i18n_messages(Command):
                 "specified_users": _("Specified Users and Groups"),
                 "who": _("Permitted to have certificates issued"),
             },
+            "caprofile": {
+                "remove": _("Remove certificate profiles"),
+            },
             "cert": {
                 "aa_compromise": _("AA Compromise"),
                 "add_principal": _("Add principal"),

From 47ecc8e811e1f9b529db331fc2a2822e46d66dbc Mon Sep 17 00:00:00 2001
From: Stanislav Levin <s...@altlinux.org>
Date: Fri, 14 Sep 2018 11:09:09 +0300
Subject: [PATCH 13/20] Add title to remove dialog of 'OTP Tokens' entity

Fixes: https://pagure.io/freeipa/issue/7699
---
 install/ui/src/freeipa/otptoken.js | 5 ++++-
 ipaserver/plugins/internal.py      | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/install/ui/src/freeipa/otptoken.js b/install/ui/src/freeipa/otptoken.js
index 1f6f20d801..ebd161dc05 100644
--- a/install/ui/src/freeipa/otptoken.js
+++ b/install/ui/src/freeipa/otptoken.js
@@ -305,7 +305,10 @@ return {
             },
             'description'
         ]
-    }
+    },
+    deleter_dialog: {
+        title: '@i18n:objects.otptoken.remove',
+    },
 };};
 
 otptoken.adder_policy = function(spec) {
diff --git a/ipaserver/plugins/internal.py b/ipaserver/plugins/internal.py
index 7271c49774..1eccff14c1 100644
--- a/ipaserver/plugins/internal.py
+++ b/ipaserver/plugins/internal.py
@@ -741,6 +741,7 @@ class i18n_messages(Command):
                 "details": _("OTP Token Settings"),
                 "disable": _("Disable token"),
                 "enable": _("Enable token"),
+                "remove": _("Remove OTP tokens"),
                 "show_qr": _("Show QR code"),
                 "show_uri": _("Show configuration uri"),
                 "type_hotp": _("Counter-based (HOTP)"),

From fe9aac4210b3199944e952882e502b80e70abaa6 Mon Sep 17 00:00:00 2001
From: Stanislav Levin <s...@altlinux.org>
Date: Fri, 14 Sep 2018 11:15:13 +0300
Subject: [PATCH 14/20] Add title to remove dialog of 'RADIUS Servers' entity

Fixes: https://pagure.io/freeipa/issue/7699
---
 install/ui/src/freeipa/radiusproxy.js | 5 ++++-
 ipaserver/plugins/internal.py         | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/install/ui/src/freeipa/radiusproxy.js b/install/ui/src/freeipa/radiusproxy.js
index d4283f72cd..cb464ec9e1 100644
--- a/install/ui/src/freeipa/radiusproxy.js
+++ b/install/ui/src/freeipa/radiusproxy.js
@@ -105,7 +105,10 @@ return {
             },
             'ipatokenusermapattribute'
         ]
-    }
+    },
+    deleter_dialog: {
+        title: '@i18n:objects.radiusproxy.remove',
+    },
 };};
 
 /**
diff --git a/ipaserver/plugins/internal.py b/ipaserver/plugins/internal.py
index 1eccff14c1..e0ea2b0d8e 100644
--- a/ipaserver/plugins/internal.py
+++ b/ipaserver/plugins/internal.py
@@ -788,6 +788,7 @@ class i18n_messages(Command):
             },
             "radiusproxy": {
                 "details": _("RADIUS Proxy Server Settings"),
+                "remove": _("Remove RADIUS servers"),
             },
             "realmdomains": {
                 "identity": _("Realm Domains"),

From 78da674f502848766a7630346cc5ddf659f6fd0d Mon Sep 17 00:00:00 2001
From: Stanislav Levin <s...@altlinux.org>
Date: Fri, 14 Sep 2018 11:23:45 +0300
Subject: [PATCH 15/20] Add title to remove dialog of 'Certificate Identity
 Mapping Rules' entity

Fixes: https://pagure.io/freeipa/issue/7699
---
 install/ui/src/freeipa/plugins/certmap.js | 5 ++++-
 ipaserver/plugins/internal.py             | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/install/ui/src/freeipa/plugins/certmap.js b/install/ui/src/freeipa/plugins/certmap.js
index c613601e98..04c54d506e 100644
--- a/install/ui/src/freeipa/plugins/certmap.js
+++ b/install/ui/src/freeipa/plugins/certmap.js
@@ -165,7 +165,10 @@ return {
                 name: 'description'
             }
         ]
-    }
+    },
+    deleter_dialog: {
+        title: '@i18n:objects.certmap.remove',
+    },
 };};
 
 
diff --git a/ipaserver/plugins/internal.py b/ipaserver/plugins/internal.py
index e0ea2b0d8e..edcfbf8f49 100644
--- a/ipaserver/plugins/internal.py
+++ b/ipaserver/plugins/internal.py
@@ -545,6 +545,7 @@ class i18n_messages(Command):
                 "deleter_title": _("Remove Certificate Mapping Data"),
                 "issuer": _("Issuer"),
                 "issuer_subject": _("Issuer and subject"),
+                "remove": _("Remove certificate identity mapping rules"),
                 "subject": _("Subject"),
                 "version": _("Version"),
             },

From 7295edc2ef18458882898ce8944a8d99b04f4183 Mon Sep 17 00:00:00 2001
From: Stanislav Levin <s...@altlinux.org>
Date: Fri, 14 Sep 2018 11:28:36 +0300
Subject: [PATCH 16/20] Add title to remove dialog of 'Automount Locations'
 entity

Fixes: https://pagure.io/freeipa/issue/7699
---
 install/ui/src/freeipa/automount.js | 7 +++++--
 ipaserver/plugins/internal.py       | 3 ++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/install/ui/src/freeipa/automount.js b/install/ui/src/freeipa/automount.js
index ca0729beb6..55a7334e08 100644
--- a/install/ui/src/freeipa/automount.js
+++ b/install/ui/src/freeipa/automount.js
@@ -64,7 +64,10 @@ return {
     ],
     adder_dialog: {
         fields: [ 'cn' ]
-    }
+    },
+    deleter_dialog: {
+        title: '@i18n:objects.automountlocation.remove',
+    },
 };};
 
 var make_map_spec = function() {
@@ -373,4 +376,4 @@ exp.register = function() {
 phases.on('registration', exp.register);
 
 return exp;
-});
\ No newline at end of file
+});
diff --git a/ipaserver/plugins/internal.py b/ipaserver/plugins/internal.py
index edcfbf8f49..457c04dc7b 100644
--- a/ipaserver/plugins/internal.py
+++ b/ipaserver/plugins/internal.py
@@ -425,7 +425,8 @@ class i18n_messages(Command):
             "automountkey": {
             },
             "automountlocation": {
-                "identity": _("Automount Location Settings")
+                "identity": _("Automount Location Settings"),
+                "remove": _("Remove automount locations"),
             },
             "automountmap": {
                 "map_type": _("Map Type"),

From 5936a72707b86b4c7ef625bff324831eb0c14b33 Mon Sep 17 00:00:00 2001
From: Stanislav Levin <s...@altlinux.org>
Date: Fri, 14 Sep 2018 11:44:02 +0300
Subject: [PATCH 17/20] Add title to remove dialog of 'DNS' entity

Fixes: https://pagure.io/freeipa/issue/7699
---
 install/ui/src/freeipa/dns.js | 10 ++++++++--
 ipaserver/plugins/internal.py |  4 ++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/install/ui/src/freeipa/dns.js b/install/ui/src/freeipa/dns.js
index 1be8513688..6b360f7096 100644
--- a/install/ui/src/freeipa/dns.js
+++ b/install/ui/src/freeipa/dns.js
@@ -328,7 +328,10 @@ return {
         policies: [
             IPA.add_dns_zone_name_policy
         ]
-    }
+    },
+    deleter_dialog: {
+        title: '@i18n:objects.dnszone.remove',
+    },
 };};
 
 var make_forwardzone_spec = function() {
@@ -500,7 +503,10 @@ return {
         policies: [
             IPA.add_dns_zone_name_policy
         ]
-    }
+    },
+    deleter_dialog: {
+        title: '@i18n:objects.dnsforwardzone.remove',
+    },
 };};
 
 
diff --git a/ipaserver/plugins/internal.py b/ipaserver/plugins/internal.py
index 457c04dc7b..d780e21526 100644
--- a/ipaserver/plugins/internal.py
+++ b/ipaserver/plugins/internal.py
@@ -568,6 +568,9 @@ class i18n_messages(Command):
                 "update_dns_dialog_msg": _("Do you want to update system DNS records?"),
                 "updated_dns": _("System DNS records updated"),
             },
+            "dnsforwardzone": {
+                "remove": _("Remove DNS forward zones"),
+            },
             "dnsrecord": {
                 "data": _("Data"),
                 "deleted_no_data": _("DNS record was deleted because it contained no data."),
@@ -592,6 +595,7 @@ class i18n_messages(Command):
                 "identity": _("DNS Zone Settings"),
                 "add_permission":_("Add Permission"),
                 "add_permission_confirm":_("Are you sure you want to add permission for DNS Zone ${object}?"),
+                "remove": _("Remove DNS zones"),
                 "remove_permission": _("Remove Permission"),
                 "remove_permission_confirm": _("Are you sure you want to remove permission for DNS Zone ${object}?"),
                 "skip_dns_check": _("Skip DNS check"),

From f85a576450f4467f112e507728228ef34e3daa34 Mon Sep 17 00:00:00 2001
From: Stanislav Levin <s...@altlinux.org>
Date: Fri, 14 Sep 2018 12:23:45 +0300
Subject: [PATCH 18/20] Add title to remove dialog of 'RBAC' entity

Fixes: https://pagure.io/freeipa/issue/7699
---
 install/ui/src/freeipa/aci.js | 25 ++++++++++++++++++++-----
 ipaserver/plugins/internal.py | 15 +++++++++++++++
 2 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/install/ui/src/freeipa/aci.js b/install/ui/src/freeipa/aci.js
index b1629cd511..1b7e6d2cfd 100644
--- a/install/ui/src/freeipa/aci.js
+++ b/install/ui/src/freeipa/aci.js
@@ -298,7 +298,10 @@ return {
                 widget_name: 'target'
             }
         ]
-    }
+    },
+    deleter_dialog: {
+        title: '@i18n:objects.acipermission.remove',
+    },
 };};
 
 /**
@@ -369,7 +372,10 @@ return {
                 name: 'description'
             }
         ]
-    }
+    },
+    deleter_dialog: {
+        title: '@i18n:objects.aciprivilege.remove',
+    },
 };};
 
 var make_role_spec = function() {
@@ -417,7 +423,10 @@ return {
                 name: 'description'
             }
         ]
-    }
+    },
+    deleter_dialog: {
+        title: '@i18n:objects.acirole.remove',
+    },
 };};
 
 var make_selfservice_spec = function() {
@@ -457,7 +466,10 @@ return {
                 name: 'attrs'
             }
         ]
-    }
+    },
+    deleter_dialog: {
+        title: '@i18n:objects.aciselfservice.remove',
+    },
 };};
 
 
@@ -534,7 +546,10 @@ return {
                 object_type: 'user'
             }
         ]
-    }
+    },
+    deleter_dialog: {
+        title: '@i18n:objects.acidelegation.remove',
+    },
 };};
 
 aci.attributes_widget = function(spec) {
diff --git a/ipaserver/plugins/internal.py b/ipaserver/plugins/internal.py
index d780e21526..95ee5bb738 100644
--- a/ipaserver/plugins/internal.py
+++ b/ipaserver/plugins/internal.py
@@ -407,6 +407,21 @@ class i18n_messages(Command):
             "aci": {
                 "attribute": _("Attribute"),
             },
+            "acidelegation": {
+                "remove": _("Remove delegations"),
+            },
+            "acipermission": {
+                "remove": _("Remove permissions"),
+            },
+            "aciprivilege": {
+                "remove": _("Remove privileges"),
+            },
+            "acirole": {
+                "remove": _("Remove roles"),
+            },
+            "aciselfservice": {
+                "remove": _("Remove self service permissions"),
+            },
             "automember": {
                 "add_condition": _("Add Condition into ${pkey}"),
                 "add_rule": _("Add Rule"),

From 5d2973f0b3535a944708df68f66f03f5183157bb Mon Sep 17 00:00:00 2001
From: Stanislav Levin <s...@altlinux.org>
Date: Fri, 14 Sep 2018 12:28:10 +0300
Subject: [PATCH 19/20] Add title to remove dialog of 'ID Ranges' entity

Fixes: https://pagure.io/freeipa/issue/7699
---
 install/ui/src/freeipa/idrange.js | 7 +++++--
 ipaserver/plugins/internal.py     | 1 +
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/install/ui/src/freeipa/idrange.js b/install/ui/src/freeipa/idrange.js
index 8af1598af3..b77c47e39b 100644
--- a/install/ui/src/freeipa/idrange.js
+++ b/install/ui/src/freeipa/idrange.js
@@ -145,7 +145,10 @@ return {
         policies: [
                 IPA.idrange_adder_policy
         ]
-    }
+    },
+    deleter_dialog: {
+        title: '@i18n:objects.idrange.remove',
+    },
 };};
 
 IPA.idrange_adder_policy = function(spec) {
@@ -279,4 +282,4 @@ exp.register = function() {
 phases.on('registration', exp.register);
 
 return {};
-});
\ No newline at end of file
+});
diff --git a/ipaserver/plugins/internal.py b/ipaserver/plugins/internal.py
index 95ee5bb738..d6f147ae3e 100644
--- a/ipaserver/plugins/internal.py
+++ b/ipaserver/plugins/internal.py
@@ -799,6 +799,7 @@ class i18n_messages(Command):
                 "ipaidrangesize": _("Range size"),
                 "ipanttrusteddomainsid": _("Domain SID"),
                 "ipasecondarybaserid": _("Secondary RID base"),
+                "remove": _("Remove ID ranges"),
                 "type": _("Range type"),
                 "type_ad": _("Active Directory domain"),
                 "type_ad_posix": _("Active Directory domain with POSIX attributes"),

From f21410807aefe05d1fd6ea2853c062b429011fc7 Mon Sep 17 00:00:00 2001
From: Stanislav Levin <s...@altlinux.org>
Date: Fri, 14 Sep 2018 13:20:30 +0300
Subject: [PATCH 20/20] Add title to remove dialog of 'Topology' entity

Fixes: https://pagure.io/freeipa/issue/7699
---
 install/ui/src/freeipa/topology.js | 10 ++++++++--
 ipaserver/plugins/internal.py      |  6 ++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/install/ui/src/freeipa/topology.js b/install/ui/src/freeipa/topology.js
index e98cb1e0ac..271ff8c70e 100644
--- a/install/ui/src/freeipa/topology.js
+++ b/install/ui/src/freeipa/topology.js
@@ -190,7 +190,10 @@ return {
                 z_index: 1
             }
         ]
-    }
+    },
+    deleter_dialog: {
+        title: '@i18n:objects.topologysegment.remove',
+    },
 };};
 
 var make_server_spec = function() {
@@ -461,7 +464,10 @@ return {
             },
             'description'
         ]
-    }
+    },
+    deleter_dialog: {
+        title: '@i18n:objects.topologylocation.remove',
+    },
 };};
 
 topology.location_adapter = declare([mod_field.Adapter], {
diff --git a/ipaserver/plugins/internal.py b/ipaserver/plugins/internal.py
index d6f147ae3e..e2e007ae19 100644
--- a/ipaserver/plugins/internal.py
+++ b/ipaserver/plugins/internal.py
@@ -923,6 +923,12 @@ class i18n_messages(Command):
                 "replication_config": _("Replication configuration"),
                 "insufficient_domain_level" : _("Managed topology requires minimal domain level ${domainlevel}"),
             },
+            "topologylocation": {
+                "remove": _("Remove IPA locations"),
+            },
+            "topologysegment": {
+                "remove": _("Remove topology segments"),
+            },
             "trust": {
                 "account": _("Account"),
                 "admin_account": _("Administrative account"),
_______________________________________________
FreeIPA-devel mailing list -- freeipa-devel@lists.fedorahosted.org
To unsubscribe send an email to freeipa-devel-le...@lists.fedorahosted.org
Fedora Code of Conduct: https://getfedora.org/code-of-conduct.html
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: 
https://lists.fedorahosted.org/archives/list/freeipa-devel@lists.fedorahosted.org

Reply via email to