phoenix/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-07-02 14:31:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

tpl/time: Use configured location when date passed to Format is string

Browse source 
Updates #9084
This commit is contained in:
Bjørn Erik Pedersen 2021-10-30 16:06:00 +02:00
parent 3339c2bb61
commit e82cbd746f
No known key found for this signature in database
GPG key ID: 330E6E2BD4859D8F
2 changed files with 55 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tpl/time/time.go
View file

@ -63,7 +63,7 @@ func (ns *Namespace) AsTime(v interface{}, args ...interface{}) (interface{}, er
// the other form or returns it of the time.Time value. These are formatted
// with the layout string
func (ns *Namespace) Format(layout string, v interface{}) (string, error) {
t, err := cast.ToTimeE(v)
t, err := htime.ToTimeInDefaultLocationE(v, ns.location)
if err != nil {
return "", err
}

29
tpl/time/time_test.go
View file

@ -18,6 +18,8 @@ import (
"testing"
"time"
qt "github.com/frankban/quicktest"
translators "github.com/gohugoio/localescompressed"
)
@ -80,8 +82,10 @@ func TestTimeLocation(t *testing.T) {
}
func TestFormat(t *testing.T) {
t.Parallel()
c := qt.New(t)
c.Run("UTC", func(c *qt.C) {
c.Parallel()
ns := New(translators.GetTranslator("en"), time.UTC)
for i, test := range []struct {
@ -105,18 +109,35 @@ func TestFormat(t *testing.T) {
result, err := ns.Format(test.layout, test.value)
if b, ok := test.expect.(bool); ok && !b {
if err == nil {
t.Errorf("[%d] DateFormat didn't return an expected error, got %v", i, result)
c.Errorf("[%d] DateFormat didn't return an expected error, got %v", i, result)
}
} else {
if err != nil {
t.Errorf("[%d] DateFormat failed: %s", i, err)
c.Errorf("[%d] DateFormat failed: %s", i, err)
continue
}
if result != test.expect {
t.Errorf("[%d] DateFormat got %v but expected %v", i, result, test.expect)
c.Errorf("[%d] DateFormat got %v but expected %v", i, result, test.expect)
}
}
}
})
//Issue #9084
c.Run("TZ America/Los_Angeles", func(c *qt.C) {
c.Parallel()
loc, err := time.LoadLocation("America/Los_Angeles")
c.Assert(err, qt.IsNil)
ns := New(translators.GetTranslator("en"), loc)
d, err := ns.Format(":time_full", "2020-03-09T11:00:00")
c.Assert(err, qt.IsNil)
c.Assert(d, qt.Equals, "11:00:00 am Pacific Daylight Time")
})
}
func TestDuration(t *testing.T) {