From 2a527234656a08342259ebc30af38b68a592ba8a Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" Date: Thu, 30 Jun 2011 14:33:33 -0400 Subject: Fixed hard-coded messages. Hard-coded messages in the UI have been replaced with I18n messages. Ticket #1396 --- install/ui/association.js | 17 +++++--- install/ui/automount.js | 20 +++++----- install/ui/certificate.js | 31 ++++++++------- install/ui/details.js | 4 +- install/ui/dns.js | 41 +++++++++++++------ install/ui/entitle.js | 80 +++++++++++++++++++------------------- install/ui/test/data/ipa_init.json | 56 ++++++++++++++++++++++---- install/ui/widget.js | 32 ++++++++------- 8 files changed, 177 insertions(+), 104 deletions(-) (limited to 'install/ui') diff --git a/install/ui/association.js b/install/ui/association.js index 6f74bf628..92ccb6058 100644 --- a/install/ui/association.js +++ b/install/ui/association.js @@ -844,7 +844,8 @@ IPA.association_facet = function (spec) { 'class': 'right-aligned-facet-controls' }).appendTo(that.controls); - span.append('Show Results '); + span.append(IPA.messages.association.show_results); + span.append(' '); that.direct_radio = $('', { type: 'radio', @@ -857,7 +858,9 @@ IPA.association_facet = function (spec) { } }).appendTo(span); - span.append(' Direct Enrollment '); + span.append(' '); + span.append(IPA.messages.association.direct_enrollment); + span.append(' '); that.indirect_radio = $('', { type: 'radio', @@ -870,7 +873,8 @@ IPA.association_facet = function (spec) { } }).appendTo(span); - span.append(' Indirect Enrollment'); + span.append(' '); + span.append(IPA.messages.association.indirect_enrollment); } }; @@ -1007,7 +1011,7 @@ IPA.association_facet = function (spec) { var pkeys = that.data[that.get_attribute_name()]; if (!pkeys || !pkeys.length) { that.table.empty(); - that.table.summary.text('No entries.'); + that.table.summary.text(IPA.messages.association.no_entries); return; } @@ -1018,7 +1022,10 @@ IPA.association_facet = function (spec) { var end = that.table.current_page * that.table.page_length; end = end > total ? total : end; - var summary = 'Showing '+start+' to '+end+' of '+total+' entries.'; + var summary = IPA.messages.association.paging; + summary = summary.replace('${start}', start); + summary = summary.replace('${end}', end); + summary = summary.replace('${total}', total); that.table.summary.text(summary); var list = pkeys.slice(start-1, end); diff --git a/install/ui/automount.js b/install/ui/automount.js index d4f113d51..56c1fbfaa 100644 --- a/install/ui/automount.js +++ b/install/ui/automount.js @@ -87,21 +87,23 @@ IPA.entity_factories.automountmap = function() { fields:[{factory:IPA.method_radio_widget, name: 'method', undo: false, - label:'Map Type', - options:[{value:'add',label:'Direct'}, - {value:'add_indirect',label:'Indirect'}] + label: IPA.messages.objects.automountmap.map_type, + options: [ + { value: 'add', label: IPA.messages.objects.automountmap.direct }, + { value: 'add_indirect', label: IPA.messages.objects.automountmap.indirect } + ] }, 'automountmapname','description', { - name:'key', - label:'Mount Point', - conditional:true, + name: 'key', + label: IPA.get_method_option('automountmap_add_indirect', 'key').label, + conditional: true, undo: false }, { - name:'parentmap', - label:'Parent Map', - conditional:true, + name: 'parentmap', + label: IPA.get_method_option('automountmap_add_indirect', 'parentmap').label, + conditional: true, undo: false }] }). diff --git a/install/ui/certificate.js b/install/ui/certificate.js index 64d93f9bd..bfecfc5b4 100755 --- a/install/ui/certificate.js +++ b/install/ui/certificate.js @@ -33,17 +33,17 @@ IPA.cert.CERTIFICATE_STATUS_VALID = 1; IPA.cert.CERTIFICATE_STATUS_REVOKED = 2; IPA.cert.CRL_REASON = [ - 'Unspecified', - 'Key Compromise', - 'CA Compromise', - 'Affiliation Changed', - 'Superseded', - 'Cessation of Operation', - 'Certificate Hold', + 'unspecified', + 'key_compromise', + 'ca_compromise', + 'affiliation_changed', + 'superseded', + 'cessation_of_operation', + 'certificate_hold', null, - 'Remove from CRL', - 'Privilege Withdrawn', - 'AA Compromise' + 'remove_from_crl', + 'privilege_withdrawn', + 'aa_compromise' ]; IPA.cert.parse_dn = function(dn) { @@ -155,10 +155,11 @@ IPA.cert.revoke_dialog = function(spec) { that.select = $('', { type: 'text', -- cgit