moparisthebest/mail
1
0
Fork 0
mirror of https://github.com/moparisthebest/mail synced 2024-12-24 16:28:49 -05:00
Code Issues Releases Wiki Activity

[WO-218] remove names from greeting and simplify message

Browse Source
This commit is contained in:
Tankred Hase 2014-01-31 19:14:43 +01:00
parent c26c7c9698
commit ada401efa9
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/js/app-config.js
View File

@ -54,7 +54,7 @@ define(function(require) {
fallbackSubject: '(no subject)', fallbackSubject: '(no subject)',
invitationSubject: 'Invitation to a private conversation', invitationSubject: 'Invitation to a private conversation',
invitationMessage: 'I would like to invite you to a private conversation!\n\nIn order to read my encrypted message please install the Whiteout Mail application. This application is used to read and write messages securely with strong encryption applied.\n\nGo to the Whiteout Networks homepage to learn more and to download the application: https://whiteout.io', invitationMessage: 'I would like to invite you to a private conversation!\n\nIn order to read my encrypted message please install the Whiteout Mail application. This application is used to read and write messages securely with strong encryption applied.\n\nGo to the Whiteout Networks homepage to learn more and to download the application: https://whiteout.io',
message: 'this is a private conversation. To read my encrypted message below, simply install Whiteout Mail for Chrome. The app is really easy to use and automatically encrypts sent emails, so that only the two of us can read them.\n\nOpen Whiteout Mail: https://chrome.google.com/webstore/detail/jjgghafhamholjigjoghcfcekhkonijg', message: 'this is a private conversation. To read my encrypted message below, simply open it in Whiteout Mail.\n\nOpen Whiteout Mail: https://chrome.google.com/webstore/detail/jjgghafhamholjigjoghcfcekhkonijg',
cryptPrefix: '-----BEGIN PGP MESSAGE-----', cryptPrefix: '-----BEGIN PGP MESSAGE-----',
cryptSuffix: '-----END PGP MESSAGE-----', cryptSuffix: '-----END PGP MESSAGE-----',
signature: 'Sent securely from Whiteout Mail', signature: 'Sent securely from Whiteout Mail',

13
src/js/bo/outbox.js
View File

@ -227,13 +227,12 @@ define(function(require) {
// send an invitation to the unregistered user, aka the recipient // send an invitation to the unregistered user, aka the recipient
function sendInvitationMail(recipient, sender) { function sendInvitationMail(recipient, sender) {
var to = (recipient.name || recipient.address).split('@')[0].split('.')[0].split(' ')[0], var invitationMail = {
invitationMail = { from: [sender],
from: [sender], to: [recipient],
to: [recipient], subject: str.invitationSubject,
subject: str.invitationSubject, body: 'Hi,\n\n' + str.invitationMessage + '\n\n'
body: 'Hi ' + to + ',\n\n' + str.invitationMessage + '\n\n' };
};
// send invitation mail // send invitation mail
self._emailDao.sendPlaintext({ self._emailDao.sendPlaintext({

3
src/js/dao/email-dao.js
View File

@ -954,8 +954,7 @@ define(function(require) {
message = str.message + '\n\n\n', message = str.message + '\n\n\n',
signature = '\n\n' + str.signature + '\n\n'; signature = '\n\n' + str.signature + '\n\n';
// get first name of recipient greeting = 'Hi,\n\n';
greeting = 'Hi ' + (email.to[0].name || email.to[0].address).split('@')[0].split('.')[0].split(' ')[0] + ',\n\n';
// build encrypted text body // build encrypted text body
email.body = greeting + message + ct + signature; email.body = greeting + message + ct + signature;