Commit de36d19d authored by Rob Pike's avatar Rob Pike

time: zero-pad two-digit years.

Fixes #2024

R=adg, dsymonds
CC=golang-dev
https://golang.org/cl/4635083
parent ba8e61d8
...@@ -248,7 +248,7 @@ func (t *Time) Format(layout string) string { ...@@ -248,7 +248,7 @@ func (t *Time) Format(layout string) string {
var p string var p string
switch std { switch std {
case stdYear: case stdYear:
p = strconv.Itoa64(t.Year % 100) p = zeroPad(int(t.Year % 100))
case stdLongYear: case stdLongYear:
p = strconv.Itoa64(t.Year) p = strconv.Itoa64(t.Year)
case stdMonth: case stdMonth:
......
...@@ -142,21 +142,22 @@ type FormatTest struct { ...@@ -142,21 +142,22 @@ type FormatTest struct {
} }
var formatTests = []FormatTest{ var formatTests = []FormatTest{
{"ANSIC", ANSIC, "Thu Feb 4 21:00:57 2010"}, {"ANSIC", ANSIC, "Wed Feb 4 21:00:57 2009"},
{"UnixDate", UnixDate, "Thu Feb 4 21:00:57 PST 2010"}, {"UnixDate", UnixDate, "Wed Feb 4 21:00:57 PST 2009"},
{"RubyDate", RubyDate, "Thu Feb 04 21:00:57 -0800 2010"}, {"RubyDate", RubyDate, "Wed Feb 04 21:00:57 -0800 2009"},
{"RFC822", RFC822, "04 Feb 10 2100 PST"}, {"RFC822", RFC822, "04 Feb 09 2100 PST"},
{"RFC850", RFC850, "Thursday, 04-Feb-10 21:00:57 PST"}, {"RFC850", RFC850, "Wednesday, 04-Feb-09 21:00:57 PST"},
{"RFC1123", RFC1123, "Thu, 04 Feb 2010 21:00:57 PST"}, {"RFC1123", RFC1123, "Wed, 04 Feb 2009 21:00:57 PST"},
{"RFC3339", RFC3339, "2010-02-04T21:00:57-08:00"}, {"RFC3339", RFC3339, "2009-02-04T21:00:57-08:00"},
{"Kitchen", Kitchen, "9:00PM"}, {"Kitchen", Kitchen, "9:00PM"},
{"am/pm", "3pm", "9pm"}, {"am/pm", "3pm", "9pm"},
{"AM/PM", "3PM", "9PM"}, {"AM/PM", "3PM", "9PM"},
{"two-digit year", "06 01 02", "09 02 04"},
} }
func TestFormat(t *testing.T) { func TestFormat(t *testing.T) {
// The numeric time represents Thu Feb 4 21:00:57 PST 2010 // The numeric time represents Thu Feb 4 21:00:57 PST 2010
time := SecondsToLocalTime(1265346057) time := SecondsToLocalTime(1233810057)
for _, test := range formatTests { for _, test := range formatTests {
result := time.Format(test.format) result := time.Format(test.format)
if result != test.result { if result != test.result {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment