From dc9e5c57d575e215afba42078c662ccfe9dd0f0b Mon Sep 17 00:00:00 2001 From: Stanislav Levin Date: Oct 02 2018 14:37:17 +0000 Subject: Add title to 'add' dialog for details of 'Hosts' entity To improve translation quality the title of 'Add' dialog, which is initialized within details 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 --- diff --git a/install/ui/src/freeipa/host.js b/install/ui/src/freeipa/host.js index 91de7d6..eda42e0 100644 --- a/install/ui/src/freeipa/host.js +++ b/install/ui/src/freeipa/host.js @@ -374,7 +374,10 @@ return { enable_cond: ['userpassword_w'], show_cond: ['has_password'] }, - 'cert_request' + { + $type: 'cert_request', + title: '@i18n:objects.cert.issue_for_host' + } ], header_actions: ['automember_rebuild', 'unprovision', 'set_otp', 'reset_otp', 'request_cert'], @@ -404,6 +407,7 @@ return { $type: 'association', name: 'managedby_host', add_method: 'add_managedby', + add_title: '@i18n:objects.host.add_hosts_managing', remove_method: 'remove_managedby', remove_title: '@i18n:objects.host.remove_hosts_managing' }, @@ -411,18 +415,21 @@ return { $type: 'association', name: 'memberof_hostgroup', associator: IPA.serial_associator, + add_title: '@i18n:objects.host.add_into_groups', remove_title: '@i18n:objects.host.remove_from_groups' }, { $type: 'association', name: 'memberof_netgroup', associator: IPA.serial_associator, + add_title: '@i18n:objects.host.add_into_netgroups', remove_title: '@i18n:objects.host.remove_from_netgroups' }, { $type: 'association', name: 'memberof_role', associator: IPA.serial_associator, + add_title: '@i18n:objects.host.add_into_roles', remove_title: '@i18n:objects.host.remove_from_roles' }, { @@ -430,6 +437,7 @@ return { name: 'memberof_hbacrule', associator: IPA.serial_associator, add_method: 'add_host', + add_title: '@i18n:objects.host.add_into_hbac', remove_method: 'remove_host', remove_title: '@i18n:objects.host.remove_from_hbac' }, @@ -438,6 +446,7 @@ return { name: 'memberof_sudorule', associator: IPA.serial_associator, add_method: 'add_host', + add_title: '@i18n:objects.host.add_into_sudo', remove_method: 'remove_host', remove_title: '@i18n:objects.host.remove_from_sudo' } diff --git a/ipaserver/plugins/internal.py b/ipaserver/plugins/internal.py index 83258ba..6bd8917 100644 --- a/ipaserver/plugins/internal.py +++ b/ipaserver/plugins/internal.py @@ -580,6 +580,9 @@ class i18n_messages(Command): "fingerprints": _("Fingerprints"), "get_certificate": _("Get Certificate"), "hold_removed": _("Certificate Hold Removed"), + "issue_for_host": _( + "Issue new certificate for host '${primary_key}'" + ), "issue_for_user": _( "Issue new certificate for user '${primary_key}'" ), @@ -812,6 +815,24 @@ class i18n_messages(Command): }, "host": { "add": _("Add host"), + "add_hosts_managing": _( + "Add hosts managing host '${primary_key}'" + ), + "add_into_groups": _( + "Add host '${primary_key}' into host groups" + ), + "add_into_hbac": _( + "Add host '${primary_key}' into HBAC rules" + ), + "add_into_netgroups": _( + "Add host '${primary_key}' into netgroups" + ), + "add_into_roles": _( + "Add host '${primary_key}' into roles" + ), + "add_into_sudo": _( + "Add host '${primary_key}' into sudo rules" + ), "certificate": _("Host Certificate"), "cn": _("Host Name"), "delete_key_unprovision": _("Delete Key, Unprovision"),