Merge remote-tracking branch 'origin/master'

framework/src/Volo.Abp.Localization/Volo/Abp/Localization/AbpDictionaryBasedStringLocalizer.cs

@@ -206,7 +206,7 @@ namespace Volo.Abp.Localization
 
             public IEnumerable<LocalizedString> GetAllStrings(bool includeParentCultures, bool includeBaseLocalizers)
             {
-                return _innerLocalizer.GetAllStrings(includeParentCultures, includeBaseLocalizers);
+                return _innerLocalizer.GetAllStrings(_cultureName, includeParentCultures, includeBaseLocalizers);
             }
         }
     }

modules/account/src/Volo.Abp.Account.Web/Localization/Resources/AbpAccount/Web/zh-Hans.json

@@ -11,12 +11,12 @@
     "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"
+    "Login": "登录",
+    "Cancel": "取消",
+    "Register": "注册",
+    "UseAnotherServiceToLogIn.": "使用其他服务登录.",
+    "InvalidLoginRequest": "登录请求无效",
+    "ThereAreNoLoginSchemesConfiguredForThisClient": "没有为此客户端配置登录方案.",
+    "LogInUsingYourProviderAccount": "使用您的{0}帐户登录"
   }
 }

modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Localization/Resources/Docs/ApplicationContracts/zh-Hans.json

@@ -0,0 +1,10 @@
+{
+    "culture": "zh-Hans",
+    "texts": {
+      "Permission:DocumentManagement": "文档管理",
+      "Permission:Projects": "项目",
+      "Permission:Edit": "编辑",
+      "Permission:Delete": "删除",
+      "Permission:Create": "创建"
+    }
+  }

modules/docs/src/Volo.Docs.Admin.Web/Localization/Resources/Docs/Web/zh-Hans.json

@@ -0,0 +1,26 @@
+{
+    "culture": "zh-Hans",
+    "texts": {
+      "Menu:DocumentManagement": "文档",
+      "Menu:ProjectManagement": "项目",
+      "CreateANewProject": "创建新项目",
+      "Edit": "编辑",
+      "Create": "创建",
+      "Projects": "项目",
+      "Name": "名称",
+      "ShortName": "简称",
+      "DocumentStoreType": "文件存储类型",
+      "Format": "格式",
+      "ShortNameInfoText": "将用于唯一的URL.",
+      "DisplayName:Name": "名称",
+      "DisplayName:ShortName": "简称",
+      "DisplayName:Format": "格式",
+      "DisplayName:DefaultDocumentName": "默认文档名称",
+      "DisplayName:NavigationDocumentName": "导航文档名称",
+      "DisplayName:MinimumVersion": "最低版本",
+      "DisplayName:MainWebsiteUrl": "主网站网址",
+      "DisplayName:LatestVersionBranchName": "最新版本的分支名称",
+      "DisplayName:GitHubRootUrl": "GitHub根网址",
+      "DisplayName:GitHubAccessToken": "GitHub访问令牌"
+    }
+  }

modules/docs/src/Volo.Docs.Domain/Volo/Docs/Localization/Domain/zh-Hans.json

@@ -2,14 +2,17 @@
   "culture": "zh-Hans",
   "texts": {
     "Documents": "文档",
-    "BackToWebsite": "返回网站",
+    "BackToWebsite": "返回主网站",
+    "Contributors": "贡献者",
+    "ShareOn": "分享到",
     "Version": "版本",
     "Edit": "编辑",
-    "InThisDocument": "在这个文档中",
-    "GoToTop": "返回顶部",
+    "Delete": "删除",
+    "InThisDocument": "在本文中",
+    "GoToTop": "到顶部",
     "Projects": "项目",
-    "NoProjectWarning": "当前并没有项目!",
-    "DocumentNotFound": "抱歉,您请求的文档不存在!",
-    "NavigationDocumentNotFound": "此版本并没有导航文档!"
+    "NoProjectWarning": "还没有项目!",
+    "DocumentNotFound": "找不到请求的文档!",
+    "NavigationDocumentNotFound": "这个版本没有导航文件!"
   }
 }

modules/identity/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/Localization/ApplicationContracts/zh-Hans.json

@@ -1,12 +1,14 @@
 {
     "culture": "zh-Hans",
     "texts": {
-      "Permission:IdentityManagement": "身份认证管理",
+      "Volo.Abp.Identity:010001": "您无法删除自己的帐户!",
+      "Permission:IdentityManagement": "身份标识管理",
       "Permission:RoleManagement": "角色管理",
       "Permission:Create": "创建",
       "Permission:Edit": "编辑",
       "Permission:Delete": "删除",
       "Permission:ChangePermissions": "更改权限",
-      "Permission:UserManagement": "用户管理"
+      "Permission:UserManagement": "用户管理",
+      "Permission:UserLookup": "用户查询"
     }
   }

modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/IdentityUserAppService.cs

@@ -80,7 +80,7 @@ namespace Volo.Abp.Identity
         [Authorize(IdentityPermissions.Users.Delete)]
         public async Task DeleteAsync(Guid id)
         {
-            if (CurrentUser.Id.Value == id)
+            if (CurrentUser.Id == id)
             {
                 throw new BusinessException(code: IdentityErrorCodes.UserSelfDeletion);
             }

modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Localization/Resources/AbpPermissionManagement/zh-Hans.json

@@ -1,6 +1,8 @@
 {
     "culture": "zh-Hans",
     "texts": {
-      "Permissions": "权限"
+      "Permissions": "权限",
+      "OnlyProviderPermissons": "只有这个提供商",
+      "All": "所有"
     }
   }

modules/setting-management/src/Volo.Abp.SettingManagement.Web/Localization/Resources/AbpSettingManagement/zh-Hans.json

@@ -0,0 +1,6 @@
+{
+    "culture": "zh-Hans",
+    "texts": {
+      "Settings": "设置"
+    }
+  }