From f9bda79686c5a4f65bc1c98bc5a1936faf1bc8e0 Mon Sep 17 00:00:00 2001 From: Thais Siqueira Date: Wed, 18 Jan 2017 19:01:05 -0200 Subject: [#828] Replaced plain text to translation properties with @tayanefernandes --- web-ui/app/js/mail_view/ui/mail_view.js | 16 ++++++++-------- web-ui/app/locales/en_US/translation.json | 5 +++++ web-ui/app/templates/mails/full_view.hbs | 4 ++-- web-ui/test/spec/mail_view/ui/mail_view.spec.js | 20 ++++++++++---------- 4 files changed, 25 insertions(+), 20 deletions(-) diff --git a/web-ui/app/js/mail_view/ui/mail_view.js b/web-ui/app/js/mail_view/ui/mail_view.js index 4315226c..86605b37 100644 --- a/web-ui/app/js/mail_view/ui/mail_view.js +++ b/web-ui/app/js/mail_view/ui/mail_view.js @@ -103,7 +103,7 @@ define( if(_.isEmpty(mail.security_casing.locks)) { statusClass.push('--not-encrypted'); statusLabel = 'not-encrypted'; - tooltip = 'This message is not encrypted.'; + tooltip = 'not-encrypted-label-tooltip'; } else { statusClass.push('--encrypted'); @@ -113,11 +113,11 @@ define( if(hasAnyEncryptionInfo) { statusLabel = 'encrypted'; - tooltip = 'This message was encrypted.'; + tooltip = 'encrypted-label-tooltip'; } else { statusClass.push('--with-error'); statusLabel = 'encryption-error'; - tooltip = 'This message had an encryption error.'; + tooltip = 'encryption-error-label-tooltip'; } } @@ -140,28 +140,28 @@ define( if(_.isEmpty(mail.security_casing.imprints) || hasNoSignatureInformation) { statusClass.push('--not-signed'); statusLabel.push('not-signed'); - tooltip = 'The sender could not be verified.'; + tooltip = 'not-signed-label-tooltip'; } else { statusClass.push('--signed'); statusLabel.push('signed'); - tooltip = 'You are communicating with the real sender.'; + tooltip = 'signed-label-tooltip'; if(_.any(mail.security_casing.imprints, function(imprint) { return imprint.state === 'from_revoked'; })) { statusClass.push('--revoked'); statusLabel.push('signature-revoked'); - tooltip = 'The sender could not be verified.'; + tooltip = 'not-signed-label-tooltip'; } if(_.any(mail.security_casing.imprints, function(imprint) { return imprint.state === 'from_expired'; })) { statusClass.push('--expired'); statusLabel.push('signature-expired'); - tooltip = 'The sender could not be verified.'; + tooltip = 'not-signed-label-tooltip'; } if(this.isNotTrusted(mail)) { statusClass.push('--not-trusted'); statusLabel.push('signature-not-trusted'); - tooltip = 'The sender could not be verified.'; + tooltip = 'not-signed-label-tooltip'; } } diff --git a/web-ui/app/locales/en_US/translation.json b/web-ui/app/locales/en_US/translation.json index 873b4a56..6e2cef80 100644 --- a/web-ui/app/locales/en_US/translation.json +++ b/web-ui/app/locales/en_US/translation.json @@ -38,6 +38,11 @@ "not-encrypted": "Not encrypted", "signed": "Verified sender", "not-signed": "Not signed", + "encrypted-label-tooltip": "This message was encrypted.", + "encryption-error-label-tooltip": "This message had an encryption error.", + "not-encrypted-label-tooltip": "This message is not encrypted.", + "not-signed-label-tooltip": "The sender could not be verified.", + "signed-label-tooltip": "You are communicating with the real sender.", "sending-mail": "Sending...", "trash-button": "Delete it", "search-placeholder" : "Search...", diff --git a/web-ui/app/templates/mails/full_view.hbs b/web-ui/app/templates/mails/full_view.hbs index 44ed44ed..0068b7f7 100644 --- a/web-ui/app/templates/mails/full_view.hbs +++ b/web-ui/app/templates/mails/full_view.hbs @@ -8,12 +8,12 @@
{{#if signatureStatus}} - + {{t signatureStatus.label }} {{/if}} {{#if encryptionStatus}} - + {{t encryptionStatus.label }} {{/if}} diff --git a/web-ui/test/spec/mail_view/ui/mail_view.spec.js b/web-ui/test/spec/mail_view/ui/mail_view.spec.js index 75a3895e..a99eba59 100644 --- a/web-ui/test/spec/mail_view/ui/mail_view.spec.js +++ b/web-ui/test/spec/mail_view/ui/mail_view.spec.js @@ -112,7 +112,7 @@ describeComponent('mail_view/ui/mail_view', function () { email.security_casing = {locks: [{state: 'valid'}, {state: 'failure'}]}; var checkEncrypted = this.component.checkEncrypted(email); expect(checkEncrypted.cssClass).toEqual('security-status__label--encrypted'); - expect(checkEncrypted.tooltipText).toEqual('This message was encrypted.'); + expect(checkEncrypted.tooltipText).toEqual('encrypted-label-tooltip'); }); it('assumes that the mail is encrypted and failure if all the locks are failed', function() { @@ -120,7 +120,7 @@ describeComponent('mail_view/ui/mail_view', function () { email.security_casing = {locks: [{state: 'failure'}, {state: 'failure'}]}; var checkEncrypted = this.component.checkEncrypted(email); expect(checkEncrypted.cssClass).toEqual('security-status__label--encrypted--with-error'); - expect(checkEncrypted.tooltipText).toEqual('This message had an encryption error.'); + expect(checkEncrypted.tooltipText).toEqual('encryption-error-label-tooltip'); }); it('assumes that the mail is not encrypted if it doesn\'t have any locks', function() { @@ -128,7 +128,7 @@ describeComponent('mail_view/ui/mail_view', function () { email.security_casing = {locks: []}; var checkEncrypted = this.component.checkEncrypted(email); expect(checkEncrypted.cssClass).toEqual('security-status__label--not-encrypted'); - expect(checkEncrypted.tooltipText).toEqual('This message is not encrypted.'); + expect(checkEncrypted.tooltipText).toEqual('not-encrypted-label-tooltip'); }); it('assumes that the mail is signed only if all imprints are valid', function() { @@ -136,7 +136,7 @@ describeComponent('mail_view/ui/mail_view', function () { email.security_casing = {imprints: [{state: 'valid', seal: {trust: 'marginal', validity: 'marginal'}}, {state: 'valid', seal: {trust: 'marginal', validity: 'marginal'}}]}; var checkSigned = this.component.checkSigned(email); expect(checkSigned.cssClass).toEqual('security-status__label--signed'); - expect(checkSigned.tooltipText).toEqual('You are communicating with the real sender.'); + expect(checkSigned.tooltipText).toEqual('signed-label-tooltip'); }); it('assumes that the mail is signed with failures if there is a revoke or expire', function() { @@ -144,7 +144,7 @@ describeComponent('mail_view/ui/mail_view', function () { email.security_casing = {imprints: [{state: 'valid', seal: {trust: 'marginal', validity: 'marginal'}}, {state: 'from_revoked', seal: {trust: 'marginal', validity: 'marginal'}}]}; var checkSigned = this.component.checkSigned(email); expect(checkSigned.cssClass).toEqual('security-status__label--signed--revoked'); - expect(checkSigned.tooltipText).toEqual('The sender could not be verified.'); + expect(checkSigned.tooltipText).toEqual('not-signed-label-tooltip'); }); it('assumes that mail is not trusted if its signature contains no_trust from the user', function() { @@ -152,7 +152,7 @@ describeComponent('mail_view/ui/mail_view', function () { email.security_casing = {imprints: [{seal: {trust: 'no_trust', validity: 'ultimate'}}]}; var checkSigned = this.component.checkSigned(email); expect(checkSigned.cssClass).toEqual('security-status__label--signed--not-trusted'); - expect(checkSigned.tooltipText).toEqual('The sender could not be verified.'); + expect(checkSigned.tooltipText).toEqual('not-signed-label-tooltip'); }); it('uses validity when trust is not present', function() { @@ -160,7 +160,7 @@ describeComponent('mail_view/ui/mail_view', function () { email.security_casing = {imprints: [{seal: { validity: 'no_trust'}}]}; var checkSigned = this.component.checkSigned(email); expect(checkSigned.cssClass).toEqual('security-status__label--signed--not-trusted'); - expect(checkSigned.tooltipText).toEqual('The sender could not be verified.'); + expect(checkSigned.tooltipText).toEqual('not-signed-label-tooltip'); }); it('assumes not trusted when the seal signature is not found', function(){ @@ -168,7 +168,7 @@ describeComponent('mail_view/ui/mail_view', function () { email.security_casing = {imprints: [{seal: null}]}; var checkSigned = this.component.checkSigned(email); expect(checkSigned.cssClass).toEqual('security-status__label--signed--not-trusted'); - expect(checkSigned.tooltipText).toEqual('The sender could not be verified.'); + expect(checkSigned.tooltipText).toEqual('not-signed-label-tooltip'); }); it('assumes that the mail is not signed if there are no imprints', function() { @@ -176,7 +176,7 @@ describeComponent('mail_view/ui/mail_view', function () { email.security_casing = {imprints: []}; var checkSigned = this.component.checkSigned(email); expect(checkSigned.cssClass).toEqual('security-status__label--not-signed'); - expect(checkSigned.tooltipText).toEqual('The sender could not be verified.'); + expect(checkSigned.tooltipText).toEqual('not-signed-label-tooltip'); }); it('assumes that there is no signature info to show', function() { @@ -184,7 +184,7 @@ describeComponent('mail_view/ui/mail_view', function () { email.security_casing = {imprints: [{state: 'no_signature_information'}]}; var checkSigned = this.component.checkSigned(email); expect(checkSigned.cssClass).toEqual('security-status__label--not-signed'); - expect(checkSigned.tooltipText).toEqual('The sender could not be verified.'); + expect(checkSigned.tooltipText).toEqual('not-signed-label-tooltip'); }); it('shows that mail is encrypted if it is', function() { -- cgit v1.2.3