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:17 UTC
[33/50] [abbrv] incubator-wave git commit: escape html message strings
escape html message strings
Project: http://git-wip-us.apache.org/repos/asf/incubator-wave/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-wave/commit/064510a1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-wave/tree/064510a1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-wave/diff/064510a1
Branch: refs/heads/swellrt
Commit: 064510a1fb65b770665729b0a5c7690b2add43a3
Parents: 493be85
Author: Antonio Tenorio Forn�s <an...@ucm.es>
Authored: Tue Oct 4 19:29:18 2016 +0200
Committer: Antonio Tenorio Forn�s <an...@ucm.es>
Committed: Tue Oct 4 19:29:18 2016 +0200
----------------------------------------------------------------------
wave/config/email/EmailMessages.properties | 2 +-
wave/config/email/EmailMessages_en.properties | 2 +-
wave/config/email/EmailMessages_es.properties | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/064510a1/wave/config/email/EmailMessages.properties
----------------------------------------------------------------------
diff --git a/wave/config/email/EmailMessages.properties b/wave/config/email/EmailMessages.properties
index a93de4c..6914298 100644
--- a/wave/config/email/EmailMessages.properties
+++ b/wave/config/email/EmailMessages.properties
@@ -3,6 +3,6 @@ invitationHeader= {0} wants to collaborate with you
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 {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>
+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%20to%20{4}&body=...%20We%20can%20keep%20collaborating%20at%20{3}">Welcome {2}!</a>
restoreEmailSubject=Restore {0} password
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/064510a1/wave/config/email/EmailMessages_en.properties
----------------------------------------------------------------------
diff --git a/wave/config/email/EmailMessages_en.properties b/wave/config/email/EmailMessages_en.properties
index 60f201f..6914298 100644
--- a/wave/config/email/EmailMessages_en.properties
+++ b/wave/config/email/EmailMessages_en.properties
@@ -3,6 +3,6 @@ invitationHeader= {0} wants to collaborate with you
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 {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>
+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%20to%20{4}&body=...%20We%20can%20keep%20collaborating%20at%20{3}">Welcome {2}!</a>
restoreEmailSubject=Restore {0} password
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/064510a1/wave/config/email/EmailMessages_es.properties
----------------------------------------------------------------------
diff --git a/wave/config/email/EmailMessages_es.properties b/wave/config/email/EmailMessages_es.properties
index 3806b41..e8fef67 100644
--- a/wave/config/email/EmailMessages_es.properties
+++ b/wave/config/email/EmailMessages_es.properties
@@ -3,6 +3,6 @@ invitationHeader= {0} quiere colaborar contigo
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 {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>
+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%20a%20{4}&body=...%20Podemos%20seguir%20colaborando%20en%20{3}">\ufffdDale la bienvenida a {2}!</a>
restoreEmailSubject=Recuperaci\ufffdn de contrase\ufffda para {0}
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.