Redid notifications loc AGAIN
This commit is contained in:
@@ -36,22 +36,18 @@ namespace Swarmops.Logic.Communications.Transmission
|
||||
public string BodyResource { get; set; }
|
||||
public NotificationStrings Strings { get; set; }
|
||||
|
||||
public string GetSubject()
|
||||
public string GetSubject(string cultureId)
|
||||
{
|
||||
// TODO: Pick culture
|
||||
|
||||
return
|
||||
ExpandMacros (
|
||||
Logic_Communications_Transmission_NotificationPayload.ResourceManager.GetString (SubjectResource));
|
||||
Logic_Communications_Transmission_NotificationPayload.ResourceManager.GetString (SubjectResource, CultureInfo.CreateSpecificCulture (cultureId)));
|
||||
}
|
||||
|
||||
public string GetBody()
|
||||
public string GetBody(string cultureId)
|
||||
{
|
||||
// TODO: Pick culture
|
||||
|
||||
return
|
||||
ExpandMacros (
|
||||
Logic_Communications_Transmission_NotificationPayload.ResourceManager.GetString (BodyResource));
|
||||
Logic_Communications_Transmission_NotificationPayload.ResourceManager.GetString (BodyResource, CultureInfo.CreateSpecificCulture (cultureId)));
|
||||
}
|
||||
|
||||
public string ExpandMacros (string input)
|
||||
@@ -80,10 +76,16 @@ namespace Swarmops.Logic.Communications.Transmission
|
||||
|
||||
public RenderedComm RenderComm (Person person)
|
||||
{
|
||||
string culture = person.PreferredCulture;
|
||||
if (string.IsNullOrEmpty (culture))
|
||||
{
|
||||
culture = "en-US";
|
||||
}
|
||||
|
||||
RenderedComm result = new RenderedComm();
|
||||
|
||||
result[CommRenderPart.Subject] = GetSubject();
|
||||
result[CommRenderPart.BodyText] = GetBody();
|
||||
result[CommRenderPart.Subject] = GetSubject(culture);
|
||||
result[CommRenderPart.BodyText] = GetBody(culture);
|
||||
result[CommRenderPart.SenderName] = SystemSettings.AdminNotificationSender; // TODO: Make dependent on an enum
|
||||
result[CommRenderPart.SenderMail] = SystemSettings.AdminNotificationAddress;
|
||||
|
||||
|
||||
@@ -30,10 +30,6 @@ namespace Swarmops.Utility.Communications
|
||||
Type payloadType = assembly.GetType(envelope.PayloadClass);
|
||||
var methodInfo = payloadType.GetMethod("FromXml", BindingFlags.Public | BindingFlags.Static | BindingFlags.FlattenHierarchy);
|
||||
|
||||
// Set culture specific to the person being rendered for
|
||||
Thread.CurrentThread.CurrentCulture = Thread.CurrentThread.CurrentUICulture =
|
||||
CultureInfo.CreateSpecificCulture (!string.IsNullOrEmpty (person.PreferredCulture) ? person.PreferredCulture : "en-US");
|
||||
|
||||
ICommsRenderer renderer = (ICommsRenderer)(methodInfo.Invoke(null, new object[] { envelope.PayloadXml }));
|
||||
RenderedComm comm = renderer.RenderComm (person);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user