From 12f5f4cfdd38c2a29c8e6eeac17557f4e7731307 Mon Sep 17 00:00:00 2001 From: Petr Vobornik Date: Thu, 4 Apr 2013 13:39:20 +0200 Subject: Replace IPA.messages with @i18n definition in spec objects https://fedorahosted.org/freeipa/ticket/3235 --- install/ui/src/freeipa/association.js | 2 +- install/ui/src/freeipa/automember.js | 6 +++--- install/ui/src/freeipa/certificate.js | 14 +++++++------- install/ui/src/freeipa/details.js | 22 +++++++++++----------- install/ui/src/freeipa/dialog.js | 14 +++++++------- install/ui/src/freeipa/dns.js | 20 +++++++++++--------- install/ui/src/freeipa/entitle.js | 12 ++++++------ install/ui/src/freeipa/facet.js | 10 +++++----- install/ui/src/freeipa/field.js | 3 ++- install/ui/src/freeipa/group.js | 8 ++++---- install/ui/src/freeipa/hbac.js | 32 ++++++++++++++++---------------- install/ui/src/freeipa/hbactest.js | 4 ++-- install/ui/src/freeipa/host.js | 6 +++--- install/ui/src/freeipa/ipa.js | 4 ++-- install/ui/src/freeipa/search.js | 12 ++++++------ install/ui/src/freeipa/service.js | 4 ++-- install/ui/src/freeipa/sudo.js | 8 ++++---- install/ui/src/freeipa/user.js | 4 ++-- install/ui/src/freeipa/widget.js | 10 +++++----- 19 files changed, 99 insertions(+), 96 deletions(-) (limited to 'install/ui/src/freeipa') diff --git a/install/ui/src/freeipa/association.js b/install/ui/src/freeipa/association.js index a27b5c944..d137c9d23 100644 --- a/install/ui/src/freeipa/association.js +++ b/install/ui/src/freeipa/association.js @@ -150,7 +150,7 @@ IPA.attribute_adder_dialog = function(spec) { required: true } ]; - spec.title = spec.title || IPA.messages.dialogs.add_title.replace('${entity}', metadata.label); + spec.title = spec.title || text.get('@i18n:dialogs.add_title').replace('${entity}', metadata.label); spec.subject = metadata.label; var that = IPA.entity_adder_dialog(spec); diff --git a/install/ui/src/freeipa/automember.js b/install/ui/src/freeipa/automember.js index 8768ec5ce..0f8bbccfe 100644 --- a/install/ui/src/freeipa/automember.js +++ b/install/ui/src/freeipa/automember.js @@ -95,7 +95,7 @@ IPA.automember.entity = function(spec) { }). adder_dialog({ factory: IPA.automember.rule_adder_dialog, - title: IPA.messages.objects.automember.add_rule, + title: '@i18n:objects.automember.add_rule', fields: [ { type: 'entity_select', @@ -262,7 +262,7 @@ IPA.automember.rule_details_facet = function(spec) { add_command: 'add_condition', remove_command: 'remove_condition', adder_dialog: { - title: IPA.messages.objects.automember.add_condition, + title: '@i18n:objects.automember.add_condition', fields: [ { name: 'key', @@ -291,7 +291,7 @@ IPA.automember.rule_details_facet = function(spec) { add_command: 'add_condition', remove_command: 'remove_condition', adder_dialog: { - title: IPA.messages.objects.automember.add_condition, + title: '@i18n:objects.automember.add_condition', fields: [ { name: 'key', diff --git a/install/ui/src/freeipa/certificate.js b/install/ui/src/freeipa/certificate.js index 6b3128879..3feb2264c 100755 --- a/install/ui/src/freeipa/certificate.js +++ b/install/ui/src/freeipa/certificate.js @@ -210,7 +210,7 @@ IPA.cert.revoke_dialog = function(spec) { spec = spec || {}; spec.width = spec.width || 500; - spec.ok_label = spec.ok_label || IPA.messages.buttons.revoke; + spec.ok_label = spec.ok_label || '@i18n:buttons.revoke'; var that = IPA.confirm_dialog(spec); @@ -538,7 +538,7 @@ IPA.cert.view_action = function(spec) { spec = spec || {}; spec.name = spec.name || 'view_cert'; - spec.label = spec.label || IPA.messages.buttons.view; + spec.label = spec.label || '@i18n:buttons.view'; spec.enable_cond = spec.enable_cond || ['has_certificate']; var that = IPA.action(spec); @@ -571,7 +571,7 @@ IPA.cert.get_action = function(spec) { spec = spec || {}; spec.name = spec.name || 'get_cert'; - spec.label = spec.label || IPA.messages.buttons.get; + spec.label = spec.label || '@i18n:buttons.get'; spec.enable_cond = spec.enable_cond || ['has_certificate']; var that = IPA.action(spec); @@ -604,7 +604,7 @@ IPA.cert.request_action = function(spec) { spec = spec || {}; spec.name = spec.name || 'request_cert'; - spec.label = spec.label || IPA.messages.objects.cert.new_certificate; + spec.label = spec.label || '@i18n:objects.cert.new_certificate'; spec.enable_cond = spec.enable_cond || ['ra_enabled']; var that = IPA.action(spec); @@ -659,7 +659,7 @@ IPA.cert.revoke_action = function(spec) { spec = spec || {}; spec.name = spec.name || 'revoke_cert'; - spec.label = spec.label || IPA.messages.buttons.revoke; + spec.label = spec.label || '@i18n:buttons.revoke'; spec.enable_cond = spec.enable_cond || ['has_certificate']; spec.disable_cond = spec.disable_cond || ['certificate_revoked']; spec.hide_cond = spec.hide_cond || ['ra_disabled']; @@ -714,10 +714,10 @@ IPA.cert.restore_action = function(spec) { spec = spec || {}; spec.name = spec.name || 'restore_cert'; - spec.label = spec.label || IPA.messages.buttons.restore; + spec.label = spec.label || '@i18n:buttons.restore'; spec.enable_cond = spec.enable_cond || ['has_certificate', 'certificate_hold']; spec.hide_cond = spec.hide_cond || ['ra_disabled']; - spec.confirm_msg = spec.confirm_msg || IPA.messages.objects.cert.restore_confirmation; + 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 diff --git a/install/ui/src/freeipa/details.js b/install/ui/src/freeipa/details.js index dbc53ff5e..abe903750 100644 --- a/install/ui/src/freeipa/details.js +++ b/install/ui/src/freeipa/details.js @@ -547,8 +547,8 @@ IPA.details_facet = function(spec, no_init) { that.show_validation_error = function() { var dialog = IPA.message_dialog({ name: 'validation_error', - title: IPA.messages.dialogs.validation_title, - message: IPA.messages.dialogs.validation_message + title: '@i18n:dialogs.validation_title', + message: '@i18n:dialogs.validation_message' }); dialog.open(); }; @@ -845,7 +845,7 @@ IPA.refresh_action = function(spec) { spec = spec || {}; spec.name = spec.name || 'refresh'; - spec.label = spec.label || IPA.messages.buttons.refresh; + spec.label = spec.label || '@i18n:buttons.refresh'; var that = IPA.action(spec); @@ -860,7 +860,7 @@ IPA.reset_action = function(spec) { spec = spec || {}; spec.name = spec.name || 'reset'; - spec.label = spec.label || IPA.messages.buttons.reset; + spec.label = spec.label || '@i18n:buttons.reset'; spec.enable_cond = spec.enable_cond || ['dirty']; var that = IPA.action(spec); @@ -876,7 +876,7 @@ IPA.update_action = function(spec) { spec = spec || {}; spec.name = spec.name || 'update'; - spec.label = spec.label || IPA.messages.buttons.update; + spec.label = spec.label || '@i18n:buttons.update'; spec.needs_confirm = spec.needs_confirm !== undefined ? spec.needs_confirm : false; spec.enable_cond = spec.enable_cond || ['dirty']; @@ -1128,8 +1128,8 @@ IPA.enable_action = function(spec) { spec = spec || {}; spec.name = spec.name || 'enable'; spec.method = spec.method || 'enable'; - spec.confirm_msg = spec.confirm_msg || IPA.messages.actions.enable_confirm; - spec.label = spec.label || IPA.messages.buttons.enable; + spec.confirm_msg = spec.confirm_msg || '@i18n:actions.enable_confirm'; + spec.label = spec.label || '@i18n:buttons.enable'; spec.disable_cond = spec.disable_cond || ['enabled']; var that = IPA.object_action(spec); @@ -1142,8 +1142,8 @@ IPA.disable_action = function(spec) { spec = spec || {}; spec.name = spec.name || 'disable'; spec.method = spec.method || 'disable'; - spec.confirm_msg = spec.confirm_msg || IPA.messages.actions.disable_confirm; - spec.label = spec.label || IPA.messages.buttons.disable; + spec.confirm_msg = spec.confirm_msg || '@i18n:actions.disable_confirm'; + spec.label = spec.label || '@i18n:buttons.disable'; spec.enable_cond = spec.enable_cond || ['enabled']; var that = IPA.object_action(spec); @@ -1156,8 +1156,8 @@ IPA.delete_action = function(spec) { spec = spec || {}; spec.name = spec.name || 'delete'; spec.method = spec.method || 'del'; - spec.confirm_msg = spec.confirm_msg || IPA.messages.actions.delete_confirm; - spec.label = spec.label || IPA.messages.buttons.remove; + spec.confirm_msg = spec.confirm_msg || '@i18n:actions.delete_confirm'; + spec.label = spec.label || '@i18n:buttons.remove'; var that = IPA.object_action(spec); diff --git a/install/ui/src/freeipa/dialog.js b/install/ui/src/freeipa/dialog.js index 103f3b92f..bf9e12a7a 100644 --- a/install/ui/src/freeipa/dialog.js +++ b/install/ui/src/freeipa/dialog.js @@ -641,10 +641,10 @@ IPA.deleter_dialog = function (spec) { spec = spec || {}; - spec.title = spec.title || IPA.messages.buttons.remove; + spec.title = spec.title || '@i18n:buttons.remove'; spec.name = spec.name || 'deleter_dialog'; - spec.message = spec.message || IPA.messages.search.delete_confirm; - spec.ok_label = spec.ok_label || IPA.messages.buttons.remove; + spec.message = spec.message || '@i18n:search.delete_confirm'; + spec.ok_label = spec.ok_label || '@i18n:buttons.remove'; var that = IPA.confirm_dialog(spec); that.values = spec.values || []; @@ -726,16 +726,16 @@ IPA.confirm_dialog = function(spec) { spec = spec || {}; spec.name = spec.name || 'confirm_dialog'; - spec.title = spec.title || IPA.messages.dialogs.confirmation; + spec.title = spec.title || '@i18n:dialogs.confirmation'; var that = IPA.dialog(spec); IPA.confirm_mixin().apply(that); - that.message = spec.message || ''; + that.message = text.get(spec.message); that.on_ok = spec.on_ok; that.on_cancel = spec.on_cancel; - that.ok_label = spec.ok_label || IPA.messages.buttons.ok; - that.cancel_label = spec.cancel_label || IPA.messages.buttons.cancel; + that.ok_label = text.get(spec.ok_label || '@i18n:buttons.ok'); + that.cancel_label = text.get(spec.cancel_label || '@i18n:buttons.cancel'); that.confirmed = false; that.confirm_on_enter = spec.confirm_on_enter !== undefined ? spec.confirm_on_enter : true; diff --git a/install/ui/src/freeipa/dns.js b/install/ui/src/freeipa/dns.js index 81a5c34a2..c9ffd6238 100644 --- a/install/ui/src/freeipa/dns.js +++ b/install/ui/src/freeipa/dns.js @@ -604,7 +604,7 @@ IPA.dns.add_permission_action = function(spec) { spec = spec || {}; spec.name = spec.name || 'add_permission'; - spec.label = spec.label || IPA.messages.objects.dnszone.add_permission; + spec.label = spec.label || '@i18n:objects.dnszone.add_permission'; spec.enable_cond = spec.enable_cond || ['permission-none', 'managedby_w']; var that = IPA.action(spec); @@ -634,7 +634,7 @@ IPA.dns.remove_permission_action = function(spec) { spec = spec || {}; spec.name = spec.name || 'remove_permission'; - spec.label = spec.label || IPA.messages.objects.dnszone.remove_permission; + spec.label = spec.label || '@i18n:objects.dnszone.remove_permission'; spec.enable_cond = spec.enable_cond || ['permission-set', 'managedby_w']; var that = IPA.action(spec); @@ -1267,7 +1267,7 @@ IPA.dns.record_details_facet = function(spec) { IPA.dnsrecord_redirection_dialog = function(spec) { spec = spec || {}; - spec.title = spec.title || IPA.messages.dialogs.redirection; + spec.title = spec.title || '@i18n:dialogs.redirection'; var that = IPA.message_dialog(spec); @@ -2156,7 +2156,7 @@ IPA.dns.record_modify_column = function(spec) { var that = IPA.column(spec); - that.text = text.get(spec.text || IPA.messages.buttons.edit); + that.text = text.get(spec.text || '@i18n:buttons.edit'); that.setup = function(container, record, suppress_link) { @@ -2210,7 +2210,7 @@ IPA.dns.ptr_redirection_dialog = function(spec) { spec = spec || {}; - spec.title = IPA.messages.objects.dnsrecord.ptr_redir_title; + spec.title = spec.title || '@i18n:objects.dnsrecord.ptr_redir_title'; var that = IPA.dialog(spec); that.dns_record = spec.dns_record; @@ -2395,10 +2395,11 @@ IPA.dns.ptr_redirection_dialog = function(spec) { IPA.ip_address_validator = function(spec) { spec = spec || {}; + spec.message = spec.message || '@i18n:widget.validation.ip_address'; + var that = IPA.validator(spec); that.address_type = spec.address_type; - that.message = spec.message || IPA.messages.widget.validation.ip_address; that.validate = function(value) { @@ -2432,7 +2433,7 @@ IPA.ip_v4_address_validator = function(spec) { spec = spec || {}; spec.address_type = 'IPv4'; - spec.message = IPA.messages.widget.validation.ip_v4_address; + spec.message = spec.message || '@i18n:widget.validation.ip_v4_address'; return IPA.ip_address_validator(spec); }; @@ -2440,7 +2441,7 @@ IPA.ip_v6_address_validator = function(spec) { spec = spec || {}; spec.address_type = 'IPv6'; - spec.message = IPA.messages.widget.validation.ip_v6_address; + spec.message = spec.message || '@i18n:widget.validation.ip_v6_address'; return IPA.ip_address_validator(spec); }; @@ -2478,12 +2479,13 @@ IPA.network_validator = function(spec) { spec = spec || {}; + spec.message = spec.message || '@i18n:widget.validation.net_address'; + var that = IPA.validator(spec); that.allow_negation = spec.allow_negation; that.allow_host_address = spec.allow_host_address; that.specials = spec.specials || []; - that.message = spec.message || IPA.messages.widget.validation.net_address; that.validate = function(value) { diff --git a/install/ui/src/freeipa/entitle.js b/install/ui/src/freeipa/entitle.js index 584d28f01..c31aaa9be 100644 --- a/install/ui/src/freeipa/entitle.js +++ b/install/ui/src/freeipa/entitle.js @@ -116,7 +116,7 @@ IPA.entitle.entity = function(spec) { dialog({ factory: IPA.entitle.register_online_dialog, name: 'online_registration', - title: IPA.messages.objects.entitle.registration, + title: '@i18n:objects.entitle.registration', fields: [ { name: 'username', @@ -138,8 +138,8 @@ IPA.entitle.entity = function(spec) { dialog({ factory: IPA.entitle.register_offline_dialog, name: 'offline_registration', - title: IPA.messages.objects.entitle.import_certificate, - message: IPA.messages.objects.entitle.import_message, + title: '@i18n:objects.entitle.import_certificate', + message: '@i18n:objects.entitle.import_message', fields: [ { name: 'certificate', @@ -150,7 +150,7 @@ IPA.entitle.entity = function(spec) { dialog({ factory: IPA.entitle.consume_dialog, name: 'consume', - title: IPA.messages.objects.entitle.consume_entitlement, + title: '@i18n:objects.entitle.consume_entitlement', fields: [ { name: 'quantity', @@ -162,8 +162,8 @@ IPA.entitle.entity = function(spec) { dialog({ factory: IPA.entitle.import_dialog, name: 'import', - title: IPA.messages.objects.entitle.import_certificate, - message: IPA.messages.objects.entitle.import_message, + title: '@i18n:objects.entitle.import_certificate', + message: '@i18n:objects.entitle.import_message', fields: [ { name: 'certificate', diff --git a/install/ui/src/freeipa/facet.js b/install/ui/src/freeipa/facet.js index 3b908b20e..0145020bb 100644 --- a/install/ui/src/freeipa/facet.js +++ b/install/ui/src/freeipa/facet.js @@ -1515,7 +1515,7 @@ IPA.facet_builder = function(entity) { spec.title = spec.title || entity.metadata.label; spec.label = spec.label || entity.metadata.label; - spec.tab_label = spec.tab_label || IPA.messages.facets.search; + spec.tab_label = spec.tab_label || '@i18n:facets.search'; spec.factory = spec.factory || IPA.search_facet; add_redirect_info(); @@ -1526,7 +1526,7 @@ IPA.facet_builder = function(entity) { spec.title = spec.title || entity.metadata.label_singular; spec.label = spec.label || entity.metadata.label; - spec.tab_label = spec.tab_label || IPA.messages.facets.search; + spec.tab_label = spec.tab_label || '@i18n:facets.search'; spec.factory = spec.factory || IPA.nested_search_facet; return spec; @@ -1535,7 +1535,7 @@ IPA.facet_builder = function(entity) { that.prepare_details_spec = function(spec) { spec.title = spec.title || entity.metadata.label_singular; spec.label = spec.label || entity.metadata.label_singular; - spec.tab_label = spec.tab_label || IPA.messages.facets.details; + spec.tab_label = spec.tab_label || '@i18n:facets.details'; spec.factory = spec.factory || IPA.details_facet; return spec; @@ -1568,8 +1568,8 @@ IPA.facet_builder = function(entity) { spec.other_entity = spec.other_entity || spec.name.substring(index+1); - spec.add_title = IPA.messages.association.add[spec.attribute_member]; - spec.remove_title = IPA.messages.association.remove[spec.attribute_member]; + spec.add_title = '@i18n:association.add.'+spec.attribute_member; + spec.remove_title = '@i18n:association.remove.'+spec.attribute_member; spec.facet_group = spec.facet_group || spec.attribute_member; diff --git a/install/ui/src/freeipa/field.js b/install/ui/src/freeipa/field.js index ececd5421..d8cd2eab2 100644 --- a/install/ui/src/freeipa/field.js +++ b/install/ui/src/freeipa/field.js @@ -494,10 +494,11 @@ IPA.metadata_validator = function(spec) { IPA.unsupported_validator = function(spec) { + spec.message = spec.message ||'@i18n:widgets.validation.unsupported'; + var that = IPA.validator(spec); that.unsupported = spec.unsupported || []; - that.message = spec.message || IPA.messages.widget.validation.unsupported; that.validate = function(value, context) { diff --git a/install/ui/src/freeipa/group.js b/install/ui/src/freeipa/group.js index a84f49f8e..2dadfa5ff 100644 --- a/install/ui/src/freeipa/group.js +++ b/install/ui/src/freeipa/group.js @@ -56,8 +56,8 @@ IPA.group.entity = function(spec) { label: IPA.messages.objects.group.type, default_label: IPA.messages.objects.group.normal, value_map: { - ipaexternalgroup: IPA.messages.objects.group.external, - posixgroup: IPA.messages.objects.group.posix + ipaexternalgroup: '@i18n:objects.group.external', + posixgroup: '@i18n:objects.group.posix' } }, 'gidnumber' @@ -227,7 +227,7 @@ IPA.group.make_posix_action = function(spec) { spec = spec || {}; spec.name = spec.name || 'make_posix'; spec.method = spec.method || 'mod'; - spec.label = spec.label || IPA.messages.objects.group.make_posix; + spec.label = spec.label || '@i18n:objects.group.make_posix'; spec.disable_cond = spec.disable_cond || ['oc_posixgroup', 'oc_ipaexternalgroup']; spec.options = spec.options || { posix: true @@ -243,7 +243,7 @@ IPA.group.make_external_action = function(spec) { spec = spec || {}; spec.name = spec.name || 'make_external'; spec.method = spec.method || 'mod'; - spec.label = spec.label || IPA.messages.objects.group.make_external; + spec.label = spec.label || '@i18n:objects.group.make_external'; spec.disable_cond = spec.disable_cond || ['oc_posixgroup','oc_ipaexternalgroup']; spec.options = spec.options || { external: true diff --git a/install/ui/src/freeipa/hbac.js b/install/ui/src/freeipa/hbac.js index b508fe7c4..23791b349 100644 --- a/install/ui/src/freeipa/hbac.js +++ b/install/ui/src/freeipa/hbac.js @@ -307,8 +307,8 @@ IPA.hbacrule_details_facet = function(spec) { name: 'memberuser_user', add_method: 'add_user', remove_method: 'remove_user', - add_title: IPA.messages.association.add.member, - remove_title: IPA.messages.association.remove.member + add_title: '@i18n:association.add.member', + remove_title: '@i18n:association.remove.member' }, { type: 'rule_association_table', @@ -316,8 +316,8 @@ IPA.hbacrule_details_facet = function(spec) { name: 'memberuser_group', add_method: 'add_user', remove_method: 'remove_user', - add_title: IPA.messages.association.add.member, - remove_title: IPA.messages.association.remove.member + add_title: '@i18n:association.add.member', + remove_title: '@i18n:association.remove.member' } ] } @@ -362,11 +362,11 @@ IPA.hbacrule_details_facet = function(spec) { options: [ { 'value': 'all', - 'label': IPA.messages.objects.hbacrule.any_host + 'label': '@i18n:objects.hbacrule.any_host' }, { 'value': '', - 'label': IPA.messages.objects.hbacrule.specified_hosts + 'label': '@i18n:objects.hbacrule.specified_hosts' } ], tables: [ @@ -380,8 +380,8 @@ IPA.hbacrule_details_facet = function(spec) { name: 'memberhost_host', add_method: 'add_host', remove_method: 'remove_host', - add_title: IPA.messages.association.add.member, - remove_title: IPA.messages.association.remove.member + add_title: '@i18n:association.add.member', + remove_title: '@i18n:association.remove.member' }, { type: 'rule_association_table', @@ -389,8 +389,8 @@ IPA.hbacrule_details_facet = function(spec) { name: 'memberhost_hostgroup', add_method: 'add_host', remove_method: 'remove_host', - add_title: IPA.messages.association.add.member, - remove_title: IPA.messages.association.remove.member + add_title: '@i18n:association.add.member', + remove_title: '@i18n:association.remove.member' } ] } @@ -433,8 +433,8 @@ IPA.hbacrule_details_facet = function(spec) { name: 'rule', radio_name: 'servicecategory', options: [ - { 'value': 'all', 'label': IPA.messages.objects.hbacrule.any_service }, - { 'value': '', 'label': IPA.messages.objects.hbacrule.specified_services } + { 'value': 'all', 'label': '@i18n:objects.hbacrule.any_service' }, + { 'value': '', 'label': '@i18n:objects.hbacrule.specified_services' } ], tables: [ { 'name': 'memberservice_hbacsvc' }, @@ -447,8 +447,8 @@ IPA.hbacrule_details_facet = function(spec) { name: 'memberservice_hbacsvc', add_method: 'add_service', remove_method: 'remove_service', - add_title: IPA.messages.association.add.member, - remove_title: IPA.messages.association.remove.member + add_title: '@i18n:association.add.member', + remove_title: '@i18n:association.remove.member' }, { type: 'rule_association_table', @@ -456,8 +456,8 @@ IPA.hbacrule_details_facet = function(spec) { name: 'memberservice_hbacsvcgroup', add_method: 'add_service', remove_method: 'remove_service', - add_title: IPA.messages.association.add.member, - remove_title: IPA.messages.association.remove.member + add_title: '@i18n:association.add.member', + remove_title: '@i18n:association.remove.member' } ] } diff --git a/install/ui/src/freeipa/hbactest.js b/install/ui/src/freeipa/hbactest.js index a39a77593..ac9183130 100644 --- a/install/ui/src/freeipa/hbactest.js +++ b/install/ui/src/freeipa/hbactest.js @@ -750,8 +750,8 @@ IPA.hbac.test_run_facet = function(spec) { IPA.hbac.validation_dialog = function(spec) { spec = spec || {}; - spec.title = spec.title || IPA.messages.dialogs.validation_title; - spec.message = spec.message || IPA.messages.dialogs.validation_message; + spec.title = spec.title || '@i18n:dialogs.validation_title'; + spec.message = spec.message || '@i18n:dialogs.validation_message'; var that = IPA.message_dialog(spec); diff --git a/install/ui/src/freeipa/host.js b/install/ui/src/freeipa/host.js index a31c32efe..f5f6a2be3 100644 --- a/install/ui/src/freeipa/host.js +++ b/install/ui/src/freeipa/host.js @@ -621,7 +621,7 @@ IPA.host_keytab_widget = function(spec) { IPA.host_unprovision_dialog = function(spec) { - spec.title = spec.title || IPA.messages.objects.host.unprovision_title; + spec.title = spec.title || '@i18n:objects.host.unprovision_title'; spec = spec || {}; @@ -687,7 +687,7 @@ IPA.host.unprovision_action = function(spec) { spec = spec || {}; spec.name = spec.name || 'unprovision'; - spec.label = spec.label || IPA.messages.objects.host.unprovision; + spec.label = spec.label || '@i18n:objects.host.unprovision'; spec.enable_cond = spec.enable_cond || ['has_keytab', 'krbprincipalkey_w']; var that = IPA.action(spec); @@ -899,7 +899,7 @@ IPA.host.set_otp_action = function(spec) { spec = spec || {}; spec.name = spec.name || 'set_otp'; - spec.label = spec.label || IPA.messages.objects.host.password_set_title; + spec.label = spec.label || '@i18n:objects.host.password_set_title'; spec.enable_cond = spec.enable_cond || ['userpassword_w']; var that = IPA.action(spec); diff --git a/install/ui/src/freeipa/ipa.js b/install/ui/src/freeipa/ipa.js index 891e928e6..a1fefa50d 100644 --- a/install/ui/src/freeipa/ipa.js +++ b/install/ui/src/freeipa/ipa.js @@ -353,7 +353,7 @@ IPA.logout = function() { var dialog = IPA.message_dialog({ name: 'logout_error', message: message, - title: IPA.messages.login.logout_error + title: '@i18n:login.logout_error' }); dialog.open(); } @@ -1318,7 +1318,7 @@ IPA.create_network_spinner = function(){ IPA.dirty_dialog = function(spec) { spec = spec || {}; - spec.title = spec.title || IPA.messages.dialogs.dirty_title; + spec.title = spec.title || '@i18n:dialogs.dirty_title'; spec.width = spec.width || '25em'; var that = IPA.dialog(spec); diff --git a/install/ui/src/freeipa/search.js b/install/ui/src/freeipa/search.js index 5fbb8409c..0ea5c2b1e 100644 --- a/install/ui/src/freeipa/search.js +++ b/install/ui/src/freeipa/search.js @@ -385,7 +385,7 @@ IPA.batch_remove_action = function(spec) { spec = spec || {}; spec.name = spec.name || 'remove'; - spec.label = spec.label || IPA.messages.buttons.remove; + spec.label = spec.label || '@i18n:buttons.remove'; spec.enable_cond = spec.enable_cond || ['item-selected']; spec.hide_cond = spec.hide_cond || ['self-service']; @@ -402,7 +402,7 @@ IPA.add_action = function(spec) { spec = spec || {}; spec.name = spec.name || 'add'; - spec.label = spec.label || IPA.messages.buttons.add; + spec.label = spec.label || '@i18n:buttons.add'; spec.hide_cond = spec.hide_cond || ['self-service']; var that = IPA.action(spec); @@ -482,8 +482,8 @@ IPA.batch_disable_action = function(spec) { spec.method = spec.method || 'disable'; spec.needs_confirm = spec.needs_confirm === undefined ? true : spec.needs_confirm; spec.enable_cond = spec.enable_cond || ['item-selected']; - spec.success_msg = spec.success_msg || IPA.messages.search.disabled; - spec.confirm_msg = spec.confirm_msg || IPA.messages.search.disable_confirm; + spec.success_msg = spec.success_msg || '@i18n:search.disabled'; + spec.confirm_msg = spec.confirm_msg || '@i18n:search.disable_confirm'; return IPA.batch_items_action(spec); }; @@ -496,8 +496,8 @@ IPA.batch_enable_action = function(spec) { spec.method = spec.method || 'enable'; spec.needs_confirm = spec.needs_confirm === undefined ? true : spec.needs_confirm; spec.enable_cond = spec.enable_cond || ['item-selected']; - spec.success_msg = spec.success_msg || IPA.messages.search.enabled; - spec.confirm_msg = spec.confirm_msg || IPA.messages.search.enable_confirm; + spec.success_msg = spec.success_msg || '@i18n:search.enabled'; + spec.confirm_msg = spec.confirm_msg || '@i18n:search.enable_confirm'; return IPA.batch_items_action(spec); }; diff --git a/install/ui/src/freeipa/service.js b/install/ui/src/freeipa/service.js index 1b614036f..a1a7386f3 100644 --- a/install/ui/src/freeipa/service.js +++ b/install/ui/src/freeipa/service.js @@ -381,7 +381,7 @@ IPA.widget_factories['service_provisioning_status'] = IPA.service_provisioning_s IPA.service.unprovision_dialog = function(spec) { spec = spec || {}; - spec.title = spec.title || IPA.messages.objects.service.unprovision_title; + spec.title = spec.title || '@i18n:objects.service.unprovision_title'; var that = IPA.dialog(spec); that.facet = spec.facet; @@ -441,7 +441,7 @@ IPA.service.unprovision_action = function(spec) { spec = spec || {}; spec.name = spec.name || 'unprovision'; - spec.label = spec.label || IPA.messages.objects.service.delete_key_unprovision; + spec.label = spec.label || '@i18n:objects.service.delete_key_unprovision'; spec.enable_cond = spec.enable_cond || ['has_keytab', 'krbprincipalkey_w']; var that = IPA.action(spec); diff --git a/install/ui/src/freeipa/sudo.js b/install/ui/src/freeipa/sudo.js index 5a88e820d..fcae77747 100644 --- a/install/ui/src/freeipa/sudo.js +++ b/install/ui/src/freeipa/sudo.js @@ -469,8 +469,8 @@ IPA.sudorule_details_facet = function(spec) { { factory: IPA.header_widget, name: 'allow_header', - text: IPA.messages.objects.sudorule.allow, - description: IPA.messages.objects.sudorule.allow + text: '@i18n:objects.sudorule.allow', + description: '@i18n:objects.sudorule.allow' }, { factory: IPA.rule_details_widget, @@ -514,8 +514,8 @@ IPA.sudorule_details_facet = function(spec) { { factory: IPA.header_widget, name: 'deny_header', - text: IPA.messages.objects.sudorule.deny, - description: IPA.messages.objects.sudorule.deny + text: '@i18n:objects.sudorule.deny', + description: '@i18n:objects.sudorule.deny' }, { type: 'rule_association_table', diff --git a/install/ui/src/freeipa/user.js b/install/ui/src/freeipa/user.js index 0ec160819..b0b1efd7f 100644 --- a/install/ui/src/freeipa/user.js +++ b/install/ui/src/freeipa/user.js @@ -471,7 +471,7 @@ IPA.user_password_dialog = function(spec) { spec = spec || {}; spec.width = spec.width || 400; - spec.title = spec.title || IPA.messages.password.reset_password; + spec.title = spec.title || '@i18n:password.reset_password'; spec.sections = spec.sections || []; spec.sections.push( @@ -622,7 +622,7 @@ IPA.user.reset_password_action = function(spec) { spec = spec || {}; spec.name = spec.name || 'reset_password'; - spec.label = spec.label || IPA.messages.password.reset_password; + spec.label = spec.label || '@i18n:password.reset_password'; spec.enable_cond = spec.enable_cond || ['userpassword_w']; var that = IPA.action(spec); diff --git a/install/ui/src/freeipa/widget.js b/install/ui/src/freeipa/widget.js index 1ac801d90..bc16acc92 100644 --- a/install/ui/src/freeipa/widget.js +++ b/install/ui/src/freeipa/widget.js @@ -1270,8 +1270,8 @@ IPA.boolean_formatter = function(spec) { var that = IPA.formatter(spec); - that.true_value = text.get(spec.true_value || IPA.messages['true']); - that.false_value = text.get(spec.false_value || IPA.messages['false']); + that.true_value = text.get(spec.true_value || '@i18n:true'); + that.false_value = text.get(spec.false_value || '@i18n:false'); that.show_false = spec.show_false; that.invert_value = spec.invert_value; @@ -1330,8 +1330,8 @@ IPA.boolean_status_formatter = function(spec) { spec = spec || {}; - spec.true_value = spec.true_value || IPA.messages.status.enabled; - spec.false_value = spec.false_value || IPA.messages.status.disabled; + spec.true_value = spec.true_value || '@i18n:status.enabled'; + spec.false_value = spec.false_value || '@i18n:status.disabled'; var that = IPA.boolean_formatter(spec); @@ -3784,7 +3784,7 @@ IPA.sshkey_widget = function(spec) { IPA.action_panel = function(spec) { spec = spec || {}; - spec.label = spec.label || IPA.messages.actions.title; + spec.label = spec.label || '@i18n:actions.title'; var that = IPA.widget(spec); -- cgit