From e14fe888b4709b627abcb4a1ff33f6adf05b23e2 Mon Sep 17 00:00:00 2001 From: Stanislav Levin Date: Oct 03 2018 11:14:52 +0000 Subject: Add title to 'add' dialog for 'association_table' widget of Sudo 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 --- diff --git a/install/ui/src/freeipa/sudo.js b/install/ui/src/freeipa/sudo.js index 62112e5..de219b8 100644 --- a/install/ui/src/freeipa/sudo.js +++ b/install/ui/src/freeipa/sudo.js @@ -363,7 +363,7 @@ var add_sudorule_details_facet_widgets = function (spec) { add_method: 'add_user', remove_method: 'remove_user', external: 'externaluser', - add_title: '@i18n:association.add.member', + add_title: '@i18n:objects.sudorule.add_users', remove_title: '@i18n:objects.sudorule.remove_users' }, { @@ -372,7 +372,7 @@ var add_sudorule_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.sudorule.add_groups', remove_title: '@i18n:objects.sudorule.remove_groups' } ] @@ -438,7 +438,7 @@ var add_sudorule_details_facet_widgets = function (spec) { add_method: 'add_host', remove_method: 'remove_host', external: 'externalhost', - add_title: '@i18n:association.add.member', + add_title: '@i18n:objects.sudorule.add_hosts', remove_title: '@i18n:objects.sudorule.remove_hosts' }, { @@ -447,7 +447,7 @@ var add_sudorule_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.sudorule.add_hostgroups', remove_title: '@i18n:objects.sudorule.remove_hostgroups' } ] @@ -531,7 +531,7 @@ var add_sudorule_details_facet_widgets = function (spec) { name: 'memberallowcmd_sudocmd', add_method: 'add_allow_command', remove_method: 'remove_allow_command', - add_title: '@i18n:association.add.memberallowcmd', + add_title: '@i18n:objects.sudorule.add_allow_cmds', remove_title: '@i18n:objects.sudorule.remove_allow_cmds' }, { @@ -540,7 +540,7 @@ var add_sudorule_details_facet_widgets = function (spec) { name: 'memberallowcmd_sudocmdgroup', add_method: 'add_allow_command', remove_method: 'remove_allow_command', - add_title: '@i18n:association.add.memberallowcmd', + add_title: '@i18n:objects.sudorule.add_allow_cmdgroups', remove_title: '@i18n:objects.sudorule.remove_allow_cmdgroups' }, { @@ -555,7 +555,7 @@ var add_sudorule_details_facet_widgets = function (spec) { name: 'memberdenycmd_sudocmd', add_method: 'add_deny_command', remove_method: 'remove_deny_command', - add_title: '@i18n:association.add.memberdenycmd', + add_title: '@i18n:objects.sudorule.add_deny_cmds', remove_title: '@i18n:objects.sudorule.remove_deny_cmds' }, { @@ -564,7 +564,7 @@ var add_sudorule_details_facet_widgets = function (spec) { name: 'memberdenycmd_sudocmdgroup', add_method: 'add_deny_command', remove_method: 'remove_deny_command', - add_title: '@i18n:association.add.memberdenycmd', + add_title: '@i18n:objects.sudorule.add_deny_cmdgroups', remove_title: '@i18n:objects.sudorule.remove_deny_cmdgroups' } ] @@ -636,7 +636,7 @@ var add_sudorule_details_facet_widgets = function (spec) { external: 'ipasudorunasextuser', add_method: 'add_runasuser', remove_method: 'remove_runasuser', - add_title: '@i18n:association.add.ipasudorunas', + add_title: '@i18n:objects.sudorule.add_runas_users', remove_title: '@i18n:objects.sudorule.remove_runas_users' }, { @@ -645,7 +645,7 @@ var add_sudorule_details_facet_widgets = function (spec) { name: 'ipasudorunas_group', add_method: 'add_runasuser', remove_method: 'remove_runasuser', - add_title: '@i18n:association.add.ipasudorunas', + add_title: '@i18n:objects.sudorule.add_runas_usergroups', remove_title: '@i18n:objects.sudorule.remove_runas_usergroups' } ] @@ -668,7 +668,7 @@ var add_sudorule_details_facet_widgets = function (spec) { external: 'ipasudorunasextgroup', add_method: 'add_runasgroup', remove_method: 'remove_runasgroup', - add_title: '@i18n:association.add.ipasudorunasgroup', + add_title: '@i18n:objects.sudorule.add_runas_groups', remove_title: '@i18n:objects.sudorule.remove_runas_groups' }] } diff --git a/ipaserver/plugins/internal.py b/ipaserver/plugins/internal.py index 7eb456a..f57a2b7 100644 --- a/ipaserver/plugins/internal.py +++ b/ipaserver/plugins/internal.py @@ -1312,6 +1312,43 @@ class i18n_messages(Command): "sudorule": { "add": _("Add sudo rule"), "add_option": _("Add sudo option"), + "add_allow_cmds": _( + "Add allow sudo commands into sudo rule " + "'${primary_key}'" + ), + "add_allow_cmdgroups": _( + "Add allow sudo command groups into sudo rule " + "'${primary_key}'" + ), + "add_deny_cmds": _( + "Add deny sudo commands into sudo rule " + "'${primary_key}'" + ), + "add_deny_cmdgroups": _( + "Add deny sudo command groups into sudo rule " + "'${primary_key}'" + ), + "add_groups": _( + "Add user groups into sudo rule '${primary_key}'" + ), + "add_hostgroups": _( + "Add host groups into sudo rule '${primary_key}'" + ), + "add_hosts": _( + "Add hosts into sudo rule '${primary_key}'" + ), + "add_runas_users": _( + "Add RunAs users into sudo rule '${primary_key}'" + ), + "add_runas_usergroups": _( + "Add RunAs user groups into sudo rule '${primary_key}'" + ), + "add_runas_groups": _( + "Add RunAs groups into sudo rule '${primary_key}'" + ), + "add_users": _( + "Add users into sudo rule '${primary_key}'" + ), "allow": _("Allow"), "any_command": _("Any Command"), "any_group": _("Any Group"),