Changed loc convention (this removes a JS warning)
This commit is contained in:
@@ -407,6 +407,7 @@ namespace Swarmops.Frontend
|
||||
|
||||
// Localized strings for accessing from aspx page
|
||||
|
||||
// ReSharper disable once InconsistentNaming
|
||||
public string Localized_LoadingPlaceholderShort
|
||||
{
|
||||
get { return CommonV5.JavascriptEscape (Resources.Global.Global_LoadingPlaceholderShort); }
|
||||
|
||||
@@ -30,25 +30,25 @@
|
||||
function validateFields() {
|
||||
var isValid = true;
|
||||
|
||||
isValid = validateTextField('#<%=this.TextAccount.ClientID %>', "<asp:Literal runat="server" ID="LiteralErrorBankAccount" />") && isValid;
|
||||
isValid = validateTextField('#<%=this.TextClearing.ClientID %>', "<asp:Literal runat="server" ID="LiteralErrorBankClearing" />") && isValid;
|
||||
isValid = validateTextField('#<%=this.TextBank.ClientID %>', "<asp:Literal runat="server" ID="LiteralErrorBankName" />") && isValid;
|
||||
isValid = validateTextField('#<%=this.TextAccount.ClientID %>', SwarmopsJS.unescape('<%= this.Localized_ValidationError_BankAccount %>')) && isValid;
|
||||
isValid = validateTextField('#<%=this.TextClearing.ClientID %>', SwarmopsJS.unescape('<%= this.Localized_ValidationError_BankClearing %>')) && isValid;
|
||||
isValid = validateTextField('#<%=this.TextBank.ClientID %>', SwarmopsJS.unescape('<%= this.Localized_ValidationError_BankName %>')) && isValid;
|
||||
|
||||
if ($('#<%=this.ComboBudgets.ClientID %>_DropBudgets').combotree('tree').tree('getSelected') == null) {
|
||||
isValid = false;
|
||||
$('#<%=this.ComboBudgets.ClientID %>_SpanBudgets').addClass("entryError");
|
||||
alertify.error("<asp:Literal runat="server" ID="LiteralErrorBudget" />");
|
||||
alertify.error(SwarmopsJS.unescape('<%= this.Localized_ValidationError_Budget %>'));
|
||||
}
|
||||
|
||||
<asp:Repeater ID="RepeaterErrorCheckTags" runat="server"><ItemTemplate>
|
||||
if ($('#DropTags<%# Eval("TagSetId") %>').combotree('tree').tree('getSelected') == null) {
|
||||
isValid = false;
|
||||
$('#SpanDropTags<%# Eval("TagSetId") %>').addClass("entryError");
|
||||
alertify.error('<%=Resources.Pages.Financial.FileExpenseClaim_ValidationError_MissingTag.Replace("'", "''") %>');
|
||||
alertify.error(SwarmopsJS.unescape('<%=this.Localized_ValidationError_MissingTag %>'));
|
||||
}
|
||||
</ItemTemplate></asp:Repeater>
|
||||
|
||||
isValid = validateTextField('#<%=this.TextPurpose.ClientID %>', "<asp:Literal runat="server" ID="LiteralErrorPurpose" />") && isValid;
|
||||
isValid = validateTextField('#<%=this.TextPurpose.ClientID %>', SwarmopsJS.unescape('<%= this.Localized_ValidationError_Purpose %>')) && isValid;
|
||||
|
||||
var jsonData = {};
|
||||
jsonData.amount = $('#<%=this.CurrencyAmount.ClientID %>_Input').val();
|
||||
@@ -64,7 +64,7 @@
|
||||
if (msg.d != true) {
|
||||
isValid = false;
|
||||
$('#<%=this.CurrencyAmount.ClientID %>_Input').addClass("entryError");
|
||||
alertify.error("<asp:Literal runat="server" ID="LiteralErrorAmount" />");
|
||||
alertify.error(SwarmopsJS.unescape('<%= this.Localized_ValidationError_Amount %>'));
|
||||
$('#<%=this.CurrencyAmount.ClientID %>_Input').focus();
|
||||
}
|
||||
}
|
||||
@@ -81,7 +81,7 @@
|
||||
if (msg.d != true) {
|
||||
isValid = false;
|
||||
$('#TextAmount').addClass("entryError");
|
||||
alertify.error("<asp:Literal runat="server" ID="LiteralErrorDocuments" />");
|
||||
alertify.error(SwarmopsJS.unescape('<%= this.Localized_ValidationError_Documents %>'));
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
@@ -128,15 +128,6 @@ namespace Swarmops.Frontend.Pages.v5.Financial
|
||||
this.LabelBankAccount.Text = Resources.Pages.Financial.FileExpenseClaim_BankAccount;
|
||||
this.LabelHeaderImageFiles.Text = Resources.Pages.Financial.FileExpenseClaim_HeaderReceiptImages;
|
||||
this.LabelImageFiles.Text = Resources.Pages.Financial.FileExpenseClaim_UploadRecieptImages;
|
||||
|
||||
this.LiteralErrorAmount.Text = Resources.Pages.Financial.FileExpenseClaim_ValidationError_Amount;
|
||||
this.LiteralErrorPurpose.Text = Resources.Pages.Financial.FileExpenseClaim_ValidationError_Purpose;
|
||||
this.LiteralErrorBudget.Text = Resources.Pages.Financial.RequestCashAdvance_ValidationError_Budget;
|
||||
this.LiteralErrorBankName.Text = Resources.Pages.Financial.RequestCashAdvance_ValidationError_BankName;
|
||||
this.LiteralErrorBankClearing.Text =
|
||||
Resources.Pages.Financial.RequestCashAdvance_ValidationError_BankClearing;
|
||||
this.LiteralErrorBankAccount.Text = Resources.Pages.Financial.RequestCashAdvance_ValidationError_BankAccount;
|
||||
this.LiteralErrorDocuments.Text = Resources.Pages.Financial.FileExpenseClaim_ValidationError_Documents;
|
||||
}
|
||||
|
||||
|
||||
@@ -226,5 +217,51 @@ namespace Swarmops.Frontend.Pages.v5.Financial
|
||||
public int TagSetId { get; set; }
|
||||
public string TagSetLocalizedName { get; set; }
|
||||
}
|
||||
|
||||
|
||||
// ASPX localizations
|
||||
|
||||
|
||||
// ReSharper disable InconsistentNaming
|
||||
public string Localized_ValidationError_MissingTag
|
||||
{
|
||||
get { return JavascriptEscape(Resources.Pages.Financial.FileExpenseClaim_ValidationError_MissingTag); }
|
||||
}
|
||||
|
||||
public string Localized_ValidationError_BankAccount
|
||||
{
|
||||
get { return JavascriptEscape(Resources.Pages.Financial.RequestCashAdvance_ValidationError_BankAccount); }
|
||||
}
|
||||
|
||||
public string Localized_ValidationError_BankClearing
|
||||
{
|
||||
get { return JavascriptEscape(Resources.Pages.Financial.RequestCashAdvance_ValidationError_BankClearing); }
|
||||
}
|
||||
|
||||
public string Localized_ValidationError_BankName
|
||||
{
|
||||
get { return JavascriptEscape(Resources.Pages.Financial.RequestCashAdvance_ValidationError_BankName); }
|
||||
}
|
||||
|
||||
public string Localized_ValidationError_Purpose
|
||||
{
|
||||
get { return JavascriptEscape(Resources.Pages.Financial.FileExpenseClaim_ValidationError_Purpose); }
|
||||
}
|
||||
|
||||
public string Localized_ValidationError_Budget
|
||||
{
|
||||
get { return JavascriptEscape(Resources.Pages.Financial.RequestCashAdvance_ValidationError_Budget); }
|
||||
}
|
||||
|
||||
public string Localized_ValidationError_Amount
|
||||
{
|
||||
get { return JavascriptEscape(Resources.Pages.Financial.FileExpenseClaim_ValidationError_Amount); }
|
||||
}
|
||||
|
||||
public string Localized_ValidationError_Documents
|
||||
{
|
||||
get { return JavascriptEscape(Resources.Pages.Financial.FileExpenseClaim_ValidationError_Documents); }
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
@@ -21,42 +21,6 @@ namespace Swarmops.Frontend.Pages.v5.Financial {
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.Repeater RepeaterTagDropScript;
|
||||
|
||||
/// <summary>
|
||||
/// LiteralErrorBankAccount 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 LiteralErrorBankAccount;
|
||||
|
||||
/// <summary>
|
||||
/// LiteralErrorBankClearing 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 LiteralErrorBankClearing;
|
||||
|
||||
/// <summary>
|
||||
/// LiteralErrorBankName 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 LiteralErrorBankName;
|
||||
|
||||
/// <summary>
|
||||
/// LiteralErrorBudget 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 LiteralErrorBudget;
|
||||
|
||||
/// <summary>
|
||||
/// RepeaterErrorCheckTags control.
|
||||
/// </summary>
|
||||
@@ -66,33 +30,6 @@ namespace Swarmops.Frontend.Pages.v5.Financial {
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.Repeater RepeaterErrorCheckTags;
|
||||
|
||||
/// <summary>
|
||||
/// LiteralErrorPurpose 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 LiteralErrorPurpose;
|
||||
|
||||
/// <summary>
|
||||
/// LiteralErrorAmount 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 LiteralErrorAmount;
|
||||
|
||||
/// <summary>
|
||||
/// LiteralErrorDocuments 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 LiteralErrorDocuments;
|
||||
|
||||
/// <summary>
|
||||
/// BoxTitle control.
|
||||
/// </summary>
|
||||
|
||||
Reference in New Issue
Block a user