summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormagikstm <myskina@gmail.com>2017-01-04 17:19:09 -0500
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2017-01-05 15:40:28 +0100
commit01ee525f47289fa95fd3897815c72b60c58b47f1 (patch)
treeb9ad89460748681b68826f8006ac95c5ba8d8c30
parent1b46d2cfeed781d5197ce56134c4a9107b45fcc9 (diff)
hugolib: Correct usage of "shortcode" in error messages
-rw-r--r--hugolib/hugo_sites.go2
-rw-r--r--hugolib/shortcode.go2
-rw-r--r--hugolib/shortcode_test.go2
3 files changed, 3 insertions, 3 deletions
diff --git a/hugolib/hugo_sites.go b/hugolib/hugo_sites.go
index 611be6808..3c5295540 100644
--- a/hugolib/hugo_sites.go
+++ b/hugolib/hugo_sites.go
@@ -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())
}
}
diff --git a/hugolib/shortcode.go b/hugolib/shortcode.go
index 0b583b753..a08b76339 100644
--- a/hugolib/shortcode.go
+++ b/hugolib/shortcode.go
@@ -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
}
diff --git a/hugolib/shortcode_test.go b/hugolib/shortcode_test.go
index 536c06541..e7fbe7567 100644
--- a/hugolib/shortcode_test.go
+++ b/hugolib/shortcode_test.go
@@ -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)
}
}
}