From 364b4095017dd574ae088c291ea064dd68b0fb46 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Wed, 21 May 2014 08:44:35 -0400 Subject: [PATCH] FIx mail templates for Brazilian Portuguese Fixes #2738 --- NEWS | 1 + .../SOGoMailBrazilianPortugueseForward.wod | 5 +++++ .../SOGoMailBrazilianPortugueseReply.wod | 5 +++++ 3 files changed, 11 insertions(+) diff --git a/NEWS b/NEWS index da3077b20..18b155b73 100644 --- a/NEWS +++ b/NEWS @@ -34,6 +34,7 @@ Bug fixes - fixed synchronization of seen/unseen status of msgs in Webmail (#2715) - fixed focus of popup windows open through a contextual menu with Firefox on Windows 7 - fixed missing characters in shared folder names over ActiveSync (#2709) + - fixed reply and forward mail templates for Brazilian Portuguese (#2738) 2.2.3 (2014-04-03) ------------------ diff --git a/SoObjects/Mailer/SOGoMailBrazilianPortugueseForward.wo/SOGoMailBrazilianPortugueseForward.wod b/SoObjects/Mailer/SOGoMailBrazilianPortugueseForward.wo/SOGoMailBrazilianPortugueseForward.wod index 9afd448d9..f2436acc9 100644 --- a/SoObjects/Mailer/SOGoMailBrazilianPortugueseForward.wo/SOGoMailBrazilianPortugueseForward.wod +++ b/SoObjects/Mailer/SOGoMailBrazilianPortugueseForward.wo/SOGoMailBrazilianPortugueseForward.wod @@ -13,6 +13,11 @@ from: WOString { escapeHTML = NO; } +newLine: WOString { + value = newLine; + escapeHTML = NO; +} + hasReplyTo: WOConditional { condition = hasReplyTo; } diff --git a/SoObjects/Mailer/SOGoMailBrazilianPortugueseReply.wo/SOGoMailBrazilianPortugueseReply.wod b/SoObjects/Mailer/SOGoMailBrazilianPortugueseReply.wo/SOGoMailBrazilianPortugueseReply.wod index df3789cc3..3fbed6d61 100644 --- a/SoObjects/Mailer/SOGoMailBrazilianPortugueseReply.wo/SOGoMailBrazilianPortugueseReply.wod +++ b/SoObjects/Mailer/SOGoMailBrazilianPortugueseReply.wo/SOGoMailBrazilianPortugueseReply.wod @@ -22,6 +22,11 @@ from: WOString { escapeHTML = NO; } +newLine: WOString { + value = newLine; + escapeHTML = NO; +} + hasReplyTo: WOConditional { condition = hasReplyTo; }