From 073eac085a17fd4d80d476bb6b1f383dd69ed78b Mon Sep 17 00:00:00 2001 From: Stanislav Levin Date: Tue, 25 Sep 2018 11:11:48 +0300 Subject: [PATCH] Add title to 'add' dialog for 'association_table' widget of Certificates entity To improve translation quality the title of 'Add' 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/7712 Fixes: https://pagure.io/freeipa/issue/7714 Reviewed-By: Serhii Tsymbaliuk --- install/ui/src/freeipa/plugins/caacl.js | 14 +++++++------- ipaserver/plugins/internal.py | 22 ++++++++++++++++++++++ 2 files changed, 29 insertions(+), 7 deletions(-) diff --git a/install/ui/src/freeipa/plugins/caacl.js b/install/ui/src/freeipa/plugins/caacl.js index d5aaacb42..dd39876ac 100644 --- a/install/ui/src/freeipa/plugins/caacl.js +++ b/install/ui/src/freeipa/plugins/caacl.js @@ -197,7 +197,7 @@ var add_caacl_details_facet_widgets = function (spec) { name: 'ipamembercertprofile_certprofile', add_method: 'add_profile', remove_method: 'remove_profile', - add_title: '@i18n:association.add.member', + add_title: '@i18n:objects.caacl.add_profiles', remove_title: '@i18n:objects.caacl.remove_profiles' } ] @@ -302,7 +302,7 @@ var add_caacl_details_facet_widgets = function (spec) { name: 'memberuser_user', add_method: 'add_user', remove_method: 'remove_user', - add_title: '@i18n:association.add.member', + add_title: '@i18n:objects.caacl.add_users', remove_title: '@i18n:objects.caacl.remove_users' }, { @@ -311,7 +311,7 @@ var add_caacl_details_facet_widgets = function (spec) { name: 'memberuser_group', add_method: 'add_user', remove_method: 'remove_user', - add_title: '@i18n:association.add.member', + add_title: '@i18n:objects.caacl.add_groups', remove_title: '@i18n:objects.caacl.remove_groups' } ] @@ -341,7 +341,7 @@ var add_caacl_details_facet_widgets = function (spec) { name: 'memberhost_host', add_method: 'add_host', remove_method: 'remove_host', - add_title: '@i18n:association.add.member', + add_title: '@i18n:objects.caacl.add_hosts', remove_title: '@i18n:objects.caacl.remove_hosts' }, { @@ -350,7 +350,7 @@ var add_caacl_details_facet_widgets = function (spec) { name: 'memberhost_hostgroup', add_method: 'add_host', remove_method: 'remove_host', - add_title: '@i18n:association.add.member', + add_title: '@i18n:objects.caacl.add_hostgroups', remove_title: '@i18n:objects.caacl.remove_hostgroups' } ] @@ -373,7 +373,7 @@ var add_caacl_details_facet_widgets = function (spec) { name: 'memberservice_service', add_method: 'add_service', remove_method: 'remove_service', - add_title: '@i18n:association.add.member', + add_title: '@i18n:objects.caacl.add_services', remove_title: '@i18n:objects.caacl.remove_services' } ] @@ -397,7 +397,7 @@ var add_caacl_details_facet_widgets = function (spec) { name: 'ipamemberca_ca', add_method: 'add_ca', remove_method: 'remove_ca', - add_title: '@i18n:association.add.member', + add_title: '@i18n:objects.caacl.add_ca', remove_title: '@i18n:objects.caacl.remove_ca' } ] diff --git a/ipaserver/plugins/internal.py b/ipaserver/plugins/internal.py index 9538f1716..146de0760 100644 --- a/ipaserver/plugins/internal.py +++ b/ipaserver/plugins/internal.py @@ -558,6 +558,28 @@ class i18n_messages(Command): }, "caacl": { "add": _("Add CA ACL"), + "add_ca": _( + "Add Certificate Authorities into CA ACL " + "'${primary_key}'" + ), + "add_groups": _( + "Add user groups into CA ACL '${primary_key}'" + ), + "add_hostgroups": _( + "Add host groups into CA ACL '${primary_key}'" + ), + "add_hosts": _( + "Add hosts into CA ACL '${primary_key}'" + ), + "add_profiles": _( + "Add certificate profiles into CA ACL '${primary_key}'" + ), + "add_services": _( + "Add services into CA ACL '${primary_key}'" + ), + "add_users": _( + "Add users into CA ACL '${primary_key}'" + ), "all": _("All"), "any_ca": _("Any CA"), "any_host": _("Any Host"),