You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ponymail.apache.org by se...@apache.org on 2016/12/17 21:39:49 UTC
incubator-ponymail git commit: A bit more detail
Repository: incubator-ponymail
Updated Branches:
refs/heads/master 4d52f2d38 -> ac7dbde76
A bit more detail
Project: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/commit/ac7dbde7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/tree/ac7dbde7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/diff/ac7dbde7
Branch: refs/heads/master
Commit: ac7dbde7673f4f6e3a68f27d0b7014d1d08a0548
Parents: 4d52f2d
Author: Sebb <se...@apache.org>
Authored: Sat Dec 17 21:39:41 2016 +0000
Committer: Sebb <se...@apache.org>
Committed: Sat Dec 17 21:39:41 2016 +0000
----------------------------------------------------------------------
site/api/preferences.lua | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/ac7dbde7/site/api/preferences.lua
----------------------------------------------------------------------
diff --git a/site/api/preferences.lua b/site/api/preferences.lua
index a8caf0c..38fa3ca 100644
--- a/site/api/preferences.lua
+++ b/site/api/preferences.lua
@@ -95,13 +95,13 @@ function handle(r)
from = ("\"Pony Mail\"<no-reply@%s>"):format(mldom)
},
body = ([[
-You (or someone else) has requested to associate this email address with the account '%s' in Pony Mail.
-If you wish to complete this association, please visit %s
+You (or someone else) has requested to associate the email address '%s' with the account '%s' in Pony Mail.
+If you wish to complete this association, please visit %s whilst logged in to Pony Mail.
...Or don't if you didn't request this, just ignore this email.
With regards,
Pony Mail - Email for Ponies and People.
-]]):format(account.credentials.email, vURL)
+]]):format(get.associate, account.credentials.email, vURL)
}
-- send email!