tpl: Modify tpl.humanize to ordinalize integer input

Add logic to tpl.humanize such that it understands input of int literals
or strings which represent an integer. When tpl.humanize sees this type
of input, it will use inflect.Ordinalize as opposed to the standard
inflect.Humanize.

Fixes #1886

diff --git a/docs/content/templates/functions.md b/docs/content/templates/functions.md
index 84767b2247746342b2963a633391d772a9d27675..6ba0a8963345084ee5a7a4643e3f66f45c163aec 100644 (file)
--- a/docs/content/templates/functions.md
+++ b/docs/content/templates/functions.md
@@ -450,12 +450,15 @@ Used in the [highlight shortcode](/extras/highlighting/).
 
 
 ### humanize
-Humanize returns the humanized version of a string with the first letter capitalized.
+Humanize returns the humanized version of an argument with the first letter capitalized.
+If the input is either an int64 value or the string representation of an integer, humanize returns the number with the proper ordinal appended.
 
 e.g.
 ```
 {{humanize "my-first-post"}} → "My first post"
 {{humanize "myCamelPost"}} → "My camel post"
+{{humanize "52"}} → "52nd"
+{{humanize 103}} → "103rd"
 ```
 
 

diff --git a/tpl/template_funcs.go b/tpl/template_funcs.go
index b34300ab27a907c7eb3e8482ff95f666f23594ef..b8896a9cdc096516429be4133f5462af1fcf6059 100644 (file)
--- a/tpl/template_funcs.go
+++ b/tpl/template_funcs.go
@@ -1696,8 +1696,12 @@ func countRunes(content interface{}) (int, error) {
        return counter, nil
 }
 
-// humanize returns the humanized form of a single word.
+// humanize returns the humanized form of a single parameter.
+// If the parameter is either an integer or a string containing an integer
+// value, the behavior is to add the appropriate ordinal.
 // Example:  "my-first-post" -> "My first post"
+// Example:  "103" -> "103rd"
+// Example:  52 -> "52nd"
 func humanize(in interface{}) (string, error) {
        word, err := cast.ToStringE(in)
        if err != nil {
@@ -1708,6 +1712,11 @@ func humanize(in interface{}) (string, error) {
                return "", nil
        }
 
+       _, ok := in.(int)           // original param was literal int value
+       _, err = strconv.Atoi(word) // original param was string containing an int value
+       if ok == true || err == nil {
+               return inflect.Ordinalize(word), nil
+       }
        return inflect.Humanize(word), nil
 }
 

diff --git a/tpl/template_funcs_test.go b/tpl/template_funcs_test.go
index f0d123c0f7a8f9c24e81435ea70db37fca8efa79..1dcae066c3bd196351c570b2f535c2d57f5272b3 100644 (file)
--- a/tpl/template_funcs_test.go
+++ b/tpl/template_funcs_test.go
@@ -1801,11 +1801,16 @@ func TestHighlight(t *testing.T) {
 func TestInflect(t *testing.T) {
        for i, this := range []struct {
                inflectFunc func(i interface{}) (string, error)
-               in          string
+               in          interface{}
                expected    string
        }{
                {humanize, "MyCamel", "My camel"},
                {humanize, "", ""},
+               {humanize, "103", "103rd"},
+               {humanize, "41", "41st"},
+               {humanize, 103, "103rd"},
+               {humanize, int64(92), "92nd"},
+               {humanize, "5.5", "5.5"},
                {pluralize, "cat", "cats"},
                {pluralize, "", ""},
                {singularize, "cats", "cat"},