From 79aa59205a80cb03fcf1aad20c3b1abbfa6fec21 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 'Groups' 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/netgroup.js | 8 ++++---- ipaserver/plugins/internal.py | 16 ++++++++++++++-- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/install/ui/src/freeipa/netgroup.js b/install/ui/src/freeipa/netgroup.js index 24acb6491..235b9dae6 100644 --- a/install/ui/src/freeipa/netgroup.js +++ b/install/ui/src/freeipa/netgroup.js @@ -188,7 +188,7 @@ var add_netgroup_details_facet_widgets = function (spec) { add_method: 'add_member', remove_method: 'remove_member', add_title: '@i18n:association.add.member', - remove_title: '@i18n:association.remove.member', + remove_title: '@i18n:objects.netgroup.remove_users', columns: [ { name: 'memberuser_user', @@ -204,7 +204,7 @@ var add_netgroup_details_facet_widgets = function (spec) { add_method: 'add_member', remove_method: 'remove_member', add_title: '@i18n:association.add.member', - remove_title: '@i18n:association.remove.member', + remove_title: '@i18n:objects.netgroup.remove_groups', columns: [ { name: 'memberuser_group', @@ -277,7 +277,7 @@ var add_netgroup_details_facet_widgets = function (spec) { remove_method: 'remove_member', external: 'externalhost', add_title: '@i18n:association.add.member', - remove_title: '@i18n:association.remove.member', + remove_title: '@i18n:objects.netgroup.remove_hosts', columns: [ { name: 'memberhost_host', @@ -299,7 +299,7 @@ var add_netgroup_details_facet_widgets = function (spec) { add_method: 'add_member', remove_method: 'remove_member', add_title: '@i18n:association.add.member', - remove_title: '@i18n:association.remove.member', + remove_title: '@i18n:objects.netgroup.remove_hostgroups', columns: [ { name: 'memberhost_hostgroup', diff --git a/ipaserver/plugins/internal.py b/ipaserver/plugins/internal.py index bf5b3c11f..db44ec570 100644 --- a/ipaserver/plugins/internal.py +++ b/ipaserver/plugins/internal.py @@ -862,11 +862,23 @@ class i18n_messages(Command): "identity": _("Netgroup Settings"), "netgroups": _("Netgroups"), "remove": _("Remove netgroups"), + "remove_from_netgroups": _( + "Remove netgroup '${primary_key}' from netgroups" + ), + "remove_groups": _( + "Remove user groups from netgroup '${primary_key}'" + ), + "remove_hosts": _( + "Remove hosts from netgroup '${primary_key}'" + ), + "remove_hostgroups": _( + "Remove host groups from netgroup '${primary_key}'" + ), "remove_netgroups": _( "Remove netgroups from netgroup '${primary_key}'" ), - "remove_from_netgroups": _( - "Remove netgroup '${primary_key}' from netgroups" + "remove_users": _( + "Remove users from netgroup '${primary_key}'" ), "specified_hosts": _("Specified Hosts and Groups"), "specified_users": _("Specified Users and Groups"),