Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.
C# aspnet-corecsharpdockerdotnetecommerceecommerce-platformmongodbmulti-storemulti-vendornosqlonline-shopshoppingcart
Update string resources
support4e5c913655e4
diff --git a/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml b/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xmlindex c20aab428..118337e4f 100644--- a/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml+++ b/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml@@ -57,6 +57,18 @@<Resource Name="Account.ChangePassword.Button" Area="Front"><Value>Change password</Value></Resource>+ <Resource Name="Account.ChangePassword.Errors.Deleted" Area="Front">+ <Value>Account is deleted</Value>+ </Resource>+ <Resource Name="Account.ChangePassword.Errors.LockedOut" Area="Front">+ <Value>Account is locked out</Value>+ </Resource>+ <Resource Name="Account.ChangePassword.Errors.NotActive" Area="Front">+ <Value>Account is not active</Value>+ </Resource>+ <Resource Name="Account.ChangePassword.Errors.NotRegistered" Area="Front">+ <Value>Account is not registered</Value>+ </Resource><Resource Name="Account.ChangePassword.Errors.EmailIsNotProvided" Area="Front"><Value>Email is not entered</Value></Resource>@@ -594,6 +606,12 @@<Resource Name="Account.PasswordRecovery.ConfirmNewPassword.Required" Area="Front"><Value>Password is required.</Value></Resource>+ <Resource Name="Account.PasswordRecovery.CustomerNotExist" Area="Front">+ <Value>No customer account found</Value>+ </Resource>+ <Resource Name="Account.PasswordRecovery.Deleted" Area="Front">+ <Value>Account is deleted</Value>+ </Resource><Resource Name="Account.PasswordRecovery.Email" Area="Front"><Value>Your email address</Value></Resource>@@ -609,6 +627,9 @@<Resource Name="Account.PasswordRecovery.LinkExpired" Area="Front"><Value>Your password recovery link is expired</Value></Resource>+ <Resource Name="Account.PasswordRecovery.LockedOut" Area="Front">+ <Value>Account is locked out</Value>+ </Resource><Resource Name="Account.PasswordRecovery.NewPassword" Area="Front"><Value>New password</Value></Resource>@@ -618,6 +639,12 @@<Resource Name="Account.PasswordRecovery.NewPassword.Required" Area="Front"><Value>New password is required.</Value></Resource>+ <Resource Name="Account.PasswordRecovery.NotActive" Area="Front">+ <Value>Account is not active</Value>+ </Resource>+ <Resource Name="Account.PasswordRecovery.NotRegistered" Area="Front">+ <Value>Account is not registered</Value>+ </Resource><Resource Name="Account.PasswordRecovery.OldPassword" Area="Front"><Value>Old password</Value></Resource>@@ -627,6 +654,9 @@<Resource Name="Account.PasswordRecovery.PasswordHasBeenChanged" Area="Front"><Value>Your password has been changed</Value></Resource>+ <Resource Name="Account.PasswordRecovery.PasswordMatchesWithPrevious" Area="Front">+ <Value>You entered the password that is the same as one of the last passwords you used. Please create a new password.</Value>+ </Resource><Resource Name="Account.PasswordRecovery.RecoverButton" Area="Front"><Value>Recover</Value></Resource>diff --git a/src/Web/Grand.Web/App_Data/Resources/Upgrade/en_210.xml b/src/Web/Grand.Web/App_Data/Resources/Upgrade/en_210.xmlindex 3bbb186fb..5e570560c 100644--- a/src/Web/Grand.Web/App_Data/Resources/Upgrade/en_210.xml+++ b/src/Web/Grand.Web/App_Data/Resources/Upgrade/en_210.xml@@ -12,4 +12,34 @@<Resource Name="vendor.reviews.empty" Area="Front"><Value>There are no reviews yet</Value></Resource>+ <Resource Name="Account.PasswordRecovery.Deleted" Area="Front">+ <Value>Account is deleted</Value>+ </Resource>+ <Resource Name="Account.PasswordRecovery.LockedOut" Area="Front">+ <Value>Account is locked out</Value>+ </Resource>+ <Resource Name="Account.PasswordRecovery.NotActive" Area="Front">+ <Value>Account is not active</Value>+ </Resource>+ <Resource Name="Account.PasswordRecovery.CustomerNotExist" Area="Front">+ <Value>No customer account found</Value>+ </Resource>+ <Resource Name="Account.PasswordRecovery.NotRegistered" Area="Front">+ <Value>Account is not registered</Value>+ </Resource>+ <Resource Name="Account.PasswordRecovery.PasswordMatchesWithPrevious" Area="Front">+ <Value>You entered the password that is the same as one of the last passwords you used. Please create a new password.</Value>+ </Resource>+ <Resource Name="Account.ChangePassword.Errors.Deleted" Area="Front">+ <Value>Account is deleted</Value>+ </Resource>+ <Resource Name="Account.ChangePassword.Errors.LockedOut" Area="Front">+ <Value>Account is locked out</Value>+ </Resource>+ <Resource Name="Account.ChangePassword.Errors.NotActive" Area="Front">+ <Value>Account is not active</Value>+ </Resource>+ <Resource Name="Account.ChangePassword.Errors.NotRegistered" Area="Front">+ <Value>Account is not registered</Value>+ </Resource></Language>\ No newline at end of filediff --git a/src/Web/Grand.Web/Validators/Customer/ChangePasswordValidator.cs b/src/Web/Grand.Web/Validators/Customer/ChangePasswordValidator.csindex cbc65d289..d90c4af0b 100644--- a/src/Web/Grand.Web/Validators/Customer/ChangePasswordValidator.cs+++ b/src/Web/Grand.Web/Validators/Customer/ChangePasswordValidator.cs@@ -48,20 +48,20 @@ namespace Grand.Web.Validators.Customerbreak;case { Deleted: true }:context.AddFailure(- translationService.GetResource("Account.ChangePassword.Errors.CustomerDeleted"));+ translationService.GetResource("Account.ChangePassword.Errors.Deleted"));break;case { Active: false }:context.AddFailure(- translationService.GetResource("Account.ChangePassword.Errors.Customer.CustomerNotActive"));+ translationService.GetResource("Account.ChangePassword.Errors.NotActive"));break;case { CannotLoginUntilDateUtc: { } } when customer.CannotLoginUntilDateUtc.Value > DateTime.UtcNow:context.AddFailure(- translationService.GetResource("Account.ChangePassword.Errors.Customer.CustomerLockedOut"));+ translationService.GetResource("Account.ChangePassword.Errors.LockedOut"));break;case { } when !await groupService.IsRegistered(customer):context.AddFailure(translationService.GetResource(- "Account.ChangePassword.Errors.Customer.CustomerNotRegistered"));+ "Account.ChangePassword.Errors.NotRegistered"));break;}diff --git a/src/Web/Grand.Web/Validators/Customer/PasswordRecoveryConfirmValidator.cs b/src/Web/Grand.Web/Validators/Customer/PasswordRecoveryConfirmValidator.csindex 0e78306aa..b022dd16d 100644--- a/src/Web/Grand.Web/Validators/Customer/PasswordRecoveryConfirmValidator.cs+++ b/src/Web/Grand.Web/Validators/Customer/PasswordRecoveryConfirmValidator.cs@@ -72,7 +72,7 @@ namespace Grand.Web.Validators.Customerx.NewPassword, password.PasswordSalt));if (newPasswordMatchesWithPrevious){- context.AddFailure(translationService.GetResource("Account.ChangePassword.PasswordMatchesWithPrevious"));+ context.AddFailure(translationService.GetResource("Account.PasswordRecovery.PasswordMatchesWithPrevious"));}}});