diff options
| author | Satsuki Yanagi <17376330+u1-liquid@users.noreply.github.com> | 2019-07-08 13:55:22 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2019-07-08 13:55:22 +0900 |
| commit | c2c06694daa69e4638af82b17f40b7d20989638a (patch) | |
| tree | 4433a525ab9ca78ffb810e29ed4853557bee34f3 /src/misc/format-time-string.ts | |
| parent | Improve paste uploading Resolve #3023 (#4542) (diff) | |
| download | sharkey-c2c06694daa69e4638af82b17f40b7d20989638a.tar.gz sharkey-c2c06694daa69e4638af82b17f40b7d20989638a.tar.bz2 sharkey-c2c06694daa69e4638af82b17f40b7d20989638a.zip | |
Allow only one kind of date identifier at once (#5120)
Diffstat (limited to 'src/misc/format-time-string.ts')
| -rw-r--r-- | src/misc/format-time-string.ts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/misc/format-time-string.ts b/src/misc/format-time-string.ts index 4729036e5b..caa31780ba 100644 --- a/src/misc/format-time-string.ts +++ b/src/misc/format-time-string.ts @@ -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; |