Added notification traceability

This commit is contained in:
Rick Falkvinge
2015-11-27 15:16:53 +01:00
parent 31ac275f89
commit 87c3dac718
4 changed files with 27 additions and 3 deletions
@@ -61,7 +61,11 @@ namespace Swarmops.Logic.Communications.Payload
{
return
ExpandMacros (
Logic_Communications_Transmission_NotificationPayload.ResourceManager.GetString (BodyResource, CultureInfo.CreateSpecificCulture (cultureId)));
Logic_Communications_Transmission_NotificationPayload.ResourceManager.GetString (BodyResource,
CultureInfo.CreateSpecificCulture (cultureId))) + "\r\n\r\n" +
ExpandMacros (
Logic_Communications_Transmission_NotificationPayload.ResourceManager.GetString (
"NotificationFooter_Generic", CultureInfo.CreateSpecificCulture (cultureId)));
}
public string ExpandMacros (string input)
@@ -507,6 +507,16 @@ namespace Swarmops.Logic.Resources {
}
}
/// <summary>
/// Looks up a localized string similar to --
///This mail was sent to [Addressee] from [OrganizationName]. If you do not desire to receive these notifications in the future, please log on to [InstallationName] at [ExternalUrl] and modify your notification settings..
/// </summary>
internal static string NotificationFooter_Generic {
get {
return ResourceManager.GetString("NotificationFooter_Generic", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Your message has been queued for delivery and the recipients have been resolved. Your mail will be sent to, or be attempted to sent to, [RecipientCount] people in [Geography] in [OrganizationName]..
/// </summary>
@@ -303,6 +303,10 @@ Please log on to [InstallationName] at [ExternalUrl]Financial/AttestCosts to att
<data name="Membership_Renewed_Manual_Subject" xml:space="preserve">
<value>[[OrganizationName]] [Regularship] renewed: [PersonName], [PersonGeography] [CountryCode] (manual)</value>
</data>
<data name="NotificationFooter_Generic" xml:space="preserve">
<value>--
This mail was sent to [Addressee] from [OrganizationName]. If you do not desire to receive these notifications in the future, please log on to [InstallationName] at [ExternalUrl] and modify your notification settings.</value>
</data>
<data name="OutboundComm_Resolved_Body" xml:space="preserve">
<value>Your message has been queued for delivery and the recipients have been resolved. Your mail will be sent to, or be attempted to sent to, [RecipientCount] people in [Geography] in [OrganizationName].</value>
</data>
@@ -51,8 +51,14 @@ namespace Swarmops.Utility.Communications
throw new OutboundCommTransmitException ("Cannot send mail to " + person.Mail, e);
}
mail.Subject = (string) comm[CommRenderPart.Subject];
mail.Body = (string) comm[CommRenderPart.BodyText];
string mailBodyText = (string)comm[CommRenderPart.BodyText];
mailBodyText = mailBodyText.Replace("[Addressee]", person.Canonical);
string mailBodyHtml = (string)comm[CommRenderPart.BodyHtml];
mailBodyHtml = mailBodyHtml.Replace("[Addressee]", person.Canonical);
mail.Subject = (string)comm[CommRenderPart.Subject];
mail.Body = mailBodyText;
mail.SubjectEncoding = Encoding.UTF8;
mail.BodyEncoding = Encoding.UTF8;