mirror/cherrypick
1
1
Fork 0
mirror of https://github.com/kokonect-link/cherrypick synced 2024-12-05 02:08:56 +09:00
Code

Allow only one kind of date identifier at once (#5120)

Browse Source
This commit is contained in:
Satsuki Yanagi 2019-07-08 13:55:22 +09:00 committed by syuilo
parent 5343b005df
commit c2c06694da
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/misc/format-time-string.ts
View File

@ -42,7 +42,7 @@ function formatDateTimeString(date: Date, format: string): string {
}
export function formatTimeString(date: Date, format: string): string {
return format.replace(/\[(([^\[]|\[\])*)\]|([yMdHhmst]{1,4})/g, (match: string, localeformat?: string, unused?, datetimeformat?: string) => {
return format.replace(/\[(([^\[]|\[\])*)\]|(([yMdHhmst])\4{0,3})/g, (match: string, localeformat?: string, unused?, datetimeformat?: string) => {
if (localeformat) return formatLocaleString(date, localeformat);
if (datetimeformat) return formatDateTimeString(date, datetimeformat);
return match;