Union/ProjectLighthouse
1
0
Fork 0
mirror of https://github.com/LBPUnion/ProjectLighthouse.git synced 2025-07-29 16:38:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Translate errors in forms

Browse source
This commit is contained in:
jvyden 2022-08-01 18:09:12 -04:00
commit d9e299ac00
No known key found for this signature in database
GPG key ID: 18BCF2BE0262B278
43 changed files with 939 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ProjectLighthouse.Servers.Website/Pages/LoginForm.cshtml.cs
View file

@ -3,6 +3,7 @@ using JetBrains.Annotations;
using LBPUnion.ProjectLighthouse.Configuration;
using LBPUnion.ProjectLighthouse.Extensions;
using LBPUnion.ProjectLighthouse.Helpers;
using LBPUnion.ProjectLighthouse.Localization.StringLists;
using LBPUnion.ProjectLighthouse.Logging;
using LBPUnion.ProjectLighthouse.PlayerData;
using LBPUnion.ProjectLighthouse.PlayerData.Profiles;
@ -26,19 +27,19 @@ public class LoginForm : BaseLayout
{
if (string.IsNullOrWhiteSpace(username))
{
this.Error = "The username field is required.";
this.Error = this.Translate(ErrorStrings.UsernameInvalid);
return this.Page();
}
if (string.IsNullOrWhiteSpace(password))
{
this.Error = "The password field is required.";
this.Error = this.Translate(ErrorStrings.PasswordInvalid);
return this.Page();
}
if (!await this.Request.CheckCaptchaValidity())
{
this.Error = "You must complete the captcha correctly.";
this.Error = this.Translate(ErrorStrings.CaptchaFailed);
return this.Page();
}
@ -60,7 +61,7 @@ public class LoginForm : BaseLayout
if (user.Banned)
{
Logger.Warn($"User {user.Username} (id: {user.UserId}) failed to login on web due to being banned", LogArea.Login);
this.Error = "You have been banned. Please contact an administrator for more information.\nReason: " + user.BannedReason;
this.Error = this.Translate(ErrorStrings.UserIsBanned, user.BannedReason);
return this.Page();
}

2
ProjectLighthouse.Servers.Website/Pages/PasswordResetRequestForm.cshtml
View file

@ -21,7 +21,7 @@
{
<div class="ui positive message">
<div class="header">
Success!
@Model.Translate(GeneralStrings.Success)
</div>
<p style="white-space: pre-line">@Model.Status</p>
</div>

19
ProjectLighthouse.Servers.Website/Pages/RegisterForm.cshtml.cs
View file

@ -3,6 +3,7 @@ using JetBrains.Annotations;
using LBPUnion.ProjectLighthouse.Configuration;
using LBPUnion.ProjectLighthouse.Extensions;
using LBPUnion.ProjectLighthouse.Helpers;
using LBPUnion.ProjectLighthouse.Localization.StringLists;
using LBPUnion.ProjectLighthouse.PlayerData;
using LBPUnion.ProjectLighthouse.PlayerData.Profiles;
using LBPUnion.ProjectLighthouse.Servers.Website.Pages.Layouts;
@ -28,7 +29,7 @@ public class RegisterForm : BaseLayout
if (this.Request.Query.ContainsKey("token"))
{
if (!this.Database.IsRegistrationTokenValid(this.Request.Query["token"]))
return this.StatusCode(403, "Invalid Token");
return this.StatusCode(403, this.Translate(ErrorStrings.TokenInvalid));
}
else
{
@ -42,44 +43,44 @@ public class RegisterForm : BaseLayout
if (string.IsNullOrWhiteSpace(username))
{
this.Error = "The username field is blank.";
this.Error = this.Translate(ErrorStrings.UsernameInvalid);
return this.Page();
}
if (string.IsNullOrWhiteSpace(password))
{
this.Error = "Password field is required.";
this.Error = this.Translate(ErrorStrings.PasswordInvalid);
return this.Page();
}
if (string.IsNullOrWhiteSpace(emailAddress) && ServerConfiguration.Instance.Mail.MailEnabled)
{
this.Error = "Email address field is required.";
this.Error = this.Translate(ErrorStrings.EmailInvalid);
return this.Page();
}
if (password != confirmPassword)
{
this.Error = "Passwords do not match!";
this.Error = this.Translate(ErrorStrings.PasswordDoesntMatch);
return this.Page();
}
if (await this.Database.Users.FirstOrDefaultAsync(u => u.Username.ToLower() == username.ToLower()) != null)
{
this.Error = "The username you've chosen is already taken.";
this.Error = this.Translate(ErrorStrings.UsernameTaken);
return this.Page();
}
if (ServerConfiguration.Instance.Mail.MailEnabled &&
await this.Database.Users.FirstOrDefaultAsync(u => u.EmailAddress != null && u.EmailAddress.ToLower() == emailAddress.ToLower()) != null)
{
this.Error = "The email address you've chosen is already taken.";
this.Error = this.Translate(ErrorStrings.EmailTaken);
return this.Page();
}
if (!await this.Request.CheckCaptchaValidity())
{
this.Error = "You must complete the captcha correctly.";
this.Error = this.Translate(ErrorStrings.CaptchaFailed);
return this.Page();
}
@ -117,7 +118,7 @@ public class RegisterForm : BaseLayout
if (this.Request.Query.ContainsKey("token"))
{
if (!this.Database.IsRegistrationTokenValid(this.Request.Query["token"]))
return this.StatusCode(403, "Invalid Token");
return this.StatusCode(403, this.Translate(ErrorStrings.TokenInvalid));
}
else
{