summaryrefslogtreecommitdiffstats
path: root/install/ui
diff options
context:
space:
mode:
authorPetr Vobornik <pvoborni@redhat.com>2013-04-03 18:18:57 +0200
committerPetr Vobornik <pvoborni@redhat.com>2013-05-06 16:22:21 +0200
commitfcff33fb511db5ffe5c7809bb1a4593f2e681718 (patch)
tree31af15433d3e1a9df92f86a54eb56d8fcd2ebab9 /install/ui
parent12f5f4cfdd38c2a29c8e6eeac17557f4e7731307 (diff)
downloadfreeipa-fcff33fb511db5ffe5c7809bb1a4593f2e681718.tar.gz
freeipa-fcff33fb511db5ffe5c7809bb1a4593f2e681718.tar.xz
freeipa-fcff33fb511db5ffe5c7809bb1a4593f2e681718.zip
Replace IPA.messages with @i18n definition for label specs
Replaced by execution of ls | grep .js | xargs sed -i -r "s/label: IPA.messages\.((.\w+)+)/label: '@i18n:\1'/" https://fedorahosted.org/freeipa/ticket/3235
Diffstat (limited to 'install/ui')
-rw-r--r--install/ui/src/freeipa/aci.js16
-rw-r--r--install/ui/src/freeipa/add.js8
-rw-r--r--install/ui/src/freeipa/association.js16
-rw-r--r--install/ui/src/freeipa/automember.js26
-rw-r--r--install/ui/src/freeipa/automount.js12
-rwxr-xr-xinstall/ui/src/freeipa/certificate.js38
-rw-r--r--install/ui/src/freeipa/details.js10
-rw-r--r--install/ui/src/freeipa/dialog.js6
-rw-r--r--install/ui/src/freeipa/dns.js46
-rw-r--r--install/ui/src/freeipa/entitle.js48
-rw-r--r--install/ui/src/freeipa/facet.js2
-rw-r--r--install/ui/src/freeipa/group.js12
-rw-r--r--install/ui/src/freeipa/hbac.js22
-rw-r--r--install/ui/src/freeipa/hbactest.js30
-rw-r--r--install/ui/src/freeipa/host.js28
-rw-r--r--install/ui/src/freeipa/hostgroup.js2
-rw-r--r--install/ui/src/freeipa/idrange.js26
-rw-r--r--install/ui/src/freeipa/ipa.js6
-rw-r--r--install/ui/src/freeipa/netgroup.js24
-rw-r--r--install/ui/src/freeipa/realmdomains.js6
-rw-r--r--install/ui/src/freeipa/rule.js2
-rw-r--r--install/ui/src/freeipa/search.js6
-rw-r--r--install/ui/src/freeipa/selinux.js20
-rw-r--r--install/ui/src/freeipa/serverconfig.js10
-rw-r--r--install/ui/src/freeipa/service.js24
-rw-r--r--install/ui/src/freeipa/sudo.js50
-rw-r--r--install/ui/src/freeipa/trust.js30
-rw-r--r--install/ui/src/freeipa/user.js30
-rw-r--r--install/ui/src/freeipa/widget.js12
29 files changed, 284 insertions, 284 deletions
diff --git a/install/ui/src/freeipa/aci.js b/install/ui/src/freeipa/aci.js
index 92c5cc38f..0213d93c0 100644
--- a/install/ui/src/freeipa/aci.js
+++ b/install/ui/src/freeipa/aci.js
@@ -98,7 +98,7 @@ IPA.aci.permission_entity = function(spec) {
{
type: 'details_table_section',
name: 'identity',
- label: IPA.messages.objects.permission.identity,
+ label: '@i18n:objects.permission.identity',
widgets: [
'cn'
]
@@ -106,7 +106,7 @@ IPA.aci.permission_entity = function(spec) {
{
type: 'details_table_section',
name: 'rights',
- label: IPA.messages.objects.permission.rights,
+ label: '@i18n:objects.permission.rights',
widgets: [
{
type: 'rights',
@@ -117,7 +117,7 @@ IPA.aci.permission_entity = function(spec) {
{
type: 'permission_target',
container_factory: IPA.details_table_section,
- label: IPA.messages.objects.permission.target,
+ label: '@i18n:objects.permission.target',
name: 'target',
show_target: false
}
@@ -245,7 +245,7 @@ IPA.aci.privilege_entity = function(spec) {
sections: [
{
name: 'identity',
- label: IPA.messages.details.identity,
+ label: '@i18n:details.identity',
fields: [
'cn',
{
@@ -302,7 +302,7 @@ IPA.aci.role_entity = function(spec) {
sections: [
{
name: 'identity',
- label: IPA.messages.objects.role.identity,
+ label: '@i18n:objects.role.identity',
fields: [
'cn',
{
@@ -350,7 +350,7 @@ IPA.aci.selfservice_entity = function(spec) {
sections: [
{
name: 'general',
- label: IPA.messages.details.general,
+ label: '@i18n:details.general',
fields: [
'aciname',
{
@@ -395,7 +395,7 @@ IPA.aci.delegation_entity = function(spec) {
sections: [
{
name: 'general',
- label: IPA.messages.details.general,
+ label: '@i18n:details.general',
fields: [
'aciname',
{
@@ -641,7 +641,7 @@ IPA.permission_target_widget = function(spec) {
that.target_select = IPA.select_widget({
entity: that.entity,
name: 'target',
- label: IPA.messages.objects.permission.target,
+ label: '@i18n:objects.permission.target',
hidden: !that.show_target
});
diff --git a/install/ui/src/freeipa/add.js b/install/ui/src/freeipa/add.js
index fc14269f5..f371ce1db 100644
--- a/install/ui/src/freeipa/add.js
+++ b/install/ui/src/freeipa/add.js
@@ -45,7 +45,7 @@ IPA.entity_adder_dialog = function(spec) {
var init = function() {
that.create_button({
name: 'add',
- label: IPA.messages.buttons.add,
+ label: '@i18n:buttons.add',
click: function() {
that.on_add();
}
@@ -53,7 +53,7 @@ IPA.entity_adder_dialog = function(spec) {
that.create_button({
name: 'add_and_add_another',
- label: IPA.messages.buttons.add_and_add_another,
+ label: '@i18n:buttons.add_and_add_another',
click: function() {
that.hide_message();
that.add(
@@ -69,7 +69,7 @@ IPA.entity_adder_dialog = function(spec) {
that.create_button({
name: 'add_and_edit',
- label: IPA.messages.buttons.add_and_edit,
+ label: '@i18n:buttons.add_and_edit',
click: function() {
that.hide_message();
that.add(
@@ -86,7 +86,7 @@ IPA.entity_adder_dialog = function(spec) {
that.create_button({
name: 'cancel',
- label: IPA.messages.buttons.cancel,
+ label: '@i18n:buttons.cancel',
click: function() {
that.hide_message();
that.close();
diff --git a/install/ui/src/freeipa/association.js b/install/ui/src/freeipa/association.js
index d137c9d23..7fb49562a 100644
--- a/install/ui/src/freeipa/association.js
+++ b/install/ui/src/freeipa/association.js
@@ -431,7 +431,7 @@ IPA.association_table_widget = function (spec) {
that.remove_button = IPA.action_button({
name: 'remove',
- label: IPA.messages.buttons.remove,
+ label: '@i18n:buttons.remove',
icon: 'remove-icon',
'class': 'action-button-disabled',
click: function() {
@@ -444,7 +444,7 @@ IPA.association_table_widget = function (spec) {
that.add_button = IPA.action_button({
name: 'add',
- label: IPA.messages.buttons.add,
+ label: '@i18n:buttons.add',
icon: 'add-icon',
click: function() {
if (!that.add_button.hasClass('action-button-disabled')) {
@@ -786,17 +786,17 @@ IPA.association_facet = function (spec, no_init) {
spec.control_buttons.unshift(
{
name: 'refresh',
- label: IPA.messages.buttons.refresh,
+ label: '@i18n:buttons.refresh',
icon: 'reset-icon'
},
{
name: 'remove',
- label: IPA.messages.buttons.remove,
+ label: '@i18n:buttons.remove',
icon: 'remove-icon'
},
{
name: 'add',
- label: IPA.messages.buttons.add,
+ label: '@i18n:buttons.add',
icon: 'add-icon'
});
@@ -1169,17 +1169,17 @@ IPA.attribute_facet = function(spec, no_init) {
spec.control_buttons.unshift(
{
name: 'refresh',
- label: IPA.messages.buttons.refresh,
+ label: '@i18n:buttons.refresh',
icon: 'reset-icon'
},
{
name: 'remove',
- label: IPA.messages.buttons.remove,
+ label: '@i18n:buttons.remove',
icon: 'remove-icon'
},
{
name: 'add',
- label: IPA.messages.buttons.add,
+ label: '@i18n:buttons.add',
icon: 'add-icon'
});
diff --git a/install/ui/src/freeipa/automember.js b/install/ui/src/freeipa/automember.js
index 0f8bbccfe..7626c19a7 100644
--- a/install/ui/src/freeipa/automember.js
+++ b/install/ui/src/freeipa/automember.js
@@ -55,7 +55,7 @@ IPA.automember.entity = function(spec) {
factory: IPA.automember.rule_search_facet,
name: 'searchgroup',
group_type: 'group',
- label: IPA.messages.objects.automember.usergrouprules,
+ label: '@i18n:objects.automember.usergrouprules',
details_facet: 'usergrouprule',
pagination: false,
columns: [
@@ -67,7 +67,7 @@ IPA.automember.entity = function(spec) {
factory: IPA.automember.rule_search_facet,
name: 'searchhostgroup',
group_type: 'hostgroup',
- label: IPA.messages.objects.automember.hostgrouprules,
+ label: '@i18n:objects.automember.hostgrouprules',
details_facet: 'hostgrouprule',
pagination: false,
columns: [
@@ -79,7 +79,7 @@ IPA.automember.entity = function(spec) {
factory: IPA.automember.rule_details_facet,
name: 'usergrouprule',
group_type: 'group',
- label: IPA.messages.objects.automember.usergrouprule,
+ label: '@i18n:objects.automember.usergrouprule',
disable_facet_tabs: true,
check_rights: false,
redirect_info: { facet: 'searchgroup' }
@@ -88,7 +88,7 @@ IPA.automember.entity = function(spec) {
factory: IPA.automember.rule_details_facet,
name: 'hostgrouprule',
group_type: 'hostgroup',
- label: IPA.messages.objects.automember.hostgrouprule,
+ label: '@i18n:objects.automember.hostgrouprule',
disable_facet_tabs: true,
check_rights: false,
redirect_info: { facet: 'searchhostgroup' }
@@ -239,7 +239,7 @@ IPA.automember.rule_details_facet = function(spec) {
{
type: 'details_table_section',
name: 'general',
- label: IPA.messages.details.general,
+ label: '@i18n:details.general',
widgets: [
{
name: 'cn'
@@ -253,7 +253,7 @@ IPA.automember.rule_details_facet = function(spec) {
{
factory: IPA.collapsible_section,
name: 'inclusive',
- label: IPA.messages.objects.automember.inclusive,
+ label: '@i18n:objects.automember.inclusive',
widgets: [
{
type: 'automember_condition',
@@ -268,11 +268,11 @@ IPA.automember.rule_details_facet = function(spec) {
name: 'key',
type: 'select',
options: IPA.automember.get_condition_attributes(spec.group_type),
- label: IPA.messages.objects.automember.attribute
+ label: '@i18n:objects.automember.attribute'
},
{
name: 'automemberinclusiveregex',
- label: IPA.messages.objects.automember.expression
+ label: '@i18n:objects.automember.expression'
}
]
}
@@ -282,7 +282,7 @@ IPA.automember.rule_details_facet = function(spec) {
{
factory: IPA.collapsible_section,
name: 'exclusive',
- label: IPA.messages.objects.automember.exclusive,
+ label: '@i18n:objects.automember.exclusive',
widgets: [
{
type: 'automember_condition',
@@ -297,11 +297,11 @@ IPA.automember.rule_details_facet = function(spec) {
name: 'key',
type: 'select',
options: IPA.automember.get_condition_attributes(spec.group_type),
- label: IPA.messages.objects.automember.attribute
+ label: '@i18n:objects.automember.attribute'
},
{
name: 'automemberexclusiveregex',
- label: IPA.messages.objects.automember.expression
+ label: '@i18n:objects.automember.expression'
}
]
}
@@ -461,11 +461,11 @@ IPA.automember.condition_widget = function(spec) {
spec.columns = $.merge(spec.columns || [], [
{
name: 'attribute',
- label: IPA.messages.objects.automember.attribute
+ label: '@i18n:objects.automember.attribute'
},
{
name: 'expression',
- label: IPA.messages.objects.automember.expression
+ label: '@i18n:objects.automember.expression'
}
]);
diff --git a/install/ui/src/freeipa/automount.js b/install/ui/src/freeipa/automount.js
index 8df1f822a..bc3e06ef5 100644
--- a/install/ui/src/freeipa/automount.js
+++ b/install/ui/src/freeipa/automount.js
@@ -47,7 +47,7 @@ IPA.automount.location_entity = function(spec) {
sections:[
{
name: 'identity',
- label: IPA.messages.details.identity,
+ label: '@i18n:details.identity',
fields: [ 'cn' ]
}
]
@@ -90,7 +90,7 @@ IPA.automount.map_entity = function(spec) {
sections: [
{
name: 'identity',
- label: IPA.messages.details.identity,
+ label: '@i18n:details.identity',
fields: [
'automountmapname',
{
@@ -111,15 +111,15 @@ IPA.automount.map_entity = function(spec) {
type: 'radio',
name: 'method',
enabled: false, //don't use value in add command
- label: IPA.messages.objects.automountmap.map_type,
+ label: '@i18n:objects.automountmap.map_type',
options: [
{
value: 'add',
- label: IPA.messages.objects.automountmap.direct
+ label: '@i18n:objects.automountmap.direct'
},
{
value: 'add_indirect',
- label: IPA.messages.objects.automountmap.indirect
+ label: '@i18n:objects.automountmap.indirect'
}
]
},
@@ -175,7 +175,7 @@ IPA.automount.key_entity = function(spec) {
sections: [
{
name:'identity',
- label: IPA.messages.details.identity,
+ label: '@i18n:details.identity',
fields: [
{
name: 'automountkey',
diff --git a/install/ui/src/freeipa/certificate.js b/install/ui/src/freeipa/certificate.js
index 3feb2264c..d17ae625d 100755
--- a/install/ui/src/freeipa/certificate.js
+++ b/install/ui/src/freeipa/certificate.js
@@ -182,7 +182,7 @@ IPA.cert.download_dialog = function(spec) {
that.create_button({
name: 'close',
- label: IPA.messages.buttons.close,
+ label: '@i18n:buttons.close',
click: function() {
that.close();
}
@@ -271,7 +271,7 @@ IPA.cert.view_dialog = function(spec) {
that.create_button({
name: 'close',
- label: IPA.messages.buttons.close,
+ label: '@i18n:buttons.close',
click: function() {
that.close();
}
@@ -395,7 +395,7 @@ IPA.cert.request_dialog = function(spec) {
that.create_button({
name: 'issue',
- label: IPA.messages.buttons.issue,
+ label: '@i18n:buttons.issue',
click: function() {
var values = {};
var request = $.trim(that.textarea.val());
@@ -409,7 +409,7 @@ IPA.cert.request_dialog = function(spec) {
that.create_button({
name: 'cancel',
- label: IPA.messages.buttons.cancel,
+ label: '@i18n:buttons.cancel',
click: function() {
that.close();
}
@@ -720,7 +720,7 @@ IPA.cert.restore_action = function(spec) {
spec.confirm_msg = spec.confirm_msg || '@i18n:objects.cert.restore_confirmation';
spec.confirm_dialog = spec.confirm_dialog || {
factory: IPA.confirm_dialog,
- ok_label: IPA.messages.buttons.restore
+ ok_label: '@i18n:buttons.restore'
};
spec.needs_confirm = spec.needs_confirm !== undefined ? spec.needs_confirm : true;
@@ -1055,7 +1055,7 @@ IPA.cert.entity = function(spec) {
that.builder.search_facet({
factory: IPA.cert.search_facet,
- label: IPA.messages.objects.cert.label,
+ label: '@i18n:objects.cert.label',
pagination: false,
no_update: true,
columns: [
@@ -1073,51 +1073,51 @@ IPA.cert.entity = function(spec) {
search_options: [
{
value: 'subject',
- label: IPA.messages.objects.cert.find_subject
+ label: '@i18n:objects.cert.find_subject'
},
{
value: 'revocation_reason',
- label: IPA.messages.objects.cert.find_revocation_reason
+ label: '@i18n:objects.cert.find_revocation_reason'
},
{
value: 'min_serial_number',
- label: IPA.messages.objects.cert.find_min_serial_number
+ label: '@i18n:objects.cert.find_min_serial_number'
},
{
value: 'max_serial_number',
- label: IPA.messages.objects.cert.find_max_serial_number
+ label: '@i18n:objects.cert.find_max_serial_number'
},
{
value: 'validnotafter_from',
- label: IPA.messages.objects.cert.find_validnotafter_from
+ label: '@i18n:objects.cert.find_validnotafter_from'
},
{
value: 'validnotafter_to',
- label: IPA.messages.objects.cert.find_validnotafter_to
+ label: '@i18n:objects.cert.find_validnotafter_to'
},
{
value: 'validnotbefore_from',
- label: IPA.messages.objects.cert.find_validnotbefore_from
+ label: '@i18n:objects.cert.find_validnotbefore_from'
},
{
value: 'validnotbefore_to',
- label: IPA.messages.objects.cert.find_validnotbefore_to
+ label: '@i18n:objects.cert.find_validnotbefore_to'
},
{
value: 'issuedon_from',
- label: IPA.messages.objects.cert.find_issuedon_from
+ label: '@i18n:objects.cert.find_issuedon_from'
},
{
value: 'issuedon_to',
- label: IPA.messages.objects.cert.find_issuedon_to
+ label: '@i18n:objects.cert.find_issuedon_to'
},
{
value: 'revokedon_from',
- label: IPA.messages.objects.cert.find_revokedon_from
+ label: '@i18n:objects.cert.find_revokedon_from'
},
{
value: 'revokedon_to',
- label: IPA.messages.objects.cert.find_revokedon_to
+ label: '@i18n:objects.cert.find_revokedon_to'
}
]
}).
@@ -1136,7 +1136,7 @@ IPA.cert.entity = function(spec) {
sections: [
{
name: 'details',
- label: IPA.messages.objects.cert.certificate,
+ label: '@i18n:objects.cert.certificate',
action_panel: {
factory: IPA.action_panel,
name: 'cert_actions',
diff --git a/install/ui/src/freeipa/details.js b/install/ui/src/freeipa/details.js
index abe903750..71e7567cb 100644
--- a/install/ui/src/freeipa/details.js
+++ b/install/ui/src/freeipa/details.js
@@ -243,19 +243,19 @@ IPA.details_facet = function(spec, no_init) {
spec.control_buttons.unshift(
{
name: 'reset',
- label: IPA.messages.buttons.reset,
+ label: '@i18n:buttons.reset',
icon: 'reset-icon'
},
{
name: 'update',
- label: IPA.messages.buttons.update,
+ label: '@i18n:buttons.update',
icon: 'update-icon'
});
}
spec.control_buttons.unshift(
{
name: 'refresh',
- label: IPA.messages.buttons.refresh,
+ label: '@i18n:buttons.refresh',
icon: 'reset-icon'
});
@@ -319,7 +319,7 @@ IPA.details_facet = function(spec, no_init) {
that.expand_button = IPA.action_button({
name: 'expand_all',
href: 'expand_all',
- label: IPA.messages.details.expand_all,
+ label: '@i18n:details.expand_all',
'class': 'right-aligned-facet-controls',
style: 'display: none;',
click: function() {
@@ -340,7 +340,7 @@ IPA.details_facet = function(spec, no_init) {
that.collapse_button = IPA.action_button({
name: 'collapse_all',
href: 'collapse_all',
- label: IPA.messages.details.collapse_all,
+ label: '@i18n:details.collapse_all',
'class': 'right-aligned-facet-controls',
click: function() {
that.expand_button.css('display', 'inline-block');
diff --git a/install/ui/src/freeipa/dialog.js b/install/ui/src/freeipa/dialog.js
index bf9e12a7a..b23f5c59e 100644
--- a/install/ui/src/freeipa/dialog.js
+++ b/install/ui/src/freeipa/dialog.js
@@ -448,7 +448,7 @@ IPA.adder_dialog = function(spec) {
that.find_button = IPA.button({
name: 'find',
- label: IPA.messages.buttons.find,
+ label: '@i18n:buttons.find',
click: function() {
that.search();
return false;
@@ -558,7 +558,7 @@ IPA.adder_dialog = function(spec) {
var add_button = that.create_button({
name: 'add',
- label: IPA.messages.buttons.add,
+ label: '@i18n:buttons.add',
click: function() {
if (!add_button.is_enabled()) return;
that.execute();
@@ -567,7 +567,7 @@ IPA.adder_dialog = function(spec) {
that.create_button({
name: 'cancel',
- label: IPA.messages.buttons.cancel,
+ label: '@i18n:buttons.cancel',
click: function() {
that.close();
}
diff --git a/install/ui/src/freeipa/dns.js b/install/ui/src/freeipa/dns.js
index c9ffd6238..117db23bb 100644
--- a/install/ui/src/freeipa/dns.js
+++ b/install/ui/src/freeipa/dns.js
@@ -60,7 +60,7 @@ IPA.dns.config_entity = function(spec) {
sections: [
{
name: 'options',
- label: IPA.messages.objects.dnsconfig.options,
+ label: '@i18n:objects.dnsconfig.options',
fields: [
{
type: 'checkbox',
@@ -78,15 +78,15 @@ IPA.dns.config_entity = function(spec) {
options: [
{
value: 'first',
- label: IPA.messages.objects.dnsconfig.forward_first
+ label: '@i18n:objects.dnsconfig.forward_first'
},
{
value: 'only',
- label: IPA.messages.objects.dnsconfig.forward_only
+ label: '@i18n:objects.dnsconfig.forward_only'
},
{
value: 'none',
- label: IPA.messages.objects.dnsconfig.forward_none
+ label: '@i18n:objects.dnsconfig.forward_none'
}
]
},
@@ -123,7 +123,7 @@ IPA.dns.zone_entity = function(spec) {
'idnsname',
{
name: 'idnszoneactive',
- label: IPA.messages.status.label,
+ label: '@i18n:status.label',
formatter: IPA.boolean_status_formatter()
}
],
@@ -134,12 +134,12 @@ IPA.dns.zone_entity = function(spec) {
control_buttons: [
{
name: 'disable',
- label: IPA.messages.buttons.disable,
+ label: '@i18n:buttons.disable',
icon: 'disabled-icon'
},
{
name: 'enable',
- label: IPA.messages.buttons.enable,
+ label: '@i18n:buttons.enable',
icon: 'enabled-icon'
}
]
@@ -211,15 +211,15 @@ IPA.dns.zone_entity = function(spec) {
options: [
{
value: 'first',
- label: IPA.messages.objects.dnsconfig.forward_first
+ label: '@i18n:objects.dnsconfig.forward_first'
},
{
value: 'only',
- label: IPA.messages.objects.dnsconfig.forward_only
+ label: '@i18n:objects.dnsconfig.forward_only'
},
{
value: 'none',
- label: IPA.messages.objects.dnsconfig.forward_none
+ label: '@i18n:objects.dnsconfig.forward_none'
}
]
},
@@ -274,11 +274,11 @@ IPA.dns.zone_entity = function(spec) {
},
{
name: 'type',
- label: IPA.messages.objects.dnsrecord.type
+ label: '@i18n:objects.dnsrecord.type'
},
{
name: 'data',
- label: IPA.messages.objects.dnsrecord.data
+ label: '@i18n:objects.dnsrecord.data'
}
]
}).
@@ -1170,7 +1170,7 @@ IPA.dns.record_entity = function(spec) {
widgets:[
{
name: 'identity',
- label: IPA.messages.details.identity,
+ label: '@i18n:details.identity',
type: 'details_table_section',
widgets: [
{
@@ -1207,7 +1207,7 @@ IPA.dns.record_entity = function(spec) {
{
type: 'dnsrecord_type',
name: 'record_type',
- label: IPA.messages.objects.dnsrecord.type
+ label: '@i18n:objects.dnsrecord.type'
}
]
}
@@ -1397,14 +1397,14 @@ IPA.dns.record_prepare_details_spec = function(spec, type_prepare_method) {
var standard_record_section = {
name: 'standard_types',
type: 'details_table_section',
- label: IPA.messages.objects.dnsrecord.standard,
+ label: '@i18n:objects.dnsrecord.standard',
widgets: []
};
var other_record_section = {
name: 'other_types',
type: 'details_table_section',
- label: IPA.messages.objects.dnsrecord.other,
+ label: '@i18n:objects.dnsrecord.other',
widgets: []
};
@@ -1712,7 +1712,7 @@ IPA.dns.record_type_table_widget = function(spec) {
that.remove_button = IPA.action_button({
name: 'remove',
- label: IPA.messages.buttons.remove,
+ label: '@i18n:buttons.remove',
icon: 'remove-icon',
'class': 'action-button-disabled',
click: function() {
@@ -1725,7 +1725,7 @@ IPA.dns.record_type_table_widget = function(spec) {
that.add_button = IPA.action_button({
name: 'add',
- label: IPA.messages.buttons.add,
+ label: '@i18n:buttons.add',
icon: 'add-icon',
click: function() {
if (!that.add_button.hasClass('action-button-disabled')) {
@@ -1889,7 +1889,7 @@ IPA.dns.record_type_table_widget = function(spec) {
dialog.create_button({
name: 'add',
- label: IPA.messages.buttons.add,
+ label: '@i18n:buttons.add',
click: function() {
dialog.hide_message();
dialog.add(
@@ -1910,7 +1910,7 @@ IPA.dns.record_type_table_widget = function(spec) {
dialog.create_button({
name: 'add_and_add_another',
- label: IPA.messages.buttons.add_and_add_another,
+ label: '@i18n:buttons.add_and_add_another',
click: function() {
dialog.hide_message();
dialog.add(
@@ -1976,7 +1976,7 @@ IPA.dns.record_type_table_widget = function(spec) {
dialog.create_button({
name: 'modify',
- label: IPA.messages.buttons.update,
+ label: '@i18n:buttons.update',
click: function() {
dialog.modify();
}
@@ -1984,7 +1984,7 @@ IPA.dns.record_type_table_widget = function(spec) {
dialog.create_button({
name: 'cancel',
- label: IPA.messages.buttons.cancel,
+ label: '@i18n:buttons.cancel',
click: function() {
dialog.reset();
dialog.close();
@@ -2228,7 +2228,7 @@ IPA.dns.ptr_redirection_dialog = function(spec) {
that.create_button({
name: 'close',
- label: IPA.messages.buttons.close,
+ label: '@i18n:buttons.close',
click: function() {
that.close();
}
diff --git a/install/ui/src/freeipa/entitle.js b/install/ui/src/freeipa/entitle.js
index c31aaa9be..f0802c7e4 100644
--- a/install/ui/src/freeipa/entitle.js
+++ b/install/ui/src/freeipa/entitle.js
@@ -41,12 +41,12 @@ IPA.entitle.entity = function(spec) {
that.builder.facet_groups([ 'account', 'certificates' ]).
details_facet({
factory: IPA.entitle.details_facet,
- label: IPA.messages.objects.entitle.account,
+ label: '@i18n:objects.entitle.account',
facet_group: 'account',
sections: [
{
name: 'general',
- label: IPA.messages.details.general,
+ label: '@i18n:details.general',
fields: [
{
name: 'uuid',
@@ -56,17 +56,17 @@ IPA.entitle.entity = function(spec) {
{
factory: IPA.entitle.download_widget,
name: 'certificate',
- label: IPA.messages.objects.entitle.certificate
+ label: '@i18n:objects.entitle.certificate'
}
]
},
{
name: 'status',
- label: IPA.messages.objects.entitle.status,
+ label: '@i18n:objects.entitle.status',
fields: [
{
name: 'product',
- label: IPA.messages.objects.entitle.product,
+ label: '@i18n:objects.entitle.product',
read_only: true
},
{
@@ -76,7 +76,7 @@ IPA.entitle.entity = function(spec) {
},
{
name: 'consumed',
- label: IPA.messages.objects.entitle.consumed,
+ label: '@i18n:objects.entitle.consumed',
read_only: true
}
]
@@ -86,12 +86,12 @@ IPA.entitle.entity = function(spec) {
facet({
factory: IPA.entitle.certificates_facet,
name: 'certificates',
- label: IPA.messages.objects.entitle.certificates,
+ label: '@i18n:objects.entitle.certificates',
facet_group: 'certificates',
columns: [
{
name: 'product',
- label: IPA.messages.objects.entitle.product
+ label: '@i18n:objects.entitle.product'
},
{
name: 'quantity',
@@ -99,16 +99,16 @@ IPA.entitle.entity = function(spec) {
},
{
name: 'start',
- label: IPA.messages.objects.entitle.start
+ label: '@i18n:objects.entitle.start'
},
{
name: 'end',
- label: IPA.messages.objects.entitle.end
+ label: '@i18n:objects.entitle.end'
},
{
factory: IPA.entitle.certificate_column,
name: 'certificate',
- label: IPA.messages.objects.entitle.certificate
+ label: '@i18n:objects.entitle.certificate'
}
]
}).
@@ -143,7 +143,7 @@ IPA.entitle.entity = function(spec) {
fields: [
{
name: 'certificate',
- label: IPA.messages.objects.entitle.certificate
+ label: '@i18n:objects.entitle.certificate'
}
]
}).
@@ -167,7 +167,7 @@ IPA.entitle.entity = function(spec) {
fields: [
{
name: 'certificate',
- label: IPA.messages.objects.entitle.certificate
+ label: '@i18n:objects.entitle.certificate'
}
]
});
@@ -322,7 +322,7 @@ IPA.entitle.details_facet = function(spec) {
that.register_online_button = IPA.action_button({
name: 'register',
- label: IPA.messages.objects.entitle.register,
+ label: '@i18n:objects.entitle.register',
icon: 'register-icon',
click: function() {
var dialog = that.entity.get_dialog('online_registration');
@@ -335,7 +335,7 @@ IPA.entitle.details_facet = function(spec) {
/*
that.register_offline_button = IPA.action_button({
name: 'import',
- label: IPA.messages.objects.entitle.import,
+ label: '@i18n:objects.entitle.import',
icon: 'import-icon',
click: function() {
var dialog = that.entity.get_dialog('offline_registration');
@@ -417,7 +417,7 @@ IPA.entitle.certificates_facet = function(spec) {
that.consume_button = IPA.action_button({
name: 'consume',
- label: IPA.messages.objects.entitle.consume,
+ label: '@i18n:objects.entitle.consume',
icon: 'consume-icon',
click: function() {
var dialog = that.entity.get_dialog('consume');
@@ -430,7 +430,7 @@ IPA.entitle.certificates_facet = function(spec) {
that.import_button = IPA.action_button({
name: 'import',
- label: IPA.messages.objects.entitle.import_button,
+ label: '@i18n:objects.entitle.import_button',
icon: 'import-icon',
click: function() {
var dialog = that.entity.get_dialog('import');
@@ -558,7 +558,7 @@ IPA.entitle.register_online_dialog = function(spec) {
that.create_button({
name: 'register',
- label: IPA.messages.objects.entitle.register,
+ label: '@i18n:objects.entitle.register',
click: function() {
var record = {};
that.save(record);
@@ -578,7 +578,7 @@ IPA.entitle.register_online_dialog = function(spec) {
that.create_button({
name: 'cancel',
- label: IPA.messages.buttons.cancel,
+ label: '@i18n:buttons.cancel',
click: function() {
that.close();
}
@@ -610,7 +610,7 @@ IPA.entitle.register_offline_dialog = function(spec) {
that.create_button({
name: 'cancel',
- label: IPA.messages.buttons.cancel,
+ label: '@i18n:buttons.cancel',
click: function() {
that.close();
}
@@ -627,7 +627,7 @@ IPA.entitle.consume_dialog = function(spec) {
that.create_button({
name: 'consume',
- label: IPA.messages.objects.entitle.consume,
+ label: '@i18n:objects.entitle.consume',
click: function() {
if (!that.validate()) {
@@ -650,7 +650,7 @@ IPA.entitle.consume_dialog = function(spec) {
that.create_button({
name: 'cancel',
- label: IPA.messages.buttons.cancel,
+ label: '@i18n:buttons.cancel',
click: function() {
that.close();
}
@@ -667,7 +667,7 @@ IPA.entitle.import_dialog = function(spec) {
that.create_button({
name: 'import',
- label: IPA.messages.objects.entitle.import_button,
+ label: '@i18n:objects.entitle.import_button',
click: function() {
that.entity.import_certificate(
that.get_certificate(),
@@ -682,7 +682,7 @@ IPA.entitle.import_dialog = function(spec) {
that.create_button({
name: 'cancel',
- label: IPA.messages.buttons.cancel,
+ label: '@i18n:buttons.cancel',
click: function() {
that.close();
}
diff --git a/install/ui/src/freeipa/facet.js b/install/ui/src/freeipa/facet.js
index 0145020bb..1f5f21a98 100644
--- a/install/ui/src/freeipa/facet.js
+++ b/install/ui/src/freeipa/facet.js
@@ -2232,7 +2232,7 @@ IPA.action_list_widget = function(spec) {
{
type: 'button',
name: 'apply',
- label: IPA.messages.actions.apply
+ label: '@i18n:actions.apply'
}
];
diff --git a/install/ui/src/freeipa/group.js b/install/ui/src/freeipa/group.js
index 2dadfa5ff..8b69a9ebd 100644
--- a/install/ui/src/freeipa/group.js
+++ b/install/ui/src/freeipa/group.js
@@ -53,8 +53,8 @@ IPA.group.entity = function(spec) {
type: 'value_map',
name: 'external',
param: 'objectclass',
- label: IPA.messages.objects.group.type,
- default_label: IPA.messages.objects.group.normal,
+ label: '@i18n:objects.group.type',
+ default_label: '@i18n:objects.group.normal',
value_map: {
ipaexternalgroup: '@i18n:objects.group.external',
posixgroup: '@i18n:objects.group.posix'
@@ -150,21 +150,21 @@ IPA.group.entity = function(spec) {
{
type: 'radio',
name: 'type',
- label: IPA.messages.objects.group.type,
+ label: '@i18n:objects.group.type',
flags: ['no_command'],
default_value: 'posix',
options: [
{
value: 'normal',
- label: IPA.messages.objects.group.normal
+ label: '@i18n:objects.group.normal'
},
{
value: 'external',
- label: IPA.messages.objects.group.external
+ label: '@i18n:objects.group.external'
},
{
value: 'posix',
- label: IPA.messages.objects.group.posix
+ label: '@i18n:objects.group.posix'
}
]
},
diff --git a/install/ui/src/freeipa/hbac.js b/install/ui/src/freeipa/hbac.js
index 23791b349..bff36c0c8 100644
--- a/install/ui/src/freeipa/hbac.js
+++ b/install/ui/src/freeipa/hbac.js
@@ -41,7 +41,7 @@ IPA.hbac.rule_entity = function(spec) {
'cn',
{
name: 'ipaenabledflag',
- label: IPA.messages.status.label,
+ label: '@i18n:status.label',
formatter: IPA.boolean_status_formatter()
},
'description'
@@ -53,12 +53,12 @@ IPA.hbac.rule_entity = function(spec) {
control_buttons: [
{
name: 'disable',
- label: IPA.messages.buttons.disable,
+ label: '@i18n:buttons.disable',
icon: 'disabled-icon'
},
{
name: 'enable',
- label: IPA.messages.buttons.enable,
+ label: '@i18n:buttons.enable',
icon: 'enabled-icon'
}
]
@@ -112,7 +112,7 @@ IPA.hbac.service_entity = function(spec) {
sections: [
{
name: 'general',
- label: IPA.messages.details.general,
+ label: '@i18n:details.general',
fields: [
'cn',
{
@@ -174,7 +174,7 @@ IPA.hbac.service_group_entity = function(spec) {
sections: [
{
name: 'general',
- label: IPA.messages.details.general,
+ label: '@i18n:details.general',
fields: [
'cn',
{
@@ -243,7 +243,7 @@ IPA.hbacrule_details_facet = function(spec) {
{
type: 'details_table_section',
name: 'general',
- label: IPA.messages.details.general,
+ label: '@i18n:details.general',
widgets: [
{
name: 'cn'
@@ -284,7 +284,7 @@ IPA.hbacrule_details_facet = function(spec) {
{
factory: IPA.collapsible_section,
name: 'user',
- label: IPA.messages.objects.hbacrule.user,
+ label: '@i18n:objects.hbacrule.user',
widgets: [
{
factory: IPA.rule_details_widget,
@@ -292,9 +292,9 @@ IPA.hbacrule_details_facet = function(spec) {
radio_name: 'usercategory',
options: [
{ value: 'all',
- label: IPA.messages.objects.hbacrule.anyone },
+ label: '@i18n:objects.hbacrule.anyone' },
{ value: '',
- label: IPA.messages.objects.hbacrule.specified_users }
+ label: '@i18n:objects.hbacrule.specified_users' }
],
tables: [
{ name: 'memberuser_user' },
@@ -353,7 +353,7 @@ IPA.hbacrule_details_facet = function(spec) {
{
factory: IPA.collapsible_section,
name: 'host',
- label: IPA.messages.objects.hbacrule.host,
+ label: '@i18n:objects.hbacrule.host',
widgets: [
{
factory: IPA.rule_details_widget,
@@ -426,7 +426,7 @@ IPA.hbacrule_details_facet = function(spec) {
{
factory: IPA.collapsible_section,
name: 'service',
- label: IPA.messages.objects.hbacrule.service,
+ label: '@i18n:objects.hbacrule.service',
widgets: [
{
factory: IPA.rule_details_widget,
diff --git a/install/ui/src/freeipa/hbactest.js b/install/ui/src/freeipa/hbactest.js
index ac9183130..e51c7061b 100644
--- a/install/ui/src/freeipa/hbactest.js
+++ b/install/ui/src/freeipa/hbactest.js
@@ -38,7 +38,7 @@ IPA.hbac.test_entity = function(spec) {
facet({
factory: IPA.hbac.test_select_facet,
name: 'user',
- label: IPA.messages.objects.hbacrule.user,
+ label: '@i18n:objects.hbacrule.user',
managed_entity: 'user',
disable_breadcrumb: true,
facet_group: 'default',
@@ -49,7 +49,7 @@ IPA.hbac.test_entity = function(spec) {
'sn',
{
name: 'nsaccountlock',
- label: IPA.messages.status.label,
+ label: '@i18n:status.label',
formatter: IPA.boolean_status_formatter({
invert_value: true
})
@@ -59,7 +59,7 @@ IPA.hbac.test_entity = function(spec) {
facet({
factory: IPA.hbac.test_select_facet,
name: 'targethost',
- label: IPA.messages.objects.hbacrule.host,
+ label: '@i18n:objects.hbacrule.host',
managed_entity: 'host',
disable_breadcrumb: true,
facet_group: 'default',
@@ -68,7 +68,7 @@ IPA.hbac.test_entity = function(spec) {
'description',
{
name: 'has_keytab',
- label: IPA.messages.objects.host.enrolled,
+ label: '@i18n:objects.host.enrolled',
formatter: IPA.boolean_formatter()
}
]
@@ -76,7 +76,7 @@ IPA.hbac.test_entity = function(spec) {
facet({
factory: IPA.hbac.test_select_facet,
name: 'service',
- label: IPA.messages.objects.hbacrule.service,
+ label: '@i18n:objects.hbacrule.service',
managed_entity: 'hbacsvc',
disable_breadcrumb: true,
facet_group: 'default',
@@ -88,7 +88,7 @@ IPA.hbac.test_entity = function(spec) {
facet({
factory: IPA.hbac.test_rules_facet,
name: 'rules',
- label: IPA.messages.objects.hbactest.rules,
+ label: '@i18n:objects.hbactest.rules',
managed_entity: 'hbacrule',
disable_breadcrumb: true,
facet_group: 'default',
@@ -97,7 +97,7 @@ IPA.hbac.test_entity = function(spec) {
'cn',
{
name: 'ipaenabledflag',
- label: IPA.messages.status.label,
+ label: '@i18n:status.label',
formatter: IPA.boolean_status_formatter()
},
'description'
@@ -106,7 +106,7 @@ IPA.hbac.test_entity = function(spec) {
facet({
factory: IPA.hbac.test_run_facet,
name: 'run_test',
- label: IPA.messages.objects.hbactest.run_test,
+ label: '@i18n:objects.hbactest.run_test',
managed_entity: 'hbacrule',
disable_breadcrumb: true,
facet_group: 'default',
@@ -115,12 +115,12 @@ IPA.hbac.test_entity = function(spec) {
'cn',
{
name: 'matched',
- label: IPA.messages.objects.hbactest.matched,
+ label: '@i18n:objects.hbactest.matched',
formatter: IPA.boolean_formatter()
},
{
name: 'ipaenabledflag',
- label: IPA.messages.status.label,
+ label: '@i18n:status.label',
formatter: IPA.boolean_status_formatter()
},
'description'
@@ -165,7 +165,7 @@ IPA.hbac.test_facet = function(spec) {
if (index > 0) {
that.prev_button = IPA.button({
name: 'prev',
- label: IPA.messages.widget.prev,
+ label: '@i18n:widget.prev',
icon: 'ui-icon ui-icon-triangle-1-w',
click: function() {
if (!that.prev_button.hasClass('action-button-disabled')) {
@@ -180,7 +180,7 @@ IPA.hbac.test_facet = function(spec) {
that.next_button = IPA.button({
name: 'next',
- label: IPA.messages.widget.next,
+ label: '@i18n:widget.next',
icon: 'ui-icon ui-icon-triangle-1-e',
click: function() {
if (!that.next_button.hasClass('action-button-disabled')) {
@@ -516,7 +516,7 @@ IPA.hbac.test_run_facet = function(spec) {
that.run_button = IPA.button({
name: 'run_test',
- label: IPA.messages.objects.hbactest.run_test,
+ label: '@i18n:objects.hbactest.run_test',
click: function() {
if (!that.run_button.hasClass('action-button-disabled')) {
that.run();
@@ -588,7 +588,7 @@ IPA.hbac.test_run_facet = function(spec) {
that.prev_button = IPA.button({
name: 'prev',
- label: IPA.messages.widget.prev,
+ label: '@i18n:widget.prev',
icon: 'ui-icon ui-icon-triangle-1-w',
click: function() {
if (!that.prev_button.hasClass('action-button-disabled')) {
@@ -602,7 +602,7 @@ IPA.hbac.test_run_facet = function(spec) {
that.new_test_button = IPA.button({
name: 'new_test',
- label: IPA.messages.objects.hbactest.new_test,
+ label: '@i18n:objects.hbactest.new_test',
click: function() {
if (!that.new_test_button.hasClass('action-button-disabled')) {
that.new_test();
diff --git a/install/ui/src/freeipa/host.js b/install/ui/src/freeipa/host.js
index f5f6a2be3..65557dc8c 100644
--- a/install/ui/src/freeipa/host.js
+++ b/install/ui/src/freeipa/host.js
@@ -54,7 +54,7 @@ IPA.host.entity = function(spec) {
'description',
{
name: 'has_keytab',
- label: IPA.messages.objects.host.enrolled,
+ label: '@i18n:objects.host.enrolled',
formatter: IPA.boolean_formatter()
}
]
@@ -82,7 +82,7 @@ IPA.host.entity = function(spec) {
{
type: 'sshkeys',
name: 'ipasshpubkey',
- label: IPA.messages.objects.sshkeystore.keys
+ label: '@i18n:objects.sshkeystore.keys'
},
{
type: 'multivalued',
@@ -107,12 +107,12 @@ IPA.host.entity = function(spec) {
{
factory: IPA.host_keytab_widget,
name: 'has_keytab',
- label: IPA.messages.objects.host.keytab
+ label: '@i18n:objects.host.keytab'
},
{
type: 'host_password',
name: 'has_password',
- label: IPA.messages.objects.host.password
+ label: '@i18n:objects.host.password'
}
]
},
@@ -130,7 +130,7 @@ IPA.host.entity = function(spec) {
{
type: 'certificate_status',
name: 'certificate_status',
- label: IPA.messages.objects.host.status
+ label: '@i18n:objects.host.status'
}
]
}
@@ -140,14 +140,14 @@ IPA.host.entity = function(spec) {
{
factory: IPA.host.set_otp_action,
name: 'set_otp',
- label: IPA.messages.objects.host.password_set_title,
+ label: '@i18n:objects.host.password_set_title',
status: 'missing',
hide_cond: ['has_password']
},
{
factory: IPA.host.set_otp_action,
name: 'reset_otp',
- label: IPA.messages.objects.host.password_reset_title,
+ label: '@i18n:objects.host.password_reset_title',
status: 'present',
show_cond: ['has_password']
},
@@ -264,7 +264,7 @@ IPA.host_fqdn_widget = function(spec) {
{
type: 'text',
name: 'hostname',
- label: IPA.messages.objects.service.host,
+ label: '@i18n:objects.service.host',
required: true
},
{
@@ -638,7 +638,7 @@ IPA.host_unprovision_dialog = function(spec) {
that.create_button({
name: 'unprovision',
- label: IPA.messages.objects.host.unprovision,
+ label: '@i18n:objects.host.unprovision',
click: function() {
that.unprovision(
function(data, text_status, xhr) {
@@ -655,7 +655,7 @@ IPA.host_unprovision_dialog = function(spec) {
that.create_button({
name: 'cancel',
- label: IPA.messages.buttons.cancel,
+ label: '@i18n:buttons.cancel',
click: function() {
that.close();
}
@@ -800,13 +800,13 @@ IPA.host.set_otp_dialog = function(spec) {
fields: [
{
name: 'password1',
- label: IPA.messages.password.new_password,
+ label: '@i18n:password.new_password',
type: 'password',
required: true
},
{
name: 'password2',
- label: IPA.messages.password.verify_password,
+ label: '@i18n:password.verify_password',
type: 'password',
required: true,
validators: [IPA.same_password_validator({
@@ -850,7 +850,7 @@ IPA.host.set_otp_dialog = function(spec) {
that.create_button({
name: 'set_password',
- label: IPA.messages.objects.host.password_set_button,
+ label: '@i18n:objects.host.password_set_button',
click: function() {
that.on_confirm();
}
@@ -858,7 +858,7 @@ IPA.host.set_otp_dialog = function(spec) {
that.create_button({
name: 'cancel',
- label: IPA.messages.buttons.cancel,
+ label: '@i18n:buttons.cancel',
click: function() {
that.close();
}
diff --git a/install/ui/src/freeipa/hostgroup.js b/install/ui/src/freeipa/hostgroup.js
index 54531924d..af9e48bba 100644
--- a/install/ui/src/freeipa/hostgroup.js
+++ b/install/ui/src/freeipa/hostgroup.js
@@ -40,7 +40,7 @@ IPA.hostgroup.entity = function(spec) {
sections: [
{
name: 'identity',
- label: IPA.messages.objects.hostgroup.identity,
+ label: '@i18n:objects.hostgroup.identity',
fields: [
'cn',
{
diff --git a/install/ui/src/freeipa/idrange.js b/install/ui/src/freeipa/idrange.js
index 847bc98ab..cfc58396a 100644
--- a/install/ui/src/freeipa/idrange.js
+++ b/install/ui/src/freeipa/idrange.js
@@ -47,27 +47,27 @@ IPA.idrange.entity = function(spec) {
'iparangetype',
{
name: 'ipabaseid',
- label: IPA.messages.objects.idrange.ipabaseid,
+ label: '@i18n:objects.idrange.ipabaseid',
tooltip: IPA.get_entity_param('idrange', 'ipabaseid').label
},
{
name: 'ipaidrangesize',
- label: IPA.messages.objects.idrange.ipaidrangesize,
+ label: '@i18n:objects.idrange.ipaidrangesize',
tooltip: IPA.get_entity_param('idrange', 'ipaidrangesize').label
},
{
name: 'ipabaserid',
- label: IPA.messages.objects.idrange.ipabaserid,
+ label: '@i18n:objects.idrange.ipabaserid',
tooltip: IPA.get_entity_param('idrange', 'ipabaserid').label
},
{
name: 'ipasecondarybaserid',
- label: IPA.messages.objects.idrange.ipasecondarybaserid,
+ label: '@i18n:objects.idrange.ipasecondarybaserid',
tooltip: IPA.get_entity_param('idrange', 'ipasecondarybaserid').label
},
{
name: 'ipanttrusteddomainsid',
- label: IPA.messages.objects.idrange.ipanttrusteddomainsid,
+ label: '@i18n:objects.idrange.ipanttrusteddomainsid',
tooltip: IPA.get_entity_param('idrange', 'ipanttrusteddomainsid').label
}
]
@@ -82,31 +82,31 @@ IPA.idrange.entity = function(spec) {
},
{
name: 'ipabaseid',
- label: IPA.messages.objects.idrange.ipabaseid,
+ label: '@i18n:objects.idrange.ipabaseid',
tooltip: IPA.get_entity_param('idrange', 'ipabaseid').label,
widget: 'idrange.ipabaseid'
},
{
name: 'ipaidrangesize',
- label: IPA.messages.objects.idrange.ipaidrangesize,
+ label: '@i18n:objects.idrange.ipaidrangesize',
tooltip: IPA.get_entity_param('idrange', 'ipaidrangesize').label,
widget: 'idrange.ipaidrangesize'
},
{
name: 'ipabaserid',
- label: IPA.messages.objects.idrange.ipabaserid,
+ label: '@i18n:objects.idrange.ipabaserid',
tooltip: IPA.get_entity_param('idrange', 'ipabaserid').label,
widget: 'idrange.ipabaserid'
},
{
name: 'ipasecondarybaserid',
- label: IPA.messages.objects.idrange.ipasecondarybaserid,
+ label: '@i18n:objects.idrange.ipasecondarybaserid',
tooltip: IPA.get_entity_param('idrange', 'ipasecondarybaserid').label,
widget: 'type.ipasecondarybaserid'
},
{
name: 'ipanttrusteddomainsid',
- label: IPA.messages.objects.idrange.ipanttrusteddomainsid,
+ label: '@i18n:objects.idrange.ipanttrusteddomainsid',
tooltip: IPA.get_entity_param('idrange', 'ipanttrusteddomainsid').label,
widget: 'type.ipanttrusteddomainsid'
}
@@ -125,18 +125,18 @@ IPA.idrange.entity = function(spec) {
{
type: 'multiple_choice_section',
name: 'type',
- label: IPA.messages.objects.idrange.type,
+ label: '@i18n:objects.idrange.type',
choices: [
{
name: 'local',
- label: IPA.messages.objects.idrange.type_local,
+ label: '@i18n:objects.idrange.type_local',
fields: ['ipasecondarybaserid'],
required: ['ipasecondarybaserid'],
enabled: true
},
{
name: 'ad',
- label: IPA.messages.objects.idrange.type_ad,
+ label: '@i18n:objects.idrange.type_ad',
fields: ['ipanttrusteddomainsid'],
required: ['ipanttrusteddomainsid']
}
diff --git a/install/ui/src/freeipa/ipa.js b/install/ui/src/freeipa/ipa.js
index a1fefa50d..f9f8a16c8 100644
--- a/install/ui/src/freeipa/ipa.js
+++ b/install/ui/src/freeipa/ipa.js
@@ -1331,7 +1331,7 @@ IPA.dirty_dialog = function(spec) {
that.create_button({
name: 'update',
- label: IPA.messages.buttons.update,
+ label: '@i18n:buttons.update',
click: function() {
that.facet.update(function() {
that.close();
@@ -1342,7 +1342,7 @@ IPA.dirty_dialog = function(spec) {
that.create_button({
name: 'reset',
- label: IPA.messages.buttons.reset,
+ label: '@i18n:buttons.reset',
click: function() {
that.facet.reset();
that.close();
@@ -1352,7 +1352,7 @@ IPA.dirty_dialog = function(spec) {
that.create_button({
name: 'cancel',
- label: IPA.messages.buttons.cancel,
+ label: '@i18n:buttons.cancel',
click: function() {
that.close();
}
diff --git a/install/ui/src/freeipa/netgroup.js b/install/ui/src/freeipa/netgroup.js
index 05995e7bb..44423ced6 100644
--- a/install/ui/src/freeipa/netgroup.js
+++ b/install/ui/src/freeipa/netgroup.js
@@ -92,7 +92,7 @@ IPA.netgroup.details_facet = function(spec) {
{
type: 'details_table_section',
name: 'identity',
- label: IPA.messages.details.general,
+ label: '@i18n:details.general',
widgets: [
{
name: 'cn'
@@ -137,7 +137,7 @@ IPA.netgroup.details_facet = function(spec) {
{
factory: IPA.collapsible_section,
name: 'user',
- label: IPA.messages.objects.netgroup.user,
+ label: '@i18n:objects.netgroup.user',
widgets: [
{
factory: IPA.rule_details_widget,
@@ -145,9 +145,9 @@ IPA.netgroup.details_facet = function(spec) {
radio_name: 'usercategory',
options: [
{ value: 'all',
- label: IPA.messages.objects.netgroup.anyone },
+ label: '@i18n:objects.netgroup.anyone' },
{ value: '',
- label: IPA.messages.objects.netgroup.specified_users }
+ label: '@i18n:objects.netgroup.specified_users' }
],
tables: [
{ name: 'memberuser_user' },
@@ -165,7 +165,7 @@ IPA.netgroup.details_facet = function(spec) {
columns: [
{
name: 'memberuser_user',
- label: IPA.messages.objects.netgroup.users,
+ label: '@i18n:objects.netgroup.users',
link: true
}
]
@@ -181,7 +181,7 @@ IPA.netgroup.details_facet = function(spec) {
columns: [
{
name: 'memberuser_group',
- label: IPA.messages.objects.netgroup.usergroups,
+ label: '@i18n:objects.netgroup.usergroups',
link: true
}
]
@@ -221,7 +221,7 @@ IPA.netgroup.details_facet = function(spec) {
{
factory: IPA.collapsible_section,
name: 'host',
- label: IPA.messages.objects.netgroup.host,
+ label: '@i18n:objects.netgroup.host',
widgets: [
{
factory: IPA.rule_details_widget,
@@ -230,11 +230,11 @@ IPA.netgroup.details_facet = function(spec) {
options: [
{
'value': 'all',
- 'label': IPA.messages.objects.netgroup.any_host
+ label: '@i18n:objects.netgroup.any_host'
},
{
'value': '',
- 'label': IPA.messages.objects.netgroup.specified_hosts
+ label: '@i18n:objects.netgroup.specified_hosts'
}
],
tables: [
@@ -254,12 +254,12 @@ IPA.netgroup.details_facet = function(spec) {
columns: [
{
name: 'memberhost_host',
- label: IPA.messages.objects.netgroup.hosts,
+ label: '@i18n:objects.netgroup.hosts',
link: true
},
{
name: 'externalhost',
- label: IPA.messages.objects.netgroup.external,
+ label: '@i18n:objects.netgroup.external',
formatter: IPA.boolean_formatter(),
width: '200px'
}
@@ -276,7 +276,7 @@ IPA.netgroup.details_facet = function(spec) {
columns: [
{
name: 'memberhost_hostgroup',
- label: IPA.messages.objects.netgroup.hostgroups,
+ label: '@i18n:objects.netgroup.hostgroups',
link: true
}
]
diff --git a/install/ui/src/freeipa/realmdomains.js b/install/ui/src/freeipa/realmdomains.js
index 0121b89c3..9a0cc523d 100644
--- a/install/ui/src/freeipa/realmdomains.js
+++ b/install/ui/src/freeipa/realmdomains.js
@@ -37,7 +37,7 @@ define(['./ipa', './jquery', './details', './entity'], function (IPA, $) {
sections: [
{
name: 'identity',
- label: IPA.messages.objects.realmdomains.identity,
+ label: '@i18n:objects.realmdomains.identity',
fields: [
{
name: 'associateddomain',
@@ -72,7 +72,7 @@ define(['./ipa', './jquery', './details', './entity'], function (IPA, $) {
var dialog = IPA.confirm_dialog({
title: IPA.messages.objects.realmdomains.check_dns,
message: IPA.messages.objects.realmdomains.check_dns_confirmation,
- ok_label: IPA.messages.objects.realmdomains.check_dns,
+ ok_label: '@i18n:objects.realmdomains.check_dns',
on_ok: function () {
command.execute();
}
@@ -83,7 +83,7 @@ define(['./ipa', './jquery', './details', './entity'], function (IPA, $) {
dialog.create_button({
name: 'force',
- label: IPA.messages.objects.realmdomains.force_update,
+ label: '@i18n:objects.realmdomains.force_update',
visible: true,
click: function () {
command.set_option('force', true);
diff --git a/install/ui/src/freeipa/rule.js b/install/ui/src/freeipa/rule.js
index 1d60c7556..faa305a4b 100644
--- a/install/ui/src/freeipa/rule.js
+++ b/install/ui/src/freeipa/rule.js
@@ -120,7 +120,7 @@ IPA.rule_association_table_widget = function(spec) {
if (that.external) {
that.create_column({
name: that.external,
- label: IPA.messages.objects.sudorule.external,
+ label: '@i18n:objects.sudorule.external',
entity: that.other_entity,
formatter: IPA.boolean_formatter(),
width: '200px'
diff --git a/install/ui/src/freeipa/search.js b/install/ui/src/freeipa/search.js
index 0ea5c2b1e..902696edd 100644
--- a/install/ui/src/freeipa/search.js
+++ b/install/ui/src/freeipa/search.js
@@ -47,19 +47,19 @@ IPA.search_facet = function(spec, no_init) {
spec.control_buttons.unshift(
{
name: 'remove',
- label: IPA.messages.buttons.remove,
+ label: '@i18n:buttons.remove',
icon: 'remove-icon'
},
{
name: 'add',
- label: IPA.messages.buttons.add,
+ label: '@i18n:buttons.add',
icon: 'add-icon'
});
}
spec.control_buttons.unshift(
{
name: 'refresh',
- label: IPA.messages.buttons.refresh,
+ label: '@i18n:buttons.refresh',
icon: 'reset-icon'
});
diff --git a/install/ui/src/freeipa/selinux.js b/install/ui/src/freeipa/selinux.js
index d8e0d3ead..960db302e 100644
--- a/install/ui/src/freeipa/selinux.js
+++ b/install/ui/src/freeipa/selinux.js
@@ -40,7 +40,7 @@ IPA.selinux.selinuxusermap_entity = function(spec) {
'ipaselinuxuser',
{
name: 'ipaenabledflag',
- label: IPA.messages.status.label,
+ label: '@i18n:status.label',
formatter: IPA.boolean_status_formatter()
},
'description'
@@ -52,12 +52,12 @@ IPA.selinux.selinuxusermap_entity = function(spec) {
control_buttons: [
{
name: 'disable',
- label: IPA.messages.buttons.disable,
+ label: '@i18n:buttons.disable',
icon: 'disabled-icon'
},
{
name: 'enable',
- label: IPA.messages.buttons.enable,
+ label: '@i18n:buttons.enable',
icon: 'enabled-icon'
}
]
@@ -131,7 +131,7 @@ IPA.selinux_details_facet = function(spec) {
{
type: 'details_table_section',
name: 'general',
- label: IPA.messages.details.general,
+ label: '@i18n:details.general',
widgets: [
{
name: 'cn'
@@ -182,7 +182,7 @@ IPA.selinux_details_facet = function(spec) {
{
factory: IPA.collapsible_section,
name: 'user',
- label: IPA.messages.objects.selinuxusermap.user,
+ label: '@i18n:objects.selinuxusermap.user',
widgets: [
{
factory: IPA.rule_details_widget,
@@ -190,9 +190,9 @@ IPA.selinux_details_facet = function(spec) {
radio_name: 'usercategory',
options: [
{ value: 'all',
- label: IPA.messages.objects.selinuxusermap.anyone },
+ label: '@i18n:objects.selinuxusermap.anyone' },
{ value: '',
- label: IPA.messages.objects.selinuxusermap.specified_users }
+ label: '@i18n:objects.selinuxusermap.specified_users' }
],
tables: [
{ name: 'memberuser_user' },
@@ -251,7 +251,7 @@ IPA.selinux_details_facet = function(spec) {
{
factory: IPA.collapsible_section,
name: 'host',
- label: IPA.messages.objects.selinuxusermap.host,
+ label: '@i18n:objects.selinuxusermap.host',
widgets: [
{
factory: IPA.rule_details_widget,
@@ -260,11 +260,11 @@ IPA.selinux_details_facet = function(spec) {
options: [
{
'value': 'all',
- 'label': IPA.messages.objects.selinuxusermap.any_host
+ label: '@i18n:objects.selinuxusermap.any_host'
},
{
'value': '',
- 'label': IPA.messages.objects.selinuxusermap.specified_hosts
+ label: '@i18n:objects.selinuxusermap.specified_hosts'
}
],
tables: [
diff --git a/install/ui/src/freeipa/serverconfig.js b/install/ui/src/freeipa/serverconfig.js
index 02db38cb7..7e423dc66 100644
--- a/install/ui/src/freeipa/serverconfig.js
+++ b/install/ui/src/freeipa/serverconfig.js
@@ -38,7 +38,7 @@ IPA.serverconfig.entity = function(spec) {
sections: [
{
name: 'search',
- label: IPA.messages.objects.config.search,
+ label: '@i18n:objects.config.search',
fields: [
'ipasearchrecordslimit',
'ipasearchtimelimit'
@@ -46,7 +46,7 @@ IPA.serverconfig.entity = function(spec) {
},
{
name: 'user',
- label: IPA.messages.objects.config.user,
+ label: '@i18n:objects.config.user',
fields: [
'ipausersearchfields',
'ipadefaultemaildomain',
@@ -80,7 +80,7 @@ IPA.serverconfig.entity = function(spec) {
},
{
name: 'group',
- label: IPA.messages.objects.config.group,
+ label: '@i18n:objects.config.group',
fields: [
'ipagroupsearchfields',
{
@@ -91,7 +91,7 @@ IPA.serverconfig.entity = function(spec) {
},
{
name: 'selinux',
- label: IPA.messages.objects.config.selinux,
+ label: '@i18n:objects.config.selinux',
fields: [
'ipaselinuxusermaporder',
'ipaselinuxusermapdefault'
@@ -99,7 +99,7 @@ IPA.serverconfig.entity = function(spec) {
},
{
name: 'service',
- label: IPA.messages.objects.config.service,
+ label: '@i18n:objects.config.service',
fields: [
{
name: 'ipakrbauthzdata',
diff --git a/install/ui/src/freeipa/service.js b/install/ui/src/freeipa/service.js
index a1a7386f3..d77622a13 100644
--- a/install/ui/src/freeipa/service.js
+++ b/install/ui/src/freeipa/service.js
@@ -60,13 +60,13 @@ IPA.service.entity = function(spec) {
{
type: 'service_name',
name: 'service',
- label: IPA.messages.objects.service.service,
+ label: '@i18n:objects.service.service',
read_only: true
},
{
type: 'service_host',
name: 'host',
- label: IPA.messages.objects.service.host,
+ label: '@i18n:objects.service.host',
read_only: true
},
{
@@ -75,11 +75,11 @@ IPA.service.entity = function(spec) {
layout: 'vertical',
options: [
{
- label: IPA.messages.krbauthzdata.inherited,
+ label: '@i18n:krbauthzdata.inherited',
value: ''
},
{
- label: IPA.messages.krbauthzdata.override,
+ label: '@i18n:krbauthzdata.override',
name: 'ipakrbauthzdata_override',
factory: IPA.option_widget_base,
input_type: 'checkbox',
@@ -87,11 +87,11 @@ IPA.service.entity = function(spec) {
combine_values: false,
options: [
{
- label: IPA.messages.krbauthzdata.mspac,
+ label: '@i18n:krbauthzdata.mspac',
value: 'MS-PAC'
},
{
- label: IPA.messages.krbauthzdata.pad,
+ label: '@i18n:krbauthzdata.pad',
value: 'PAD'
}
]
@@ -116,7 +116,7 @@ IPA.service.entity = function(spec) {
{
type: 'service_provisioning_status',
name: 'has_keytab',
- label: IPA.messages.objects.service.status
+ label: '@i18n:objects.service.status'
}
]
},
@@ -134,7 +134,7 @@ IPA.service.entity = function(spec) {
{
type: 'certificate_status',
name: 'certificate_status',
- label: IPA.messages.objects.service.status
+ label: '@i18n:objects.service.status'
}
]
}
@@ -173,7 +173,7 @@ IPA.service.entity = function(spec) {
{
type: 'combobox',
name: 'service',
- label: IPA.messages.objects.service.service,
+ label: '@i18n:objects.service.service',
options: [
'cifs',
'DNS',
@@ -196,7 +196,7 @@ IPA.service.entity = function(spec) {
name: 'host',
other_entity: 'host',
other_field: 'fqdn',
- label: IPA.messages.objects.service.host,
+ label: '@i18n:objects.service.host',
required: true,
z_index: 1
},
@@ -397,7 +397,7 @@ IPA.service.unprovision_dialog = function(spec) {
that.create_button({
name: 'unprovision',
- label: IPA.messages.objects.service.unprovision,
+ label: '@i18n:objects.service.unprovision',
click: function() {
that.unprovision();
}
@@ -405,7 +405,7 @@ IPA.service.unprovision_dialog = function(spec) {
that.create_button({
name: 'cancel',
- label: IPA.messages.buttons.cancel,
+ label: '@i18n:buttons.cancel',
click: function() {
that.close();
}
diff --git a/install/ui/src/freeipa/sudo.js b/install/ui/src/freeipa/sudo.js
index fcae77747..3ce3e3534 100644
--- a/install/ui/src/freeipa/sudo.js
+++ b/install/ui/src/freeipa/sudo.js
@@ -39,7 +39,7 @@ IPA.sudo.rule_entity = function(spec) {
'cn',
{
name: 'ipaenabledflag',
- label: IPA.messages.status.label,
+ label: '@i18n:status.label',
formatter: IPA.boolean_status_formatter()
},
'description'
@@ -51,12 +51,12 @@ IPA.sudo.rule_entity = function(spec) {
control_buttons: [
{
name: 'disable',
- label: IPA.messages.buttons.disable,
+ label: '@i18n:buttons.disable',
icon: 'disabled-icon'
},
{
name: 'enable',
- label: IPA.messages.buttons.enable,
+ label: '@i18n:buttons.enable',
icon: 'enabled-icon'
}
]
@@ -110,7 +110,7 @@ IPA.sudo.command_entity = function(spec) {
sections: [
{
name: 'general',
- label: IPA.messages.details.general,
+ label: '@i18n:details.general',
fields: [
'sudocmd',
{
@@ -172,7 +172,7 @@ IPA.sudo.command_group_entity = function(spec) {
sections: [
{
name: 'general',
- label: IPA.messages.details.general,
+ label: '@i18n:details.general',
fields: [
'cn',
{
@@ -241,7 +241,7 @@ IPA.sudorule_details_facet = function(spec) {
{
type: 'details_table_section',
name: 'general',
- label: IPA.messages.details.general,
+ label: '@i18n:details.general',
widgets: [
{
name: 'cn'
@@ -269,7 +269,7 @@ IPA.sudorule_details_facet = function(spec) {
{
factory: IPA.sudo.options_section,
name: 'options',
- label: IPA.messages.objects.sudorule.options,
+ label: '@i18n:objects.sudorule.options',
facet: that
}
);
@@ -303,7 +303,7 @@ IPA.sudorule_details_facet = function(spec) {
{
factory: IPA.collapsible_section,
name: 'user',
- label: IPA.messages.objects.sudorule.user,
+ label: '@i18n:objects.sudorule.user',
widgets: [
{
factory: IPA.rule_details_widget,
@@ -312,11 +312,11 @@ IPA.sudorule_details_facet = function(spec) {
options: [
{
value: 'all',
- label: IPA.messages.objects.sudorule.anyone
+ label: '@i18n:objects.sudorule.anyone'
},
{
value: '',
- label: IPA.messages.objects.sudorule.specified_users
+ label: '@i18n:objects.sudorule.specified_users'
}
],
tables: [
@@ -378,7 +378,7 @@ IPA.sudorule_details_facet = function(spec) {
{
factory: IPA.collapsible_section,
name: 'host',
- label: IPA.messages.objects.sudorule.host,
+ label: '@i18n:objects.sudorule.host',
widgets: [
{
factory: IPA.rule_details_widget,
@@ -387,11 +387,11 @@ IPA.sudorule_details_facet = function(spec) {
options: [
{
'value': 'all',
- 'label': IPA.messages.objects.sudorule.any_host
+ label: '@i18n:objects.sudorule.any_host'
},
{
'value': '',
- 'label': IPA.messages.objects.sudorule.specified_hosts
+ label: '@i18n:objects.sudorule.specified_hosts'
}
],
tables: [
@@ -464,7 +464,7 @@ IPA.sudorule_details_facet = function(spec) {
{
factory: IPA.collapsible_section,
name: 'command',
- label: IPA.messages.objects.sudorule.command,
+ label: '@i18n:objects.sudorule.command',
widgets: [
{
factory: IPA.header_widget,
@@ -479,11 +479,11 @@ IPA.sudorule_details_facet = function(spec) {
options: [
{
value: 'all',
- label: IPA.messages.objects.sudorule.any_command
+ label: '@i18n:objects.sudorule.any_command'
},
{
value: '',
- label: IPA.messages.objects.sudorule.specified_commands
+ label: '@i18n:objects.sudorule.specified_commands'
}
],
tables: [
@@ -580,15 +580,15 @@ IPA.sudorule_details_facet = function(spec) {
{
factory: IPA.collapsible_section,
name: 'runas',
- label: IPA.messages.objects.sudorule.runas,
+ label: '@i18n:objects.sudorule.runas',
widgets: [
{
factory: IPA.rule_details_widget,
name: 'runas_users',
radio_name: 'ipasudorunasusercategory',
options: [
- { value: 'all', label: IPA.messages.objects.sudorule.anyone },
- { value: '', label: IPA.messages.objects.sudorule.specified_users }
+ { value: 'all', label: '@i18n:objects.sudorule.anyone' },
+ { value: '', label: '@i18n:objects.sudorule.specified_users' }
],
tables: [
{ name: 'ipasudorunas_user' },
@@ -621,8 +621,8 @@ IPA.sudorule_details_facet = function(spec) {
name: 'runas_groups',
radio_name: 'ipasudorunasgroupcategory',
options: [
- { value: 'all', label: IPA.messages.objects.sudorule.any_group },
- { value: '', label: IPA.messages.objects.sudorule.specified_groups }
+ { value: 'all', label: '@i18n:objects.sudorule.any_group' },
+ { value: '', label: '@i18n:objects.sudorule.specified_groups' }
],
tables: [
{ name: 'ipasudorunasgroup_group' }
@@ -691,7 +691,7 @@ IPA.sudo.options_section = function(spec) {
that.remove_button = IPA.action_button({
name: 'remove',
- label: IPA.messages.buttons.remove,
+ label: '@i18n:buttons.remove',
icon: 'remove-icon',
'class': 'action-button-disabled',
click: function() {
@@ -704,7 +704,7 @@ IPA.sudo.options_section = function(spec) {
that.add_button = IPA.action_button({
name: 'add',
- label: IPA.messages.buttons.add,
+ label: '@i18n:buttons.add',
icon: 'add-icon',
click: function() {
if (!that.add_button.hasClass('action-button-disabled')) {
@@ -802,7 +802,7 @@ IPA.sudo.options_section = function(spec) {
dialog.create_button({
name: 'add',
- label: IPA.messages.buttons.add,
+ label: '@i18n:buttons.add',
click: function() {
var ipasudoopt = dialog.fields.get_field('ipasudoopt');
var value = ipasudoopt.save()[0];
@@ -833,7 +833,7 @@ IPA.sudo.options_section = function(spec) {
dialog.create_button({
name: 'cancel',
- label: IPA.messages.buttons.cancel,
+ label: '@i18n:buttons.cancel',
click: function() {
dialog.close();
}
diff --git a/install/ui/src/freeipa/trust.js b/install/ui/src/freeipa/trust.js
index 7f4f054d1..d69aa73da 100644
--- a/install/ui/src/freeipa/trust.js
+++ b/install/ui/src/freeipa/trust.js
@@ -46,32 +46,32 @@ IPA.trust.entity = function(spec) {
sections: [
{
name: 'details',
- label: IPA.messages.objects.trust.details,
+ label: '@i18n:objects.trust.details',
fields: [
'cn',
{
name: 'ipantflatname',
- label: IPA.messages.objects.trust.ipantflatname,
+ label: '@i18n:objects.trust.ipantflatname',
read_only: true
},
{
name: 'ipanttrusteddomainsid',
- label: IPA.messages.objects.trust.ipanttrusteddomainsid,
+ label: '@i18n:objects.trust.ipanttrusteddomainsid',
read_only: true
},
{
name: 'trustdirection',
- label: IPA.messages.objects.trust.trustdirection
+ label: '@i18n:objects.trust.trustdirection'
},
{
name: 'trusttype',
- label: IPA.messages.objects.trust.trusttype
+ label: '@i18n:objects.trust.trusttype'
}
]
},
{
name: 'blacklists',
- label: IPA.messages.objects.trust.blacklists,
+ label: '@i18n:objects.trust.blacklists',
fields: [
{
type: 'multivalued',
@@ -84,7 +84,7 @@ IPA.trust.entity = function(spec) {
// trust status not supported by show command at the moment
// {
// name: 'truststatus',
-// label: IPA.messages.objects.trust.truststatus
+// label: '@i18n:objects.trust.truststatus'
// }
]
}
@@ -95,30 +95,30 @@ IPA.trust.entity = function(spec) {
fields: [
{
name: 'cn',
- label: IPA.messages.objects.trust.domain,
+ label: '@i18n:objects.trust.domain',
widget: 'realm.realm_server'
},
{
name: 'realm_admin',
- label: IPA.messages.objects.trust.account,
+ label: '@i18n:objects.trust.account',
widget: 'method.realm_admin'
},
{
type: 'password',
name: 'realm_passwd',
- label: IPA.messages.password.password,
+ label: '@i18n:password.password',
widget: 'method.realm_passwd'
},
{
type: 'password',
name: 'trust_secret',
- label: IPA.messages.password.password,
+ label: '@i18n:password.password',
widget: 'method.trust_secret'
},
{
type: 'password',
name: 'trust_secret_verify',
- label: IPA.messages.password.verify_password,
+ label: '@i18n:password.verify_password',
widget: 'method.trust_secret_verify',
flags: ['no_command'],
validators: [IPA.same_password_validator({
@@ -137,18 +137,18 @@ IPA.trust.entity = function(spec) {
{
type: 'multiple_choice_section',
name: 'method',
- label: IPA.messages.objects.trust.establish_using,
+ label: '@i18n:objects.trust.establish_using',
choices: [
{
name: 'admin-account',
- label: IPA.messages.objects.trust.admin_account,
+ label: '@i18n:objects.trust.admin_account',
fields: ['realm_admin', 'realm_passwd'],
required: ['realm_admin', 'realm_passwd'],
enabled: true
},
{
name: 'preshared_password',
- label: IPA.messages.objects.trust.preshared_password,
+ label: '@i18n:objects.trust.preshared_password',
fields: ['trust_secret', 'trust_secret_verify'],
required: ['trust_secret', 'trust_secret_verify']
}
diff --git a/install/ui/src/freeipa/user.js b/install/ui/src/freeipa/user.js
index b0b1efd7f..d02d27cea 100644
--- a/install/ui/src/freeipa/user.js
+++ b/install/ui/src/freeipa/user.js
@@ -44,7 +44,7 @@ IPA.user.entity = function(spec) {
'sn',
{
name: 'nsaccountlock',
- label: IPA.messages.status.label,
+ label: '@i18n:status.label',
formatter: IPA.boolean_status_formatter({
invert_value: true
})
@@ -67,12 +67,12 @@ IPA.user.entity = function(spec) {
control_buttons: [
{
name: 'disable',
- label: IPA.messages.buttons.disable,
+ label: '@i18n:buttons.disable',
icon: 'disabled-icon'
},
{
name: 'enable',
- label: IPA.messages.buttons.enable,
+ label: '@i18n:buttons.enable',
icon: 'enabled-icon'
}
]
@@ -82,7 +82,7 @@ IPA.user.entity = function(spec) {
sections: [
{
name: 'identity',
- label: IPA.messages.details.identity,
+ label: '@i18n:details.identity',
fields: [
'title',
'givenname',
@@ -109,7 +109,7 @@ IPA.user.entity = function(spec) {
},
{
name: 'krbpasswordexpiration',
- label: IPA.messages.objects.user.krbpasswordexpiration,
+ label: '@i18n:objects.user.krbpasswordexpiration',
read_only: true,
formatter: IPA.utc_date_formatter()
},
@@ -120,13 +120,13 @@ IPA.user.entity = function(spec) {
{
type: 'sshkeys',
name: 'ipasshpubkey',
- label: IPA.messages.objects.sshkeystore.keys
+ label: '@i18n:objects.sshkeystore.keys'
}
]
},
{
name: 'pwpolicy',
- label: IPA.messages.objects.pwpolicy.identity,
+ label: '@i18n:objects.pwpolicy.identity',
fields: [
{
name: 'krbmaxpwdlife',
@@ -175,7 +175,7 @@ IPA.user.entity = function(spec) {
},
{
name: 'krbtpolicy',
- label: IPA.messages.objects.krbtpolicy.identity,
+ label: '@i18n:objects.krbtpolicy.identity',
fields: [
{
name: 'krbmaxrenewableage',
@@ -299,12 +299,12 @@ IPA.user.entity = function(spec) {
fields: [
{
name: 'userpassword',
- label: IPA.messages.password.new_password,
+ label: '@i18n:password.new_password',
type: 'password'
},
{
name: 'userpassword2',
- label: IPA.messages.password.verify_password,
+ label: '@i18n:password.verify_password',
type: 'password'
}
]
@@ -480,19 +480,19 @@ IPA.user_password_dialog = function(spec) {
fields: [
{
name: 'current_password',
- label: IPA.messages.password.current_password,
+ label: '@i18n:password.current_password',
type: 'password',
required: true
},
{
name: 'password1',
- label: IPA.messages.password.new_password,
+ label: '@i18n:password.new_password',
type: 'password',
required: true
},
{
name: 'password2',
- label: IPA.messages.password.verify_password,
+ label: '@i18n:password.verify_password',
type: 'password',
validators: [IPA.same_password_validator({
other_field: 'password1'
@@ -532,13 +532,13 @@ IPA.user_password_dialog = function(spec) {
that.create_button({
name: 'reset_password',
- label: IPA.messages.password.reset_password,
+ label: '@i18n:password.reset_password',
click: that.on_reset_click
});
that.create_button({
name: 'cancel',
- label: IPA.messages.buttons.cancel,
+ label: '@i18n:buttons.cancel',
click: function() {
that.close();
}
diff --git a/install/ui/src/freeipa/widget.js b/install/ui/src/freeipa/widget.js
index bc16acc92..c6fba474b 100644
--- a/install/ui/src/freeipa/widget.js
+++ b/install/ui/src/freeipa/widget.js
@@ -2020,7 +2020,7 @@ IPA.attribute_table_widget = function(spec) {
that.remove_button = IPA.action_button({
name: 'remove',
- label: IPA.messages.buttons.remove,
+ label: '@i18n:buttons.remove',
icon: 'remove-icon',
'class': 'action-button-disabled',
click: function() {
@@ -2033,7 +2033,7 @@ IPA.attribute_table_widget = function(spec) {
that.add_button = IPA.action_button({
name: 'add',
- label: IPA.messages.buttons.add,
+ label: '@i18n:buttons.add',
icon: 'add-icon',
click: function() {
if (!that.add_button.hasClass('action-button-disabled')) {
@@ -2223,7 +2223,7 @@ IPA.attribute_table_widget = function(spec) {
dialog.create_button({
name: 'add',
- label: IPA.messages.buttons.add,
+ label: '@i18n:buttons.add',
click: function() {
dialog.hide_message();
dialog.add(
@@ -2238,7 +2238,7 @@ IPA.attribute_table_widget = function(spec) {
dialog.create_button({
name: 'add_and_add_another',
- label: IPA.messages.buttons.add_and_add_another,
+ label: '@i18n:buttons.add_and_add_another',
click: function() {
dialog.hide_message();
dialog.add(
@@ -3746,7 +3746,7 @@ IPA.sshkey_widget = function(spec) {
dialog.create_button({
name: 'update',
- label: IPA.messages.buttons.set,
+ label: '@i18n:buttons.set',
click: function() {
var value = dialog.textarea.val();
that.set_user_value(value);
@@ -3756,7 +3756,7 @@ IPA.sshkey_widget = function(spec) {
dialog.create_button({
name: 'cancel',
- label: IPA.messages.buttons.cancel,
+ label: '@i18n:buttons.cancel',
click: function() {
dialog.close();
}