fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-19 18:47:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: international english date format

Browse Source
This commit is contained in:
Constrat
2024-09-10 15:48:06 +02:00
parent c3cade6651
commit f81d43fc6f
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/MaaWpfGui/Extensions/DateTimeExtension.cs
View File

@@ -62,8 +62,14 @@ namespace MaaWpfGui.Extensions
public static string ToLocalTimeString(this DateTime dt, string? format = null)
{
var dateTimeFormat = CustomCultureInfo.Name.ToLowerInvariant() switch
{
"en-us" => "yyyy/MM/dd",
_ => CustomCultureInfo.DateTimeFormat.ShortDatePattern,
};
return string.IsNullOrEmpty(format)
? dt.ToLocalTime().ToString($"{CustomCultureInfo.DateTimeFormat.ShortDatePattern} HH:mm:ss", CustomCultureInfo)
? dt.ToLocalTime().ToString($"{dateTimeFormat} HH:mm:ss", CustomCultureInfo)
: dt.ToLocalTime().ToString(format, CustomCultureInfo);
}

1
src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs
View File

@@ -4636,6 +4636,7 @@ namespace MaaWpfGui.ViewModels.UI
{
"zh-cn" => $" - {ResourceVersion}{ResourceDateTime:#MMdd}",
"zh-tw" => $" - {ResourceVersion}{ResourceDateTime:#MMdd}",
"en-us" => $" - {ResourceDateTime:dd/MM} {ResourceVersion}",
_ => $" - {ResourceDateTime.ToString(LocalizationHelper.CustomCultureInfo.DateTimeFormat.ShortDatePattern.Replace("yyyy", string.Empty).Trim('/', '.'))} {ResourceVersion}",
}
: string.Empty;