diff --git a/modules/account/src/Volo.Abp.Account.Web/Localization/Resources/AbpAccount/Web/en.json b/modules/account/src/Volo.Abp.Account.Web/Localization/Resources/AbpAccount/Web/en.json
index 284cc5584f..1055309b22 100644
--- a/modules/account/src/Volo.Abp.Account.Web/Localization/Resources/AbpAccount/Web/en.json
+++ b/modules/account/src/Volo.Abp.Account.Web/Localization/Resources/AbpAccount/Web/en.json
@@ -10,6 +10,13 @@
"UserLockedOutMessage": "The user account has been locked out due to invalid login attempts. Please wait a while and try again.",
"InvalidUserNameOrPassword": "Invalid username or password!",
"LoginIsNotAllowed": "You are not allowed to login! You need to confirm your email/phone number.",
- "SelfRegistrationDisabledMessage": "Self user registration is disabled for this application. Contact to the application administrator to register a new user."
+ "SelfRegistrationDisabledMessage": "Self user registration is disabled for this application. Contact to the application administrator to register a new user.",
+ "Login": "Login",
+ "Cancel": "Cancel",
+ "Register": "Register",
+ "UseAnotherServiceToLogIn.": "Use another service to log in.",
+ "InvalidLoginRequest": "Invalid login request",
+ "ThereAreNoLoginSchemesConfiguredForThisClient": "There are no login schemes configured for this client.",
+ "LogInUsingYourProviderAccount": "Log in using your {0} account"
}
}
\ No newline at end of file
diff --git a/modules/account/src/Volo.Abp.Account.Web/Localization/Resources/AbpAccount/Web/pt-BR.json b/modules/account/src/Volo.Abp.Account.Web/Localization/Resources/AbpAccount/Web/pt-BR.json
index 45eb49d2ca..fec54c0476 100644
--- a/modules/account/src/Volo.Abp.Account.Web/Localization/Resources/AbpAccount/Web/pt-BR.json
+++ b/modules/account/src/Volo.Abp.Account.Web/Localization/Resources/AbpAccount/Web/pt-BR.json
@@ -10,6 +10,13 @@
"UserLockedOutMessage": "Esta conta de usuário está bloqueada devido a muitas tentativas de entrar. Por favor, espero alguns instantes e tente novamente.",
"InvalidUserNameOrPassword": "Usuário ou senha estão incorretos!",
"LoginIsNotAllowed": "Você não possui permissão para entrar! Você deveconfirmar seu e-mail ou número de telefone.",
- "SelfRegistrationDisabledMessage": "Não é permitido que você crie uma nova conta neste site. Contate um administrador para que ele crie uma conta para você."
+ "SelfRegistrationDisabledMessage": "Não é permitido que você crie uma nova conta neste site. Contate um administrador para que ele crie uma conta para você.",
+ "Login": "Entrar",
+ "Cancel": "Cancelar",
+ "Register": "Registrar-se",
+ "UseAnotherServiceToLogIn.": "Use outro serviço para entrar.",
+ "InvalidLoginRequest": "Requisição de acesso inválida!",
+ "ThereAreNoLoginSchemesConfiguredForThisClient": "Não existe um esquema de acesso para este usuário",
+ "LogInUsingYourProviderAccount": "Acessse utilizando sua conta {0}"
}
}
\ No newline at end of file
diff --git a/modules/account/src/Volo.Abp.Account.Web/Localization/Resources/AbpAccount/Web/tr.json b/modules/account/src/Volo.Abp.Account.Web/Localization/Resources/AbpAccount/Web/tr.json
index b56354053c..54ae7b0016 100644
--- a/modules/account/src/Volo.Abp.Account.Web/Localization/Resources/AbpAccount/Web/tr.json
+++ b/modules/account/src/Volo.Abp.Account.Web/Localization/Resources/AbpAccount/Web/tr.json
@@ -10,6 +10,13 @@
"UserLockedOutMessage": "Kullanıcı hesabı hatalı giriş denemeleri nedeniyle kilitlenmiştir. Lütfen bir süre bekleyip tekrar deneyin.",
"InvalidUserNameOrPassword": "Kullanıcı adı ya da şifre geçersiz!",
"LoginIsNotAllowed": "Giriş yapamazsınız! E-posta adresinizi ya da telefon numaranızı doğrulamanız gerekiyor.",
- "SelfRegistrationDisabledMessage": "Bu uygulama için kullanıcıların kendi kendilerine kaydolmaları engellenmiştir. Yeni bir kullanıcı kaydetmek için lütfen uygulama yöneticisi ile iletişime geçin."
+ "SelfRegistrationDisabledMessage": "Bu uygulama için kullanıcıların kendi kendilerine kaydolmaları engellenmiştir. Yeni bir kullanıcı kaydetmek için lütfen uygulama yöneticisi ile iletişime geçin.",
+ "Login": "Login",
+ "Cancel": "Cancel",
+ "Register": "Register",
+ "UseAnotherServiceToLogIn.": "Use another service to log in.",
+ "InvalidLoginRequest": "Invalid login request",
+ "ThereAreNoLoginSchemesConfiguredForThisClient": "There are no login schemes configured for this client.",
+ "LogInUsingYourProviderAccount": "Log in using your {0} account"
}
}
\ No newline at end of file
diff --git a/modules/account/src/Volo.Abp.Account.Web/Localization/Resources/AbpAccount/Web/zh-Hans.json b/modules/account/src/Volo.Abp.Account.Web/Localization/Resources/AbpAccount/Web/zh-Hans.json
index b019757f83..fdaa5ff228 100644
--- a/modules/account/src/Volo.Abp.Account.Web/Localization/Resources/AbpAccount/Web/zh-Hans.json
+++ b/modules/account/src/Volo.Abp.Account.Web/Localization/Resources/AbpAccount/Web/zh-Hans.json
@@ -1,15 +1,22 @@
{
- "culture": "zh-Hans",
- "texts": {
- "UserName": "用户名称",
- "EmailAddress": "邮箱地址",
- "UserNameOrEmailAddress": "用户名称或邮箱地址",
- "Password": "密码",
- "RememberMe": "记住我",
- "UseAnotherServiceToLogin": "使用另一个服务登录",
- "UserLockedOutMessage": "登录失败,用户账户已被锁定.请稍后再试.",
- "InvalidUserNameOrPassword": "用户名或密码错误!",
- "LoginIsNotAllowed": "无法登录!你需要验证邮箱地址/手机号.",
- "SelfRegistrationDisabledMessage": "应用程序未开放注册,请联系管理员添加新用户."
- }
+ "culture": "zh-Hans",
+ "texts": {
+ "UserName": "用户名称",
+ "EmailAddress": "邮箱地址",
+ "UserNameOrEmailAddress": "用户名称或邮箱地址",
+ "Password": "密码",
+ "RememberMe": "记住我",
+ "UseAnotherServiceToLogin": "使用另一个服务登录",
+ "UserLockedOutMessage": "登录失败,用户账户已被锁定.请稍后再试.",
+ "InvalidUserNameOrPassword": "用户名或密码错误!",
+ "LoginIsNotAllowed": "无法登录!你需要验证邮箱地址/手机号.",
+ "SelfRegistrationDisabledMessage": "应用程序未开放注册,请联系管理员添加新用户.",
+ "Login": "Login",
+ "Cancel": "Cancel",
+ "Register": "Register",
+ "UseAnotherServiceToLogIn.": "Use another service to log in.",
+ "InvalidLoginRequest": "Invalid login request",
+ "ThereAreNoLoginSchemesConfiguredForThisClient": "There are no login schemes configured for this client.",
+ "LogInUsingYourProviderAccount": "Log in using your {0} account"
}
+}
diff --git a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml
index 81c29c0fb6..69268afed3 100644
--- a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml
+++ b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml
@@ -1,6 +1,7 @@
@page
@using Volo.Abp.Account.Web.Settings
@model Volo.Abp.Account.Web.Pages.Account.LoginModel
+@inherits Volo.Abp.Account.Web.Pages.Account.AccountPage
@inject Volo.Abp.Settings.ISettingManager SettingManager
@if (Model.EnableLocalLogin)
{
@@ -23,14 +24,14 @@
@Html.DisplayNameFor(m => m.LoginInput.RememberMe)
-