diff --git a/Site/App_GlobalResources/Global.designer.cs b/Site/App_GlobalResources/Global.designer.cs index 50163e1a..de996e89 100644 --- a/Site/App_GlobalResources/Global.designer.cs +++ b/Site/App_GlobalResources/Global.designer.cs @@ -1140,6 +1140,42 @@ namespace Resources { } } + /// + /// Looks up a localized string similar to Officer. + /// + internal static string Global_Officer_Female { + get { + return ResourceManager.GetString("Global_Officer_Female", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Officer. + /// + internal static string Global_Officer_Male { + get { + return ResourceManager.GetString("Global_Officer_Male", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Officer. + /// + internal static string Global_Officer_Neutral { + get { + return ResourceManager.GetString("Global_Officer_Neutral", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Officers. + /// + internal static string Global_Officer_Plural { + get { + return ResourceManager.GetString("Global_Officer_Plural", resourceCulture); + } + } + /// /// Looks up a localized string similar to On. /// @@ -1374,6 +1410,42 @@ namespace Resources { } } + /// + /// Looks up a localized string similar to Volunteer. + /// + internal static string Global_Volunteer_Female { + get { + return ResourceManager.GetString("Global_Volunteer_Female", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Volunteer. + /// + internal static string Global_Volunteer_Male { + get { + return ResourceManager.GetString("Global_Volunteer_Male", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Volunteer. + /// + internal static string Global_Volunteer_Neutral { + get { + return ResourceManager.GetString("Global_Volunteer_Neutral", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Volunteers. + /// + internal static string Global_Volunteer_Plural { + get { + return ResourceManager.GetString("Global_Volunteer_Plural", resourceCulture); + } + } + /// /// Looks up a localized string similar to Finish. /// diff --git a/Site/App_GlobalResources/Global.resx b/Site/App_GlobalResources/Global.resx index e1483b08..87214459 100644 --- a/Site/App_GlobalResources/Global.resx +++ b/Site/App_GlobalResources/Global.resx @@ -866,4 +866,28 @@ If you can, please enable BitID two-factor authentication. + + Officer + + + Officer + + + Officer + + + Officers + + + Volunteer + + + Volunteer + + + Volunteer + + + Volunteers + \ No newline at end of file diff --git a/Site/Controls/v5/Base/DropDown.ascx b/Site/Controls/v5/Base/DropDown.ascx index f0c8e84e..6de868cc 100644 --- a/Site/Controls/v5/Base/DropDown.ascx +++ b/Site/Controls/v5/Base/DropDown.ascx @@ -1,4 +1,4 @@ -<%@ Control Language="C#" AutoEventWireup="true" Inherits="Swarmops.Frontend.Controls.Base.DropDown" Codebehind="DropDown.ascx.cs" %> +<%@ Control Language="C#" AutoEventWireup="true" Inherits="Swarmops.Frontend.Controls.Base.DropDown" CodeFile="DropDown.ascx.cs" %> <%@ Import Namespace="System.Threading" %>
-
+  
 
diff --git a/Site/Pages/v5/Comms/SendMassMessage.aspx.cs b/Site/Pages/v5/Comms/SendMassMessage.aspx.cs index be2f89bb..a63f32d2 100644 --- a/Site/Pages/v5/Comms/SendMassMessage.aspx.cs +++ b/Site/Pages/v5/Comms/SendMassMessage.aspx.cs @@ -36,11 +36,11 @@ namespace Swarmops.Frontend.Pages.Comms this.DropRecipientClasses.Items.Clear(); this.DropRecipientClasses.Items.Add (new ListItem (Global.Global_SelectOne, "0")); - this.DropRecipientClasses.Items.Add (new ListItem ("[Regulars]", "1")); - this.DropRecipientClasses.Items.Add (new ListItem ("[Agents]", "2")); + this.DropRecipientClasses.Items.Add (new ListItem (Participant.Localized(CurrentOrganization.RegularLabel, TitleVariant.Plural), "1")); + this.DropRecipientClasses.Items.Add (new ListItem (Participant.Localized(CurrentOrganization.ActivistLabel, TitleVariant.Plural), "2")); // TODO: Room for dynamic membership types here - this.DropRecipientClasses.Items.Add (new ListItem ("Officers", "101")); - this.DropRecipientClasses.Items.Add (new ListItem ("Volunteers", "102")); + this.DropRecipientClasses.Items.Add (new ListItem (Global.Global_Officer_Plural, "101")); + this.DropRecipientClasses.Items.Add (new ListItem (Global.Global_Volunteer_Plural, "102")); this.ButtonSend.Text = Resources.Pages.Comms.SendMassMessage_SendMessage; this.ButtonTest.Text = Resources.Pages.Comms.SendMassMessage_TestMessage; diff --git a/Site/Pages/v5/Comms/SendMassMessage.aspx.designer.cs b/Site/Pages/v5/Comms/SendMassMessage.aspx.designer.cs index 6731e457..7c43b59f 100644 --- a/Site/Pages/v5/Comms/SendMassMessage.aspx.designer.cs +++ b/Site/Pages/v5/Comms/SendMassMessage.aspx.designer.cs @@ -19,7 +19,7 @@ namespace Swarmops.Frontend.Pages.Comms { /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.DropDownList DropRecipientClasses; + protected global::Swarmops.Frontend.Controls.Base.DropDown DropRecipientClasses; /// /// ComboGeographies control.