Skip to content

Commit 9b0aa7a

Browse files
committed
This closes qax-os#1060, fix build-in time number format parse error
1 parent 6b277c6 commit 9b0aa7a

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

styles.go

+13-2
Original file line numberDiff line numberDiff line change
@@ -981,22 +981,33 @@ func parseTime(v string, format string) string {
981981
{"D", "2"},
982982
{"yyyy", "2006"},
983983
{"yy", "06"},
984+
{"MMMM", "%%%%"},
984985
{"mmmm", "%%%%"},
986+
{"DDDD", "&&&&"},
985987
{"dddd", "&&&&"},
988+
{"DD", "02"},
986989
{"dd", "02"},
990+
{"D", "2"},
987991
{"d", "2"},
992+
{"MMM", "Jan"},
988993
{"mmm", "Jan"},
994+
{"MMSS", "0405"},
989995
{"mmss", "0405"},
996+
{"SS", "05"},
990997
{"ss", "05"},
991998
{"s", "5"},
999+
{"MM:", "04:"},
9921000
{"mm:", "04:"},
1001+
{":MM", ":04"},
9931002
{":mm", ":04"},
9941003
{"m:", "4:"},
9951004
{":m", ":4"},
1005+
{"MM", "01"},
9961006
{"mm", "01"},
997-
{"am/pm", "pm"},
1007+
{"AM/PM", "PM"},
1008+
{"am/pm", "PM"},
1009+
{"M/", "1/"},
9981010
{"m/", "1/"},
999-
{"m", "1"},
10001011
{"%%%%", "January"},
10011012
{"&&&&", "Monday"},
10021013
}

styles_test.go

+1
Original file line numberDiff line numberDiff line change
@@ -307,6 +307,7 @@ func TestParseTime(t *testing.T) {
307307
assert.Equal(t, "3/4/2019 5:5:42", parseTime("43528.2123", "M/D/YYYY h:m:s"))
308308
assert.Equal(t, "3/4/2019 0:5:42", parseTime("43528.003958333335", "m/d/yyyy h:m:s"))
309309
assert.Equal(t, "3/4/2019 0:05:42", parseTime("43528.003958333335", "M/D/YYYY h:mm:s"))
310+
assert.Equal(t, "3:30:00 PM", parseTime("0.64583333333333337", "h:mm:ss am/pm"))
310311
assert.Equal(t, "0:05", parseTime("43528.003958333335", "h:mm"))
311312
assert.Equal(t, "0:0", parseTime("6.9444444444444444E-5", "h:m"))
312313
assert.Equal(t, "0:00", parseTime("6.9444444444444444E-5", "h:mm"))

0 commit comments

Comments
 (0)