You are viewing a plain text version of this content. The canonical link for it is here.
Posted to wave-commits@incubator.apache.org by yu...@apache.org on 2016/11/11 16:34:12 UTC
[28/50] [abbrv] incubator-wave git commit: fix join service email
messages
fix join service email messages
Project: http://git-wip-us.apache.org/repos/asf/incubator-wave/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-wave/commit/d7639237
Tree: http://git-wip-us.apache.org/repos/asf/incubator-wave/tree/d7639237
Diff: http://git-wip-us.apache.org/repos/asf/incubator-wave/diff/d7639237
Branch: refs/heads/swellrt
Commit: d7639237224daaf191303048567d0056a2ecefdc
Parents: d758fcd
Author: Antonio Tenorio Forn�s <an...@ucm.es>
Authored: Mon Sep 26 22:04:27 2016 +0200
Committer: Antonio Tenorio Forn�s <an...@ucm.es>
Committed: Tue Sep 27 00:03:52 2016 +0200
----------------------------------------------------------------------
wave/config/email/EmailMessages.properties | 8 ++++----
wave/config/email/EmailMessages_en.properties | 8 ++++----
wave/config/email/EmailMessages_es.properties | 8 ++++----
wave/config/email/Join.vm | 4 ++--
4 files changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/d7639237/wave/config/email/EmailMessages.properties
----------------------------------------------------------------------
diff --git a/wave/config/email/EmailMessages.properties b/wave/config/email/EmailMessages.properties
index 118480d..a93de4c 100644
--- a/wave/config/email/EmailMessages.properties
+++ b/wave/config/email/EmailMessages.properties
@@ -1,8 +1,8 @@
invitationEmailSubject = {0} wants to collaborate with you
invitationHeader= {0} wants to collaborate with you
-invitationEmailBody= Hello {0},\n\n{1} wants to collaborate with you in <a href="{2}">{3}</a>.
+invitationEmailBody= Hello {0},<\br>{1} wants to collaborate with you in <a href="{2}">{3}</a>.
joinNamedEmailSubject = Welcome {0}, a new collaborator in {1}
-joinUnnamedEmailSubject = Welcome a new collaborator of {1}
-joinEmailBody= Hi {0},\n\n<a mailto="{1}">{2}</a> has joint <a href="{3}">{4}</a>:,\n\n<blockquote>{5}</blockquote>\n\n. <a mailto="{1}?subject=Wellcome to {4}&body=... We can keep collaborating at {3}">Welcome {2}!</a>
+joinUnnamedEmailSubject = Welcome a new collaborator of {0}
+joinEmailBody= Hi {0},<\br><a href="mailto:{1}">{2}</a> has joint<\br><a href="{3}">{4}</a>:<\br><blockquote>{5}</blockquote><\br><a href="mailto:{1}?subject=Welcome to {4}&body=... We can keep collaborating at {3}">Welcome {2}!</a>
restoreEmailSubject=Restore {0} password
-restoreEmailBody=Hello {0},\n\nTo restore your password, please visit the following link {1}. \n\nIf you did not request a password recovery, you can ignore this message.
\ No newline at end of file
+restoreEmailBody=Hello {0},<\br>To restore your password, please visit the following link {1}. <\br>If you did not request a password recovery, you can ignore this message.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/d7639237/wave/config/email/EmailMessages_en.properties
----------------------------------------------------------------------
diff --git a/wave/config/email/EmailMessages_en.properties b/wave/config/email/EmailMessages_en.properties
index 118480d..60f201f 100644
--- a/wave/config/email/EmailMessages_en.properties
+++ b/wave/config/email/EmailMessages_en.properties
@@ -1,8 +1,8 @@
invitationEmailSubject = {0} wants to collaborate with you
invitationHeader= {0} wants to collaborate with you
-invitationEmailBody= Hello {0},\n\n{1} wants to collaborate with you in <a href="{2}">{3}</a>.
+invitationEmailBody= Hello {0},<\br>{1} wants to collaborate with you in <a href="{2}">{3}</a>.
joinNamedEmailSubject = Welcome {0}, a new collaborator in {1}
-joinUnnamedEmailSubject = Welcome a new collaborator of {1}
-joinEmailBody= Hi {0},\n\n<a mailto="{1}">{2}</a> has joint <a href="{3}">{4}</a>:,\n\n<blockquote>{5}</blockquote>\n\n. <a mailto="{1}?subject=Wellcome to {4}&body=... We can keep collaborating at {3}">Welcome {2}!</a>
+joinUnnamedEmailSubject = Welcome a new collaborator of {0}
+joinEmailBody= Hi {0},<\br><a href="mailto:{1}">{2}</a> has joint <a href="{3}">{4}</a>:<\br><blockquote>{5}</blockquote><\br><a href="mailto:{1}?subject=Welcome to {4}&body=... We can keep collaborating at {3}">Welcome {2}!</a>
restoreEmailSubject=Restore {0} password
-restoreEmailBody=Hello {0},\n\nTo restore your password, please visit the following link {1}. \n\nIf you did not request a password recovery, you can ignore this message.
\ No newline at end of file
+restoreEmailBody=Hello {0},<\br>To restore your password, please visit the following link {1}. <\br>If you did not request a password recovery, you can ignore this message.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/d7639237/wave/config/email/EmailMessages_es.properties
----------------------------------------------------------------------
diff --git a/wave/config/email/EmailMessages_es.properties b/wave/config/email/EmailMessages_es.properties
index 808e7de..3806b41 100644
--- a/wave/config/email/EmailMessages_es.properties
+++ b/wave/config/email/EmailMessages_es.properties
@@ -1,8 +1,8 @@
invitationEmailSubject = {0} quiere colaborar contigo
invitationHeader= {0} quiere colaborar contigo
-invitationEmailBody= Hola {0},\n\n{1} quiere colaborar contigo en <a href="{2}">{3}</a>.
+invitationEmailBody= Hola {0},<\br>{1} quiere colaborar contigo en <a href="{2}">{3}</a>.
joinNamedEmailSubject = Dale la bienvenida a {0}, un nuevo colaborador de {1}
-joinUnnamedEmailSubject = Dale la bienvenida a un nuevo colaborador de {1}
-joinEmailBody= Hola {0},\n\n<a mailto="{1}">{2}</a> se ha unido a <a href="{3}">{4}</a>:,\n\n<blockquote>{5}</blockquote>\n\n. <a mailto="{1}?subject=Bienvenido a {4}&body=... Podemos seguir colaborando en {3}">\ufffdDale la bienvenida a {2}!</a>
+joinUnnamedEmailSubject = Dale la bienvenida a un nuevo colaborador de {0}
+joinEmailBody= Hola {0},<\br><a href="mailto:{1}">{2}</a> se ha unido a <a href="{3}">{4}</a>:<\br><blockquote>{5}</blockquote><\br><a href="mailto:{1}?subject=Bienvenido a {4}&body=... Podemos seguir colaborando en {3}">\ufffdDale la bienvenida a {2}!</a>
restoreEmailSubject=Recuperaci\ufffdn de contrase\ufffda para {0}
-restoreEmailBody=Hola {0},\n\nPara recuperar tu contrase\ufffda, por favor, visita este enlace: {1}. \n\nSi no has pedido una recuperaci\ufffdn de contrase\ufffda, puedes ignorar este mensaje.
+restoreEmailBody=Hola {0},<\br>Para recuperar tu contrase\ufffda, por favor, visita este enlace: {1}. <\br>Si no has pedido una recuperaci\ufffdn de contrase\ufffda, puedes ignorar este mensaje.
http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/d7639237/wave/config/email/Join.vm
----------------------------------------------------------------------
diff --git a/wave/config/email/Join.vm b/wave/config/email/Join.vm
index 2cfa8db..5af1851 100644
--- a/wave/config/email/Join.vm
+++ b/wave/config/email/Join.vm
@@ -9,14 +9,14 @@
<table align="center" cellpadding="0" cellspacing="0" width="600">
<tr>
<td style="color: #20686e; font-size: 20px; font-family: Helvetica, Arial, sans-serif; padding: 10px 10px 10px 10px;">
- $text.joinUnnamedEmailSubject.insert($joiner)
+ $text.joinUnnamedEmailSubject.insert($url_text)
</td>
</tr>
<tr>
<td style="padding: 15px 30px 15px 30px; font-size: 15px">
<p style="margin: 0 0 9px">
- $text.joinEmailBody.insert($admin, $joiner, $joinerEmail, $url, $url_text, $message)
+ $text.joinEmailBody.insert($admin, $joinerEmail, $joiner, $url, $url_text, $message)
</p>
</td>
</tr>