mirror of
https://github.com/gohugoio/hugo.git
synced 2025-03-20 13:21:08 +00:00
Add dateFormat template function
This is the implementation of the proposal at #235 and http://discuss.gohugo.io/t/parsing-dates-in-templates/603/3
This commit is contained in:
parent
878754c21f
commit
37490ee27a
3 changed files with 47 additions and 0 deletions
|
@ -391,6 +391,11 @@ Replace all occurences of the search string with the replacement string.
|
||||||
|
|
||||||
e.g. `{{ replace "Batman and Robin" "Robin" "Catwoman" }}` → "Batman and Catwoman"
|
e.g. `{{ replace "Batman and Robin" "Robin" "Catwoman" }}` → "Batman and Catwoman"
|
||||||
|
|
||||||
|
### dateFormat
|
||||||
|
Converts the textual representation of the datetime into the other form or returns it of Go `time.Time` type value. These are formatted with the layout string.
|
||||||
|
|
||||||
|
e.g. `{{ dateFormat "Monday, Jan 2, 2006" "2015-01-21" }}` →"Wednesday, Jan 21, 2015"
|
||||||
|
|
||||||
### highlight
|
### highlight
|
||||||
Take a string of code and a language, uses Pygments to return the syntax highlighted code in HTML. Used in the [highlight shortcode](/extras/highlighting).
|
Take a string of code and a language, uses Pygments to return the syntax highlighted code in HTML. Used in the [highlight shortcode](/extras/highlighting).
|
||||||
|
|
||||||
|
|
|
@ -905,6 +905,17 @@ func Replace(a, b, c interface{}) (string, error) {
|
||||||
return strings.Replace(aStr, bStr, cStr, -1), nil
|
return strings.Replace(aStr, bStr, cStr, -1), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// DateFormat converts the textual representation of the datetime string into
|
||||||
|
// the other form or returns it of the time.Time value. These are formatted
|
||||||
|
// with the layout string
|
||||||
|
func DateFormat(layout string, v interface{}) (string, error) {
|
||||||
|
t, err := cast.ToTimeE(v)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
return t.Format(layout), nil
|
||||||
|
}
|
||||||
|
|
||||||
func SafeHtml(text string) template.HTML {
|
func SafeHtml(text string) template.HTML {
|
||||||
return template.HTML(text)
|
return template.HTML(text)
|
||||||
}
|
}
|
||||||
|
@ -1281,6 +1292,7 @@ func init() {
|
||||||
"chomp": Chomp,
|
"chomp": Chomp,
|
||||||
"replace": Replace,
|
"replace": Replace,
|
||||||
"trim": Trim,
|
"trim": Trim,
|
||||||
|
"dateFormat": DateFormat,
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,6 +10,7 @@ import (
|
||||||
"reflect"
|
"reflect"
|
||||||
"runtime"
|
"runtime"
|
||||||
"testing"
|
"testing"
|
||||||
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
type tstNoStringer struct {
|
type tstNoStringer struct {
|
||||||
|
@ -988,6 +989,35 @@ func TestTrim(t *testing.T) {
|
||||||
assert.NotNil(t, e, "tstNoStringer isn't trimmable")
|
assert.NotNil(t, e, "tstNoStringer isn't trimmable")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestDateFormat(t *testing.T) {
|
||||||
|
for i, this := range []struct {
|
||||||
|
layout string
|
||||||
|
value interface{}
|
||||||
|
expect interface{}
|
||||||
|
}{
|
||||||
|
{"Monday, Jan 2, 2006", "2015-01-21", "Wednesday, Jan 21, 2015"},
|
||||||
|
{"Monday, Jan 2, 2006", time.Date(2015, time.January, 21, 0, 0, 0, 0, time.UTC), "Wednesday, Jan 21, 2015"},
|
||||||
|
{"This isn't a date layout string", "2015-01-21", "This isn't a date layout string"},
|
||||||
|
{"Monday, Jan 2, 2006", 1421733600, false},
|
||||||
|
{"Monday, Jan 2, 2006", 1421733600.123, false},
|
||||||
|
} {
|
||||||
|
result, err := DateFormat(this.layout, this.value)
|
||||||
|
if b, ok := this.expect.(bool); ok && !b {
|
||||||
|
if err == nil {
|
||||||
|
t.Errorf("[%d] DateFormat didn't return an expected error", i)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if err != nil {
|
||||||
|
t.Errorf("[%d] DateFormat failed: %s", i, err)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if result != this.expect {
|
||||||
|
t.Errorf("[%d] DateFormat got %v but expected %v", i, result, this.expect)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func TestSafeHtml(t *testing.T) {
|
func TestSafeHtml(t *testing.T) {
|
||||||
for i, this := range []struct {
|
for i, this := range []struct {
|
||||||
str string
|
str string
|
||||||
|
|
Loading…
Reference in a new issue