From c115efd1e81b59e5a93b9ae419f724a2a6669cc0 Mon Sep 17 00:00:00 2001 From: Stanislav Levin Date: Sun, 16 Sep 2018 23:14:45 +0300 Subject: [PATCH] Add title to 'Remove' dialog for 'association_table' widget of 'SELinux' entity To improve translation quality the title of 'Remove' 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/7704 Reviewed-By: Serhii Tsymbaliuk --- install/ui/src/freeipa/selinux.js | 8 ++++---- ipaserver/plugins/internal.py | 12 ++++++++++++ 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/install/ui/src/freeipa/selinux.js b/install/ui/src/freeipa/selinux.js index 2fb28826b..bbc764b36 100644 --- a/install/ui/src/freeipa/selinux.js +++ b/install/ui/src/freeipa/selinux.js @@ -221,7 +221,7 @@ var add_selinux_details_facet_widgets = function (spec) { add_method: 'add_user', remove_method: 'remove_user', add_title: '@i18n:association.add.member', - remove_title: '@i18n:association.remove.member' + remove_title: '@i18n:objects.selinuxusermap.remove_users', }, { $type: 'rule_association_table', @@ -230,7 +230,7 @@ var add_selinux_details_facet_widgets = function (spec) { add_method: 'add_user', remove_method: 'remove_user', add_title: '@i18n:association.add.member', - remove_title: '@i18n:association.remove.member' + remove_title: '@i18n:objects.selinuxusermap.remove_groups', } ] } @@ -294,7 +294,7 @@ var add_selinux_details_facet_widgets = function (spec) { add_method: 'add_host', remove_method: 'remove_host', add_title: '@i18n:association.add.member', - remove_title: '@i18n:association.remove.member' + remove_title: '@i18n:objects.selinuxusermap.remove_hosts', }, { $type: 'rule_association_table', @@ -303,7 +303,7 @@ var add_selinux_details_facet_widgets = function (spec) { add_method: 'add_host', remove_method: 'remove_host', add_title: '@i18n:association.add.member', - remove_title: '@i18n:association.remove.member' + remove_title: '@i18n:objects.selinuxusermap.remove_hostgroups', } ] } diff --git a/ipaserver/plugins/internal.py b/ipaserver/plugins/internal.py index 2f38c7340..1c5376687 100644 --- a/ipaserver/plugins/internal.py +++ b/ipaserver/plugins/internal.py @@ -985,6 +985,18 @@ class i18n_messages(Command): "anyone": _("Anyone"), "host": _("Host"), "remove": _("Remove selinux user maps"), + "remove_groups": _( + "Remove user groups from SELinux user map '${primary_key}'" + ), + "remove_hostgroups": _( + "Remove host groups from SELinux user map '${primary_key}'" + ), + "remove_hosts": _( + "Remove hosts from SELinux user map '${primary_key}'" + ), + "remove_users": _( + "Remove users from SELinux user map '${primary_key}'" + ), "specified_hosts": _("Specified Hosts and Groups"), "specified_users": _("Specified Users and Groups"), "user": _("User"),