From e363fb3ebc73fd4d6b172f06e76816797c61b456 Mon Sep 17 00:00:00 2001 From: Stanislav Levin Date: Fri, 21 Sep 2018 11:45:28 +0300 Subject: [PATCH] Add title to 'add' dialog for 'Automember' entity To improve translation quality the title of 'Add' dialog should be specified explicitly in the spec and should be an entire sentence. Fixes: https://pagure.io/freeipa/issue/7707 Reviewed-By: Serhii Tsymbaliuk --- install/ui/src/freeipa/automember.js | 6 +++--- install/ui/src/freeipa/widget.js | 2 +- ipaserver/plugins/internal.py | 9 +++++++-- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/install/ui/src/freeipa/automember.js b/install/ui/src/freeipa/automember.js index e87812c65..b3035e45e 100644 --- a/install/ui/src/freeipa/automember.js +++ b/install/ui/src/freeipa/automember.js @@ -105,7 +105,7 @@ return { ], adder_dialog: { $factory: IPA.automember.rule_adder_dialog, - title: '@i18n:objects.automember.add_rule', + title: '@i18n:objects.automember.add', fields: [ { $type: 'entity_select', @@ -281,7 +281,7 @@ IPA.automember.rule_details_facet = function(spec) { add_command: 'add_condition', remove_command: 'remove_condition', adder_dialog: { - title: '@i18n:objects.automember.add_condition', + title: '@i18n:objects.automember.add_inc_condition', fields: [ { name: 'key', @@ -314,7 +314,7 @@ IPA.automember.rule_details_facet = function(spec) { add_command: 'add_condition', remove_command: 'remove_condition', adder_dialog: { - title: '@i18n:objects.automember.add_condition', + title: '@i18n:objects.automember.add_exc_condition', fields: [ { name: 'key', diff --git a/install/ui/src/freeipa/widget.js b/install/ui/src/freeipa/widget.js index e4b6f12ad..d7618d678 100644 --- a/install/ui/src/freeipa/widget.js +++ b/install/ui/src/freeipa/widget.js @@ -4421,7 +4421,7 @@ IPA.attribute_table_widget = function(spec) { var pkey = that.facet.get_pkey(); dialog_spec.title = text.get(dialog_spec.title || '@i18n:dialogs.add_title_default'); - dialog_spec.title = dialog_spec.title.replace('${pkey}', pkey); + dialog_spec.title = dialog_spec.title.replace('${primary_key}', pkey); var factory = dialog_spec.$factory || IPA.entity_adder_dialog; diff --git a/ipaserver/plugins/internal.py b/ipaserver/plugins/internal.py index 3e5fd5842..98afc94c4 100644 --- a/ipaserver/plugins/internal.py +++ b/ipaserver/plugins/internal.py @@ -465,8 +465,13 @@ class i18n_messages(Command): "remove": _("Remove self service permissions"), }, "automember": { - "add_condition": _("Add Condition into ${pkey}"), - "add_rule": _("Add Rule"), + "add": _("Add rule"), + "add_inc_condition": _( + "Add inclusive condition into '${primary_key}'" + ), + "add_exc_condition": _( + "Add exclusive condition into '${primary_key}'" + ), "attribute": _("Attribute"), "default_host_group": _("Default host group"), "default_user_group": _("Default user group"),