diff --git a/Data/config.db b/Data/config.db index 7e8611d..bfee38b 100644 Binary files a/Data/config.db and b/Data/config.db differ diff --git a/Data/statistics.db b/Data/statistics.db index 45eee08..dfb2d28 100644 Binary files a/Data/statistics.db and b/Data/statistics.db differ diff --git a/Data/users.db b/Data/users.db index 8203a0e..35d3fa5 100644 Binary files a/Data/users.db and b/Data/users.db differ diff --git a/TightWiki.Models/DataModels/Emoji.cs b/TightWiki.Models/DataModels/Emoji.cs index a45770a..24c12c9 100644 --- a/TightWiki.Models/DataModels/Emoji.cs +++ b/TightWiki.Models/DataModels/Emoji.cs @@ -1,8 +1,11 @@ -namespace TightWiki.Models.DataModels +using System.ComponentModel.DataAnnotations; + +namespace TightWiki.Models.DataModels { public class Emoji { public int Id { get; set; } + [Display(Name ="名称")] public string Name { get; set; } = string.Empty; public string Shortcut { get; set; } = string.Empty; public int PaginationPageCount { get; set; } diff --git a/TightWiki.Models/ViewModels/Admin/AccountProfileAccountViewModel.cs b/TightWiki.Models/ViewModels/Admin/AccountProfileAccountViewModel.cs index 3197c05..c12bdb2 100644 --- a/TightWiki.Models/ViewModels/Admin/AccountProfileAccountViewModel.cs +++ b/TightWiki.Models/ViewModels/Admin/AccountProfileAccountViewModel.cs @@ -5,42 +5,42 @@ namespace TightWiki.Models.ViewModels.Admin { public partial class AccountProfileAccountViewModel { - [Display(Name = "Theme")] + [Display(Name = "主题")] public string? Theme { get; set; } = string.Empty; public Guid UserId { get; set; } - [Display(Name = "Email Address")] - [Required(ErrorMessage = "Email address is required")] + [Display(Name = "Email")] + [Required(ErrorMessage = "邮箱地址为必填项")] public string EmailAddress { get; set; } = string.Empty; - [Display(Name = "Account Name")] - [Required(ErrorMessage = "Account name is required")] + [Display(Name = "账号")] + [Required(ErrorMessage = "账号为必填项")] public string AccountName { get; set; } = string.Empty; public string? Navigation { get; set; } = string.Empty; - [Display(Name = "First Name")] - public string? FirstName { get; set; } - - [Display(Name = "Last Name")] + [Display(Name = "姓")] public string? LastName { get; set; } = string.Empty; - [Display(Name = "Time-Zone")] - [Required(ErrorMessage = "TimeZone is required")] + [Display(Name = "名")] + public string? FirstName { get; set; } + + [Display(Name = "时区")] + [Required(ErrorMessage = "时区为必填项")] public string TimeZone { get; set; } = string.Empty; - [Display(Name = "Country")] - [Required(ErrorMessage = "Country is required")] + [Display(Name = "国家")] + [Required(ErrorMessage = "国家为必填项")] public string Country { get; set; } = string.Empty; - [Display(Name = "Language")] - [Required(ErrorMessage = "Language is required")] + [Display(Name = "语言")] + [Required(ErrorMessage = "语言为必填项")] public string Language { get; set; } = string.Empty; - [Display(Name = "Biography")] + [Display(Name = "个人简介")] public string? Biography { get; set; } = string.Empty; - [Display(Name = "Email Confirmed?")] + [Display(Name = "邮箱确认?")] public bool EmailConfirmed { get; set; } public byte[]? Avatar { get; set; } diff --git a/TightWiki.Models/ViewModels/Admin/AddEmojiViewModel.cs b/TightWiki.Models/ViewModels/Admin/AddEmojiViewModel.cs index ac54c39..2587011 100644 --- a/TightWiki.Models/ViewModels/Admin/AddEmojiViewModel.cs +++ b/TightWiki.Models/ViewModels/Admin/AddEmojiViewModel.cs @@ -1,10 +1,16 @@ -namespace TightWiki.Models.ViewModels.Admin +using System.ComponentModel.DataAnnotations; + +namespace TightWiki.Models.ViewModels.Admin { public class AddEmojiViewModel : ViewModelBase { public int Id { get; set; } + + [Display(Name ="名称")] public string Name { get; set; } = string.Empty; public string? OriginalName { get; set; } + + [Display(Name = "分类")] public string Categories { get; set; } = string.Empty; } } diff --git a/TightWiki.Models/ViewModels/Admin/EmojiViewModel.cs b/TightWiki.Models/ViewModels/Admin/EmojiViewModel.cs index d8c8e40..ea60b1c 100644 --- a/TightWiki.Models/ViewModels/Admin/EmojiViewModel.cs +++ b/TightWiki.Models/ViewModels/Admin/EmojiViewModel.cs @@ -1,4 +1,5 @@ -using TightWiki.Models.DataModels; +using System.ComponentModel.DataAnnotations; +using TightWiki.Models.DataModels; namespace TightWiki.Models.ViewModels.Admin { @@ -6,6 +7,7 @@ namespace TightWiki.Models.ViewModels.Admin { public Emoji Emoji { get; set; } = new(); public string OriginalName { get; set; } = string.Empty; + [Display(Name = "分类")] public string Categories { get; set; } = string.Empty; } } diff --git a/TightWiki/Views/Admin/Account.cshtml b/TightWiki/Views/Admin/Account.cshtml index e8975c0..3a57c13 100644 --- a/TightWiki/Views/Admin/Account.cshtml +++ b/TightWiki/Views/Admin/Account.cshtml @@ -6,11 +6,11 @@ }

- 账号 + 用户

- 设置您的账号

+ 账号设置

@@ -34,7 +34,7 @@ @Html.HiddenFor(m => m.AccountProfile.Navigation)
- +
@if (@Model.AccountProfile.Navigation != "") { @@ -51,7 +51,7 @@
@Html.ValidationMessageFor(m => m.AccountProfile.EmailAddress)
-
+ -
- -
- @Html.TextBoxFor(m => m.AccountProfile.FirstName, new { @class = "form-control" }) -
@Html.ValidationMessageFor(m => m.AccountProfile.FirstName)
-
-
-
@@ -82,6 +74,14 @@
+
+ +
+ @Html.TextBoxFor(m => m.AccountProfile.FirstName, new { @class = "form-control" }) +
@Html.ValidationMessageFor(m => m.AccountProfile.FirstName)
+
+
+
@@ -134,7 +134,7 @@
@@ -54,13 +52,13 @@
- @Html.TextBoxFor(m => m.Name, new { @class = "form-control", placeholder = "required" }) + @Html.TextBoxFor(m => m.Name, new { @class = "form-control", placeholder = "必填项" })
@Html.ValidationMessageFor(m => m.Name)
- +
@Html.TextBoxFor(m => m.Categories, new { @class = "form-control" })
@Html.ValidationMessageFor(m => m.Categories)
@@ -69,7 +67,7 @@
- +
diff --git a/TightWiki/Views/Admin/Emoji.cshtml b/TightWiki/Views/Admin/Emoji.cshtml index e953ee9..6aa2d30 100644 --- a/TightWiki/Views/Admin/Emoji.cshtml +++ b/TightWiki/Views/Admin/Emoji.cshtml @@ -6,8 +6,10 @@ }

Emoji

+

+

+

-

Configuration for an emoji.

@if (!string.IsNullOrEmpty(Model.ErrorMessage)) { @@ -26,7 +28,7 @@
- +
@if (@Model.Emoji.Name != "") { @@ -46,7 +48,7 @@
- +
@Html.TextBoxFor(m => m.Categories, new { @class = "form-control" })
@Html.ValidationMessageFor(m => m.Categories)
diff --git a/TightWiki/Views/Admin/Emojis.cshtml b/TightWiki/Views/Admin/Emojis.cshtml index e606e33..e28973f 100644 --- a/TightWiki/Views/Admin/Emojis.cshtml +++ b/TightWiki/Views/Admin/Emojis.cshtml @@ -11,7 +11,7 @@

- Global configuration for Emojis.

+

@if (!string.IsNullOrEmpty(Model.ErrorMessage)) @@ -23,7 +23,7 @@
@Html.Raw(Model.SuccessMessage)
} -Add new emoji +新增

@@ -34,7 +34,7 @@
@Html.TextBoxFor(x => x.SearchString, new { @class = "form-control" })
- +

@@ -44,9 +44,9 @@ - - - + + + @@ -66,14 +66,14 @@ {
- Either there are no emojis configured or your search criteria returned no results. + 查询不到emoji
} }
-Add new emoji +新增
NameShortcutImage名称快捷方式图片