hugolib: Correct usage of "shortcode" in error messages
authormagikstm <myskina@gmail.com>
Wed, 4 Jan 2017 22:19:09 +0000 (17:19 -0500)
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Thu, 5 Jan 2017 14:40:28 +0000 (15:40 +0100)
hugolib/hugo_sites.go
hugolib/shortcode.go
hugolib/shortcode_test.go

index 611be6808db56f784216a8eaae8cd3de3765b560..3c52955409e682eb36a7860dd6a28a5b7d0e6d74 100644 (file)
@@ -446,7 +446,7 @@ func handleShortcodes(p *Page, t tpl.Template, rawContentCopy []byte) ([]byte, e
                rawContentCopy, err = replaceShortcodeTokens(rawContentCopy, shortcodePlaceholderPrefix, shortcodes)
 
                if err != nil {
-                       jww.FATAL.Printf("Failed to replace short code tokens in %s:\n%s", p.BaseFileName(), err.Error())
+                       jww.FATAL.Printf("Failed to replace shortcode tokens in %s:\n%s", p.BaseFileName(), err.Error())
                }
        }
 
index 0b583b75360e46365b4c9a6b824d67dd89f2e1bf..a08b76339728af028338e99f5613443704ce90d2 100644 (file)
@@ -167,7 +167,7 @@ func HandleShortcodes(stringToParse string, page *Page, t tpl.Template) (string,
                tmpContentWithTokensReplaced, err := replaceShortcodeTokens([]byte(tmpContent), shortcodePlaceholderPrefix, shortcodes)
 
                if err != nil {
-                       return "", fmt.Errorf("Fail to replace short code tokens in %s:\n%s", page.BaseFileName(), err.Error())
+                       return "", fmt.Errorf("Failed to replace shortcode tokens in %s:\n%s", page.BaseFileName(), err.Error())
                }
                return string(tmpContentWithTokensReplaced), nil
        }
index 536c06541b09143addbfd7ffff54d712c6a1b51e..e7fbe756784a1c870f0d046b0bf7bebcc99ac5e1 100644 (file)
@@ -441,7 +441,7 @@ func TestExtractShortcodes(t *testing.T) {
                if this.expectShortCodes != "" {
                        shortCodesAsStr := fmt.Sprintf("map%q", collectAndSortShortcodes(shortCodes))
                        if !strings.Contains(shortCodesAsStr, this.expectShortCodes) {
-                               t.Fatalf("[%d] %s: Short codes not as expected, got %s but expected %s", i, this.name, shortCodesAsStr, this.expectShortCodes)
+                               t.Fatalf("[%d] %s: Shortcodes not as expected, got %s but expected %s", i, this.name, shortCodesAsStr, this.expectShortCodes)
                        }
                }
        }