diff --git a/Logic/Communications/Transmission/NotificationPayload.cs b/Logic/Communications/Transmission/NotificationPayload.cs
index 284acc8d..a682a6da 100644
--- a/Logic/Communications/Transmission/NotificationPayload.cs
+++ b/Logic/Communications/Transmission/NotificationPayload.cs
@@ -39,9 +39,8 @@ namespace Swarmops.Logic.Communications.Transmission
System.Reflection.Assembly.
GetExecutingAssembly());
// TODO: Pick culture
- // TODO: Expand macros
- return resourceManager.GetString(this.SubjectResource);
+ return ExpandMacros(resourceManager.GetString(this.SubjectResource));
}
public string GetBody()
@@ -50,9 +49,15 @@ namespace Swarmops.Logic.Communications.Transmission
System.Reflection.Assembly.
GetExecutingAssembly());
// TODO: Pick culture
- // TODO: Expand macros
- return resourceManager.GetString(this.BodyResource);
+ return ExpandMacros(resourceManager.GetString(this.BodyResource));
+ }
+
+ public string ExpandMacros (string input)
+ {
+ // TODO: Replace all, of course
+
+ return input.Replace("[HostName]", System.Net.Dns.GetHostName());
}
#region Implementation of ICommsRenderer
diff --git a/Logic/Swarmops.Logic.Localizations.Designer.cs b/Logic/Swarmops.Logic.Localizations.Designer.cs
index 988ac573..d743653c 100644
--- a/Logic/Swarmops.Logic.Localizations.Designer.cs
+++ b/Logic/Swarmops.Logic.Localizations.Designer.cs
@@ -61,7 +61,7 @@ namespace Swarmops.Logic {
}
///
- /// Looks up a localized string similar to Swarmops Backend version [VERSION] on host [HOSTNAME] has successfully started and connected to database and notification frameworks..
+ /// Looks up a localized string similar to Swarmops Backend version [SwarmopsVersion] on host [HostName] has successfully started and connected to database and notification frameworks..
///
internal static string Notifications_System_Startup_Body {
get {
diff --git a/Logic/Swarmops.Logic.Localizations.resx b/Logic/Swarmops.Logic.Localizations.resx
index 5cee363d..d1b0ace9 100644
--- a/Logic/Swarmops.Logic.Localizations.resx
+++ b/Logic/Swarmops.Logic.Localizations.resx
@@ -118,7 +118,7 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- Swarmops Backend version [VERSION] on host [HOSTNAME] has successfully started and connected to database and notification frameworks.
+ Swarmops Backend version [SwarmopsVersion] on host [HostName] has successfully started and connected to database and notification frameworks.
Swarmops Backend operational