IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Automember UI - Fixed I18n labels

Browse Source 
Hard-coded labels in Automember UI have been moved into internal.py to
allow translation.

https://fedorahosted.org/freeipa/ticket/2195
This commit is contained in:
Petr Voborník 2012-02-03 11:37:09 +01:00 committed by Endi S. Dewata
parent fccea2dca4
commit cbd77cae0a
4 changed files with 49 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
install/ui/automember.js
View File

@ -43,7 +43,7 @@ IPA.automember.entity = function(spec) {
factory: IPA.automember.rule_search_facet,
name: 'searchgroup',
group_type: 'group',
label: 'User group rules', //TODO: translate
label: IPA.messages.objects.automember.usergrouprules,
details_facet: 'usergrouprule',
columns: [
'cn',
@ -54,7 +54,7 @@ IPA.automember.entity = function(spec) {
factory: IPA.automember.rule_search_facet,
name: 'searchhostgroup',
group_type: 'hostgroup',
label: 'Host group rules', //TODO: translate
label: IPA.messages.objects.automember.hostgrouprules,
details_facet: 'hostgrouprule',
columns: [
'cn',
@ -65,7 +65,7 @@ IPA.automember.entity = function(spec) {
factory: IPA.automember.rule_details_facet,
name: 'usergrouprule',
group_type: 'group',
label: 'User group rule', //TODO: translate
label: IPA.messages.objects.automember.usergrouprule,
disable_facet_tabs: true,
redirect_info: { tab: 'amgroup' }
}).
@ -73,12 +73,13 @@ IPA.automember.entity = function(spec) {
factory: IPA.automember.rule_details_facet,
name: 'hostgrouprule',
group_type: 'hostgroup',
label: 'Host group rule',//TODO: translate
label: IPA.messages.objects.automember.hostgrouprule,
disable_facet_tabs: true,
redirect_info: { tab: 'amhostgroup' }
}).
adder_dialog({
factory: IPA.automember.rule_adder_dialog,
title: IPA.messages.objects.automember.add_rule,
fields: [
{
type: 'entity_select',
@ -218,7 +219,7 @@ IPA.automember.rule_details_facet = function(spec) {
{
factory: IPA.collapsible_section,
name: 'inclusive',
label: 'Inclusive', //TODO:translate
label: IPA.messages.objects.automember.inclusive,
widgets: [
{
type: 'automember_condition',
@ -227,17 +228,17 @@ IPA.automember.rule_details_facet = function(spec) {
add_command: 'add_condition',
remove_command: 'remove_condition',
adder_dialog: {
title: 'Add Condition to ${pkey}', //TODO: translate
title: IPA.messages.objects.automember.add_condition,
fields: [
{
name: 'key',
type: 'select',
options: IPA.automember.get_condition_attributes(spec.group_type),
label: 'Attribute' //TODO: translate
label: IPA.messages.objects.automember.attribute
},
{
name: 'automemberinclusiveregex',
label: 'Expression' //TODO: translate
label: IPA.messages.objects.automember.expression
}
]
}
@ -247,7 +248,7 @@ IPA.automember.rule_details_facet = function(spec) {
{
factory: IPA.collapsible_section,
name: 'exclusive',
label: 'Exclusive', //TODO:translate
label: IPA.messages.objects.automember.exclusive,
widgets: [
{
type: 'automember_condition',
@ -256,17 +257,17 @@ IPA.automember.rule_details_facet = function(spec) {
add_command: 'add_condition',
remove_command: 'remove_condition',
adder_dialog: {
title: 'Add Condition to ${pkey}', //TODO: translate
title: IPA.messages.objects.automember.add_condition,
fields: [
{
name: 'key',
type: 'select',
options: IPA.automember.get_condition_attributes(spec.group_type),
label: 'Attribute' //TODO: translate
label: IPA.messages.objects.automember.attribute
},
{
name: 'automemberexclusiveregex',
label: 'Expression' //TODO: translate
label: IPA.messages.objects.automember.expression
}
]
}
@ -414,11 +415,11 @@ IPA.automember.condition_widget = function(spec) {
spec.columns = $.merge(spec.columns || [], [
{
name: 'attribute',
label: 'Attribute'//TODO:translate
label: IPA.messages.objects.automember.attribute
},
{
name: 'expression',
label: 'Expression'//TODO:translate
label: IPA.messages.objects.automember.expression
}
]);
@ -632,9 +633,9 @@ IPA.automember.default_group_widget = function(spec) {
that.get_title = function() {
if (that.group_type === 'group') {
return 'Default user group'; //TODO: translate
return IPA.messages.objects.automember.default_user_group;
} else {
return 'Default host group'; //TODO: translate
return IPA.messages.objects.automember.default_host_group;
}
};

14
install/ui/test/data/ipa_init.json
View File

@ -115,6 +115,20 @@
"aci": {
"attribute": "Attribute"
},
"automember": {
"add_condition": "Add Condition into ${pkey}",
"add_rule": "Add Rule",
"attribute": "Attribute",
"default_host_group": "Default host group",
"default_user_group": "Default user group",
"exclusive": "Exclusive",
"expression": "Expression",
"hostgrouprule": "Host group rule",
"hostgrouprules": "Host group rules",
"inclusive": "Inclusive",
"usergrouprule": "User group rule",
"usergrouprules": "User group rules"
},
"automountkey": {},
"automountlocation": {
"identity": "Automount Location Settings"

6
install/ui/webui.js
View File

@ -69,12 +69,12 @@ IPA.admin_navigation = function(spec) {
{entity: 'pwpolicy'},
{entity: 'krbtpolicy'},
{entity: 'selinuxusermap'},
{name: 'automember', label: 'Automember', //TODO: translate IPA.messages.tabs.automember
{name: 'automember', label: IPA.messages.tabs.automember,
children: [
{ name: 'amgroup', entity: 'automember',
facet: 'searchgroup', label: 'User group rules'}, //TODO: translate
facet: 'searchgroup', label: IPA.messages.objects.automember.usergrouprules},
{ name: 'amhostgroup', entity: 'automember',
facet: 'searchhostgroup', label: 'Host group rules'} //TODO: translate
facet: 'searchhostgroup', label: IPA.messages.objects.automember.hostgrouprules}
]}
]},
{name: 'ipaserver', label: IPA.messages.tabs.ipaserver, children: [

15
ipalib/plugins/internal.py
View File

@ -250,6 +250,20 @@ class i18n_messages(Command):
"aci": {
"attribute": _("Attribute"),
},
"automember": {
"add_condition": _("Add Condition into ${pkey}"),
"add_rule": _("Add Rule"),
"attribute": _("Attribute"),
"default_host_group": _("Default host group"),
"default_user_group": _("Default user group"),
"exclusive": _("Exclusive"),
"expression": _("Expression"),
"hostgrouprule": _("Host group rule"),
"hostgrouprules": _("Host group rules"),
"inclusive": _("Inclusive"),
"usergrouprule": _("User group rule"),
"usergrouprules": _("User group rules"),
},
"automountkey": {
},
"automountlocation": {
@ -507,6 +521,7 @@ class i18n_messages(Command):
},
"tabs": {
"audit": _("Audit"),
"automember": _("Automember"),
"automount": _("Automount"),
"dns": _("DNS"),
"hbac": _("Host Based Access Control"),