From 5417425a19a27806f813f6f1eb2f2d00a6d959bf Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Sat, 1 Oct 2016 17:03:54 +0200 Subject: [PATCH] Testing new way of handling resource literals --- Site/Pages/v5/Comms/SendMassMessage.aspx | 4 ++-- Site/Pages/v5/Comms/SendMassMessage.aspx.cs | 12 ++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/Site/Pages/v5/Comms/SendMassMessage.aspx b/Site/Pages/v5/Comms/SendMassMessage.aspx index 7039e1d0..23a8d4f5 100644 --- a/Site/Pages/v5/Comms/SendMassMessage.aspx +++ b/Site/Pages/v5/Comms/SendMassMessage.aspx @@ -32,12 +32,12 @@ } function onClickSend() { - alertify.alert("<%= Resources.Pages.Comms.SendMassMessage_SendMessageResult %>"); + alertify.alert(SwarmopsJS.unescape('<%= this.Literal_SendMessageResult %>')); return false; } function onClickTest() { - alertify.alert("<%= Resources.Pages.Comms.SendMassMessage_TestMessageResult %>"); + alertify.alert(SwarmopsJS.unescape('<%= this.Literal_TestMessageResult %>')); return false; } diff --git a/Site/Pages/v5/Comms/SendMassMessage.aspx.cs b/Site/Pages/v5/Comms/SendMassMessage.aspx.cs index 145b947f..1229f85b 100644 --- a/Site/Pages/v5/Comms/SendMassMessage.aspx.cs +++ b/Site/Pages/v5/Comms/SendMassMessage.aspx.cs @@ -104,5 +104,17 @@ namespace Swarmops.Frontend.Pages.Comms public int AssignedId; public string DisplayMessage; }; + + // ReSharper disable once InconsistentNaming + public string Literal_SendMessageResult + { + get { return JavascriptEscape (Resources.Pages.Comms.SendMassMessage_SendMessageResult); } + } + + // ReSharper disable once InconsistentNaming + public string Literal_TestMessageResult + { + get { return JavascriptEscape (Resources.Pages.Comms.SendMassMessage_TestMessageResult); } + } } } \ No newline at end of file