time: fix quarter calculation in custom_format() (#25608)

tankf33der · web-flow · commit 081ded0b59c4 · 2025-10-28T08:09:10.000+02:00
diff --git a/vlib/time/custom_format_test.v b/vlib/time/custom_format_test.v
@@ -42,3 +42,19 @@ fn test_zero_date() {
 	res := zero_date.custom_format('M MM Mo MMM MMMM |1| D DD DDD DDDD |2| d dd ddd dddd |3| YY YYYY a A |4| H HH h hh k kk i ii e |5| m mm s ss |6| Do DDDo Q Qo QQ |7| N NN |8| M/D/YYYY N-HH:mm:ss Qo?a')
 	assert res == '0 00 0th Jan January |1| 0 00 0 000 |2| -1 Mo Mon Monday |3|  0 am AM |4| 0 00 12 12 1 01 0 00 e |5| 0 00 0 00 |6| 0th 0th 1 1st 01 |7| AD Anno Domini |8| 0/0/0 AD-00:00:00 1st?am'
 }
+
+fn test_quarter() {
+	pattern := '2025-xx-27t12:34:56z'
+	expect := [1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4]
+	mut want := []int{len: 12}
+	for n in 0 .. 12 {
+		tt := time.parse_rfc3339(pattern.replace('xx', '${n + 1:02}'))!
+		want[n] = tt.custom_format('Q').int()
+	}
+	assert want == expect
+
+	turing := time.parse_format('1912-06-23', 'YYYY-MM-DD')! // Alan Turing was born
+	assert turing.custom_format('Qo') == '2nd'
+	mccarthy := time.parse_format('1927-09-04', 'YYYY-MM-DD')! // John McCarthy was born
+	assert mccarthy.custom_format('QQ') == '03'
+}
diff --git a/vlib/time/format.v b/vlib/time/format.v
@@ -502,13 +502,13 @@ pub fn (t Time) custom_format(s string) string {
 				sb.write_string(ordinal_suffix(t.week_of_year()))
 			}
 			'Q' {
-				sb.write_string('${(t.month % 4) + 1}')
+				sb.write_string('${(t.month - 1) / 3 + 1}')
 			}
 			'QQ' {
-				sb.write_string('${(t.month % 4) + 1:02}')
+				sb.write_string('${(t.month - 1) / 3 + 1:02}')
 			}
 			'Qo' {
-				sb.write_string(ordinal_suffix((t.month % 4) + 1))
+				sb.write_string(ordinal_suffix((t.month - 1) / 3 + 1))
 			}
 			'c' {
 				sb.write_string('${t.day_of_week()}')

Original file line number	Diff line number	Diff line change
`@@ -502,13 +502,13 @@ pub fn (t Time) custom_format(s string) string {`
`502`	`502`	`sb.write_string(ordinal_suffix(t.week_of_year()))`
`503`	`503`	`}`
`504`	`504`	`'Q' {`
`505`		`- sb.write_string('${(t.month % 4) + 1}')`
	`505`	`+ sb.write_string('${(t.month - 1) / 3 + 1}')`
`506`	`506`	`}`
`507`	`507`	`'QQ' {`
`508`		`- sb.write_string('${(t.month % 4) + 1:02}')`
	`508`	`+ sb.write_string('${(t.month - 1) / 3 + 1:02}')`
`509`	`509`	`}`
`510`	`510`	`'Qo' {`
`511`		`- sb.write_string(ordinal_suffix((t.month % 4) + 1))`
	`511`	`+ sb.write_string(ordinal_suffix((t.month - 1) / 3 + 1))`
`512`	`512`	`}`
`513`	`513`	`'c' {`
`514`	`514`	`sb.write_string('${t.day_of_week()}')`