diff --git a/Logic/Resources/Logic.Communications.Transmission.NotificationPayload.Designer.cs b/Logic/Resources/Logic.Communications.Transmission.NotificationPayload.Designer.cs index 7e86f260..722ca57d 100644 --- a/Logic/Resources/Logic.Communications.Transmission.NotificationPayload.Designer.cs +++ b/Logic/Resources/Logic.Communications.Transmission.NotificationPayload.Designer.cs @@ -402,7 +402,7 @@ namespace Swarmops.Logic.Resources { } /// - /// Looks up a localized string similar to A new person has signed up as [RegularTitle] in [OrganizationName]! They are based in [GeographyName].. + /// Looks up a localized string similar to A new person has signed up as [RegularTitle] in [OrganizationName]! [ConcernedPersonName] is based in [GeographyName], [CountryCode].. /// internal static string Participant_Signup_Body { get { diff --git a/Logic/Resources/Logic.Communications.Transmission.NotificationPayload.resx b/Logic/Resources/Logic.Communications.Transmission.NotificationPayload.resx index a079860c..26965cac 100644 --- a/Logic/Resources/Logic.Communications.Transmission.NotificationPayload.resx +++ b/Logic/Resources/Logic.Communications.Transmission.NotificationPayload.resx @@ -258,7 +258,7 @@ Time spent transmitting: [TransmissionTime]. [[OrganizationName]] Comms transmitted: [GeographyName] - A new person has signed up as [RegularTitle] in [OrganizationName]! They are based in [GeographyName]. + A new person has signed up as [RegularTitle] in [OrganizationName]! [ConcernedPersonName] is based in [GeographyName], [CountryCode]. [[OrganizationName]] New [RegularTitle]: [ConcernedPersonName], [GeographyName] diff --git a/Logic/Support/LogEntries/VolunteerForPositionLogEntry.cs b/Logic/Support/LogEntries/VolunteerForPositionLogEntry.cs index 37c5204a..d6b19af5 100644 --- a/Logic/Support/LogEntries/VolunteerForPositionLogEntry.cs +++ b/Logic/Support/LogEntries/VolunteerForPositionLogEntry.cs @@ -10,6 +10,9 @@ namespace Swarmops.Logic.Support.LogEntries [Serializable] public class VolunteerForPositionLogEntry: PositionActionBase { + [Obsolete("Do not use the parameterless ctor. It is intended for serialization only.", true)] + public VolunteerForPositionLogEntry() {} + public VolunteerForPositionLogEntry (Person person, Position position) { this.ActingPersonId = this.ConcernedPersonId = person.Identity; diff --git a/Site5/App_GlobalResources/Pages.Public.resx b/Site5/App_GlobalResources/Pages.Public.resx index 01ec01e4..dcd8ba09 100644 --- a/Site5/App_GlobalResources/Pages.Public.resx +++ b/Site5/App_GlobalResources/Pages.Public.resx @@ -148,7 +148,7 @@ Welcome! This is the <em>Dashboard,</em> where you can access internal functionality of {0}. You will get more information in mail shortly.<br/><br/> -If you volunteered for taking formal responsibility, somebody (probably also a volunteer, like yourself) will contact you to discuss more about the opportunities. +If you volunteered for taking formal responsibility, somebody (probably also a volunteer, like yourself) will contact you to discuss more about the opportunities available. You have already signed up to this Swarmops server. Please use the Reset Password function from the login screen instead of creating a new account. diff --git a/Site5/Pages/v5/Public/Signup.aspx b/Site5/Pages/v5/Public/Signup.aspx index 30408ce2..eaeb3804 100644 --- a/Site5/Pages/v5/Public/Signup.aspx +++ b/Site5/Pages/v5/Public/Signup.aspx @@ -297,7 +297,7 @@ dataType: "json", async: false, // blocks until function returns - race conditions otherwise success: function(msg) { - if (msg.d != true) { + if (msg.d.Success != true) { isValid = false; $('#<%= this.TextMail.ClientID %>').addClass("entryError"); alertify.error("");