From c4bdebd92c2d2f922662b7a294fb4f98614d4272 Mon Sep 17 00:00:00 2001 From: zel Date: Sat, 8 Feb 2025 16:40:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Data/config.db | Bin 106496 -> 106496 bytes Data/statistics.db | Bin 24576 -> 24576 bytes Data/users.db | Bin 565248 -> 565248 bytes TightWiki.Models/DataModels/Emoji.cs | 5 ++- .../Admin/AccountProfileAccountViewModel.cs | 34 +++++++++--------- .../ViewModels/Admin/AddEmojiViewModel.cs | 8 ++++- .../ViewModels/Admin/EmojiViewModel.cs | 4 ++- TightWiki/Views/Admin/Account.cshtml | 30 ++++++++-------- TightWiki/Views/Admin/Accounts.cshtml | 26 +++++++------- TightWiki/Views/Admin/AddAccount.cshtml | 24 ++++++------- TightWiki/Views/Admin/AddEmoji.cshtml | 14 ++++---- TightWiki/Views/Admin/Emoji.cshtml | 8 +++-- TightWiki/Views/Admin/Emojis.cshtml | 16 ++++----- 13 files changed, 90 insertions(+), 79 deletions(-) diff --git a/Data/config.db b/Data/config.db index 7e8611d747d94ffd0d4856a5cb1ad4bdef352e9a..bfee38bc718f442e47c7a7f2c8e83ab5350f2fa8 100644 GIT binary patch delta 624 zcmZoTz}9epZGtr8`iU~mjO!Z{wk9wxkC$X&-okE>%tJkbCGEY<9_aRZebRl z?FtEu&zTK47=R#Lh?9X))|N4qlY=!NvADQAzbGZG!XU-DEXXx0BtO*1DKpSByt1gs z(RT9gF1^jxE$YmQ$udAqy2gy<9Go03scDI&IVB1qnYpP^`FW|%8JT&B)7Pgnx=jC= z&M3>|>^EH?gVBUNMiQ)NvSNoQD_G5B+YZ~w6&+v|2QwHSGIK3sm@KHUeR@n5qZbSJ z4~E>$4PAbW+ka#;^0JsR-(z6!Vs~eI%@)IYgq4BCi}@bMM!pYxb$lGW%{<$9WVze9 zUUMaIZsTm@4B!;wNaWC9f4y?MU3ejoGh^5^GVE0FHKBO#pA%~RrQQ| z>=yPw&E~e#=T|UF`Qmh?i5*atzAdKRc_la;?Pxo_rIOKr(O|R0Ek@?;+iDmWGO+*? W$ja%_^^CqCR>b6lhLB|qj0ym~Ld`n> delta 237 zcmVjqo}#03BZN)Mk42Awh4v^`UsZ@VF)M(>$4#c5CpeV zKmp?d0ssJ)FLwdplXBQ0m-BZ47L%#iBbRA-0WJt(KMDW=H-Qb89eDv7lN{Mg0S%LA n*@>5qc>yM~7uo^?x3+u%p#lU?FbM#cTYmvflU#sUrhow;%V0_h diff --git a/Data/statistics.db b/Data/statistics.db index 45eee0872fbbc9c426d28b65905591a6b2db0f06..dfb2d2876e31d4b6d6674ca3cc3b7c77e778756d 100644 GIT binary patch delta 970 zcmaKrOGs2v9LDdR8OQq=bs94j6{RF0@_63oo?F5RGYq0Yq@XgjCW45lP0*$>Zre~B zqmV2~qQ@pm7ex<@HbE|;f?8RN5+W#Q5wwUp)AfcX6P)Gwec$&#|L+XWn1eIsaGg0c zQr}??-RZy5W}PcD45P`;eQLkwp5in=iYFSyS^KDW}Wj+ud~+vV&Ah*+gt6- zR2O`1<${cBm>s32W!bTqgCS z$E@+>77|owzfB7r*%tszT1WG}; z@@FshCBKg*6YDCCQ5uvjO|>`_^$7!v3g&6`bj#QAyRGG6C>Esh{WVp&P+s37fNO0g zv1*>Le)8yA#!V!*m#n0LTT~wE>gBfdDbY1kVX| z;D^(GZ1PRS*+n_(`H%vMsHB{$Y{T?ba;YN1tl}6g6af+l5n(F*Deu0Ydlg~1(*JRY z1CAwOkf}oxZ#TcFycu#NNNTLG(S;`beRJVcs1Jb5BigO2cA}-bXCQJbS!UK7*7Xkt zF)s*oF99=zC9{XY+0-*mHtOm>R}LMQmVtL>kS$VQ%ybC*tzC6!Vu9= delta 1015 zcmZwGOK1~O6b9f-a!)gvnP{S^R@0al!B!}7Sp*kB5JXztxTyH1peX2o&|JuDFZbhc&iT(snHecF zMK4ph+1SGr9vz$LU@to@7Ry@UnQoW;0Vfh(36nxj=oVc35&jMdttACG%9@$(1e=l$Y#1Y8~_ zFo{t=0;;S=!*VRFMnyG}h(r>yl4>aw|K4fNXAn4lu?H}TQedkYXnnU>8GU)S7lCl9 z?l&e83W%DSkZ!x9XnCJeVvWq^Fi|PtHv|2D@(0I$^d%8UCtwN_g#ug5K*)Ff&Fo4x zgEVlKSQ{oXC46QgT=25@tmiKnlgx2NOgbpgXa?#BA3RSlT$2#6GiWC!m;&Bapiz?z z=-I18U;Mv{0w!TfY+e;K7_$$Ysfa3oFa_T+*+zj)W}yA!Mcb~oN4fxLty~ZjIJyrm? zAqZh2QKG(97zy-@H?-YVjJA0m1~3Uxz*7t4l(;Z=G}bk2#DklGc}#*;pjp?O2~S`D zQgSfsMPMJdWie@~3hO#EAi3t9pQIZJ1g^afKPJr-a96<$scwi@C!TnK$Wx z@sV-H=r>jwzBMeanrbc@a`t?a7MN)%n^01UPZl^?hzqO|b$eO25>Z$m7gyML%pD~s za?B-g-h87LG}TMP@_05arxX{*lTS^gkbhPSn(L)_a%?~JC6%#V`GykA*j`kTU@~7{ z5;I{n&|toSpv4kd;{oOgg5 zNRRrvUd#4%osYyL@1)Pf-|YxRgN|Xjuf4s$I+ z-Qm*#_kmQVO;n|32dUZNnDVUdY*#@8007|?fH&|8>CVTvwDOD1c7l?inr>*m_*GM* zL--27SMc{FzJNo+P$!wq00aWQR-V&H&Cur;IKL1U*ifL-v(Tv!ndESY4F}x;a^eq? zN#0A8tccY}W_|gMTJ-$d4u<*>3q#)k%x6r2d7a@H9lcH8z(3+o@iab%?O4P7L}+K| zoQ;x@nv~J9YUGk?q|O7Lq&Qr29UI7LUM_9-5Gc6ts}gN>kN`5gp)3 zWV0h}4##*jQJNp--$L`M*|N!$GMPy$Xl{tGX;rb6f7^oX+H$4SWmgftuy$b^UNilN zmU8R~-S>=(=>9isurRn$gNwM4ytNkm5PyJg;S2Z&9L2NvGH%0niI#sd&uJ+dp=ASA zkM?E*}~7%G>G7)|I9+yJNtZV<9>U~U5GrRL^}!+;}M%f82OPR_$RIo2syoI;z^-RAMw zJ#J#`0(bZkKlO7hG!ScB8>~euG-={}fbZi!NKRY$I88M_el`^k(@|!k1 w;BLix!0P~C$D8EFPcXad!77{+St)7HFAE|nh*Uw;6hv)7tSX4rS4Exp4{AzPHUIzs delta 1022 zcmb7@QAkr!7{|{!_ioN|=bM&XTL~6g7+l-#uDS?9T~4RX-EvDyj5c?5m)sUM3F@Vy zM)c6CVYjCq3W6Z47$iQ~LlnJ?Feou}?_v}|1r^otE(*+-_~3H5|Ns5I-#O=h&pz39 z_Q|%Zc2fE2+Lkux zhlF~s7itB%2L(`db10?7)zis@+8#ccQpXb6d{U}5v~%7I`%P;*c5aYe7i}ga2%%I= zjjR6T*ohcxnwySyM=Y2wBf4yT$)-NFW?wE;W%)wQ;IKP7?2;l;(K#GZMOhwlh>;*x&j`MP}#o`8RiSJ^X# zpzEO2f2g;+!*jsbbfoiO;jZ|;Q;CfRRLU_CWFoWw%zQ4=PKTF(U_@=lF##=2ImJlo% z#Lu8g;9U6M!xK1tX$IT>$IDP9L?_@T{Z3!d2$ev!>cwKH3uU~-hpKfagQTP3#K?Gf zL?tWW`5OfsHMsMJs$VJKQu7LY-lXFKma_wK(M&pav7<2zQv-|mUilhmtL~B|Wn~*b zvE5z*86GmQ3^VWwCg2u4hs(ucXijJ;<2IA_#K@?2GDf=KBRcjw_%*$$a3UHWi`E3$ zA3-|dD~cKSrCGUZ;!(%ON7r!z@#`5N<7P~H5b0qZ_Y(8Dw^ew3XsV}zJhrlgd_nMq z3GZNog%e5*&~+?Fs|BNXQJ6z8$G*q|zk>@EBav1}TH(?PpH@t1#hg}3?kX1L7a-^< AHvj+t 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名称快捷方式图片