Changed loc convention (this removes a JS warning)

This commit is contained in:
Rick Falkvinge
2016-10-01 17:23:14 +02:00
parent 1a97d1baa2
commit 4cdd0d11bc
3 changed files with 36 additions and 56 deletions
+5 -5
View File
@@ -149,17 +149,17 @@
if (msg.d != true) {
isValid = false;
$('#<%= TextDateOfBirth.ClientID %>').addClass("entryError");
alertify.error("<asp:Literal runat="server" ID="LiteralErrorDate" />");
alertify.error(SwarmopsJS.unescape('<%= this.Localized_ErrorDate %>'));
$('#<%=this.TextDateOfBirth.ClientID %>').focus();
}
}
});
}
isValid = ValidateTextField('#<%= TextCity.ClientID %>', "<asp:Literal runat="server" ID="LiteralErrorCity" />") && isValid;
isValid = ValidateTextField('#<%= TextStreet1.ClientID %>', "<asp:Literal runat="server" ID="LiteralErrorStreet" />") && isValid;
isValid = ValidateTextField('#<%= TextMail.ClientID %>', "<asp:Literal runat="server" ID="LiteralErrorMail" />") && isValid;
isValid = ValidateTextField('#<%= TextName.ClientID %>', "<asp:Literal runat="server" ID="LiteralErrorName" />") && isValid; // TODO: Actually validate geography?
isValid = ValidateTextField('#<%= TextCity.ClientID %>', SwarmopsJS.unescape('<%= this.Localized_ErrorCity %>')) && isValid;
isValid = ValidateTextField('#<%= TextStreet1.ClientID %>', SwarmopsJS.unescape('<%= this.Localized_ErrorStreet %>')) && isValid;
isValid = ValidateTextField('#<%= TextMail.ClientID %>', SwarmopsJS.unescape('<%= this.Localized_ErrorMail %>')) && isValid;
isValid = ValidateTextField('#<%= TextName.ClientID %>', SwarmopsJS.unescape('<%= this.Localized_ErrorName %>')) && isValid; // TODO: Actually validate geography?
return isValid;
}
+31 -6
View File
@@ -67,12 +67,6 @@ namespace Swarmops.Frontend.Pages.v5.Swarm
private void Localize()
{
this.LiteralErrorCity.Text = Resources.Pages.Swarm.AddPerson_ErrorCity;
this.LiteralErrorMail.Text = Resources.Pages.Swarm.AddPerson_ErrorMail;
this.LiteralErrorName.Text = Resources.Pages.Swarm.AddPerson_ErrorName;
this.LiteralErrorStreet.Text = Resources.Pages.Swarm.AddPerson_ErrorStreet;
this.LiteralErrorDate.Text = Resources.Pages.Swarm.AddPerson_ErrorDate;
this.LabelName.Text = Resources.Global.Global_Name;
this.LabelCountry.Text = Resources.Global.Global_Country;
this.LabelMail.Text = Resources.Global.Global_Mail;
@@ -139,5 +133,36 @@ namespace Swarmops.Frontend.Pages.v5.Swarm
this.TextName.Focus();
this.LiteralLoadAlert.Text = Resources.Pages.Swarm.AddPerson_PersonSuccessfullyRegistered;
}
// ReSharper disable once InconsistentNaming
public string Localized_ErrorDate
{
get { return JavascriptEscape(Resources.Pages.Swarm.AddPerson_ErrorDate); }
}
// ReSharper disable once InconsistentNaming
public string Localized_ErrorMail
{
get { return JavascriptEscape(Resources.Pages.Swarm.AddPerson_ErrorMail); }
}
// ReSharper disable once InconsistentNaming
public string Localized_ErrorCity
{
get { return JavascriptEscape(Resources.Pages.Swarm.AddPerson_ErrorCity); }
}
// ReSharper disable once InconsistentNaming
public string Localized_ErrorStreet
{
get { return JavascriptEscape(Resources.Pages.Swarm.AddPerson_ErrorStreet); }
}
// ReSharper disable once InconsistentNaming
public string Localized_ErrorName
{
get { return JavascriptEscape(Resources.Pages.Swarm.AddPerson_ErrorName); }
}
}
}
-45
View File
@@ -12,51 +12,6 @@ namespace Swarmops.Frontend.Pages.v5.Swarm {
public partial class AddPerson {
/// <summary>
/// LiteralErrorDate control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Literal LiteralErrorDate;
/// <summary>
/// LiteralErrorCity control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Literal LiteralErrorCity;
/// <summary>
/// LiteralErrorStreet control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Literal LiteralErrorStreet;
/// <summary>
/// LiteralErrorMail control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Literal LiteralErrorMail;
/// <summary>
/// LiteralErrorName control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Literal LiteralErrorName;
/// <summary>
/// LiteralLoadAlert control.
/// </summary>