1

TightWiki.Models/ViewModels/Profile/AccountProfileAccountViewModel.cs

@@ -5,44 +5,44 @@ namespace TightWiki.Models.ViewModels.Profile
 {
     public partial class AccountProfileAccountViewModel
     {
-        [Display(Name = "Theme")]
+        [Display(Name = "主题")]
         public string? Theme { get; set; } = string.Empty;
 
         [Required(ErrorMessage = "UserId is required")]
         public Guid UserId { get; set; }
 
-        [Display(Name = "Email Address")]
+        [Display(Name = "邮箱")]
         public string EmailAddress { get; set; } = string.Empty;
 
-        [Display(Name = "Account Name")]
+        [Display(Name = "账号")]
         [Required(ErrorMessage = "Account Name is required")]
         public string AccountName { get; set; } = string.Empty;
 
         public string Navigation { get; set; } = string.Empty;
 
-        [Display(Name = "First Name")]
+        [Display(Name = "名")]
         public string? FirstName { get; set; }
 
-        [Display(Name = "Last Name")]
+        [Display(Name = "姓")]
         public string? LastName { get; set; } = string.Empty;
 
-        [Display(Name = "Time-Zone")]
+        [Display(Name = "时区")]
         [Required(ErrorMessage = "TimeZone is required")]
         public string TimeZone { get; set; } = string.Empty;
 
-        [Display(Name = "Country")]
+        [Display(Name = "国家")]
         [Required(ErrorMessage = "Country is required")]
         public string Country { get; set; } = string.Empty;
 
-        [Display(Name = "Language")]
+        [Display(Name = "语言")]
         [Required(ErrorMessage = "Language is required")]
         public string Language { get; set; } = string.Empty;
 
-        [Display(Name = "Biography")]
+        [Display(Name = "个人简介")]
         public string? Biography { get; set; } = string.Empty;
 
         [Display(Name = "Email Confirmed?")]
-        public bool EmailConfirmed { get; set; }
+        public bool EmailConfirmed { get; set; } = true;
 
         public byte[]? Avatar { get; set; }
 
@@ -52,6 +52,7 @@ namespace TightWiki.Models.ViewModels.Profile
         public int PaginationPageSize { get; set; }
         public int PaginationPageCount { get; set; }
 
+        [Display(Name = "角色")]
         public string? Role { get; set; } = string.Empty;
 
         public static AccountProfileAccountViewModel FromDataModel(AccountProfile model)

TightWiki/Views/Profile/My.cshtml

@@ -65,18 +65,6 @@
                 </div>
             </div>
 
-            <div class="form-group row">
-                <div class="col-sm-12">
-                    <div class="text-danger">@Html.ValidationMessageFor(m => m.AccountProfile.FirstName)</div>
-                </div>
-            </div>
-            <div class="form-group row mb-1">
-                <label for="FirstName" class="col-sm-2 col-form-label"><strong>@Html.LabelFor(m => m.AccountProfile.FirstName)</strong></label>
-                <div class="col-sm-10">
-                    @Html.TextBoxFor(m => m.AccountProfile.FirstName, new { @class = "form-control" })
-                </div>
-            </div>
-
             <div class="form-group row">
                 <div class="col-sm-12">
                     <div class="text-danger">@Html.ValidationMessageFor(m => m.AccountProfile.LastName)</div>
@@ -89,6 +77,19 @@
                 </div>
             </div>
 
+
+            <div class="form-group row">
+                <div class="col-sm-12">
+                    <div class="text-danger">@Html.ValidationMessageFor(m => m.AccountProfile.FirstName)</div>
+                </div>
+            </div>
+            <div class="form-group row mb-1">
+                <label for="FirstName" class="col-sm-2 col-form-label"><strong>@Html.LabelFor(m => m.AccountProfile.FirstName)</strong></label>
+                <div class="col-sm-10">
+                    @Html.TextBoxFor(m => m.AccountProfile.FirstName, new { @class = "form-control" })
+                </div>
+            </div>
+
             <div class="form-group row">
                 <div class="col-sm-12">
                     <div class="text-danger">@Html.ValidationMessageFor(m => m.AccountProfile.Role)</div>