summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--docs/content/content/multilingual.md8
-rw-r--r--helpers/configProvider.go25
-rw-r--r--helpers/content.go27
-rw-r--r--helpers/content_renderer_test.go4
-rw-r--r--helpers/content_test.go23
-rw-r--r--hugolib/config.go2
-rw-r--r--hugolib/embedded_shortcodes_test.go8
-rw-r--r--hugolib/hugo_sites.go14
-rw-r--r--hugolib/hugo_sites_test.go18
-rw-r--r--hugolib/multilingual.go29
-rw-r--r--hugolib/node.go37
-rw-r--r--hugolib/page.go21
-rw-r--r--hugolib/pageSort_test.go4
-rw-r--r--hugolib/page_permalink_test.go4
-rw-r--r--hugolib/page_test.go2
-rw-r--r--hugolib/pagination_test.go4
-rw-r--r--hugolib/shortcode.go3
-rw-r--r--hugolib/shortcode_test.go231
-rw-r--r--hugolib/site.go25
-rw-r--r--hugolib/translations.go15
-rw-r--r--tpl/template_funcs.go7
21 files changed, 323 insertions, 188 deletions
diff --git a/docs/content/content/multilingual.md b/docs/content/content/multilingual.md
index 1f73194ea..f93738f9f 100644
--- a/docs/content/content/multilingual.md
+++ b/docs/content/content/multilingual.md
@@ -38,16 +38,22 @@ and taxonomy pages will be rendered below `/en` in English, and below `/fr` in F
Only the obvious non-global options can be overridden per language. Examples of global options are `BaseURL`, `BuildDrafts`, etc.
-Taxonomies configuration can also be set per language, example:
+Taxonomies and Blackfriday configuration can also be set per language, example:
```
[Taxonomies]
tag = "tags"
+[blackfriday]
+angledQuotes = true
+hrefTargetBlank = true
+
[Languages]
[Languages.en]
weight = 1
title = "English"
+[Languages.en.blackfriday]
+angledQuotes = false
[Languages.fr]
weight = 2
diff --git a/helpers/configProvider.go b/helpers/configProvider.go
new file mode 100644
index 000000000..16a203302
--- /dev/null
+++ b/helpers/configProvider.go
@@ -0,0 +1,25 @@
+// Copyright 2016-present The Hugo Authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Package helpers implements general utility functions that work with
+// and on content. The helper functions defined here lay down the
+// foundation of how Hugo works with files and filepaths, and perform
+// string operations on content.
+package helpers
+
+// ConfigProvider provides the configuration settings for Hugo.
+type ConfigProvider interface {
+ GetString(key string) string
+ GetStringMap(key string) map[string]interface{}
+ GetStringMapString(key string) map[string]string
+}
diff --git a/helpers/content.go b/helpers/content.go
index b9281acf4..427d960a1 100644
--- a/helpers/content.go
+++ b/helpers/content.go
@@ -59,7 +59,7 @@ type Blackfriday struct {
}
// NewBlackfriday creates a new Blackfriday filled with site config or some sane defaults.
-func NewBlackfriday() *Blackfriday {
+func NewBlackfriday(c ConfigProvider) *Blackfriday {
combinedParam := map[string]interface{}{
"smartypants": true,
"angledQuotes": false,
@@ -72,7 +72,7 @@ func NewBlackfriday() *Blackfriday {
"sourceRelativeLinksProjectFolder": "/docs/content",
}
- siteParam := viper.GetStringMap("blackfriday")
+ siteParam := c.GetStringMap("blackfriday")
if siteParam != nil {
siteConfig := cast.ToStringMap(siteParam)
@@ -341,20 +341,25 @@ func ExtractTOC(content []byte) (newcontent []byte, toc []byte) {
// RenderingContext holds contextual information, like content and configuration,
// for a given content rendering.
type RenderingContext struct {
- Content []byte
- PageFmt string
- DocumentID string
- Config *Blackfriday
- RenderTOC bool
- FileResolver FileResolverFunc
- LinkResolver LinkResolverFunc
- configInit sync.Once
+ Content []byte
+ PageFmt string
+ DocumentID string
+ Config *Blackfriday
+ RenderTOC bool
+ FileResolver FileResolverFunc
+ LinkResolver LinkResolverFunc
+ ConfigProvider ConfigProvider
+ configInit sync.Once
+}
+
+func newViperProvidedRenderingContext() *RenderingContext {
+ return &RenderingContext{ConfigProvider: viper.GetViper()}
}
func (c *RenderingContext) getConfig() *Blackfriday {
c.configInit.Do(func() {
if c.Config == nil {
- c.Config = NewBlackfriday()
+ c.Config = NewBlackfriday(c.ConfigProvider)
}
})
return c.Config
diff --git a/helpers/content_renderer_test.go b/helpers/content_renderer_test.go
index 8c8e58604..f96cf0ad5 100644
--- a/helpers/content_renderer_test.go
+++ b/helpers/content_renderer_test.go
@@ -23,7 +23,7 @@ import (
// Renders a codeblock using Blackfriday
func render(input string) string {
- ctx := &RenderingContext{}
+ ctx := newViperProvidedRenderingContext()
render := getHTMLRenderer(0, ctx)
buf := &bytes.Buffer{}
@@ -33,7 +33,7 @@ func render(input string) string {
// Renders a codeblock using Mmark
func renderWithMmark(input string) string {
- ctx := &RenderingContext{}
+ ctx := newViperProvidedRenderingContext()
render := getMmarkHTMLRenderer(0, ctx)
buf := &bytes.Buffer{}
diff --git a/helpers/content_test.go b/helpers/content_test.go
index 8aa645f6b..85e0d7f4f 100644
--- a/helpers/content_test.go
+++ b/helpers/content_test.go
@@ -22,6 +22,7 @@ import (
"github.com/miekg/mmark"
"github.com/russross/blackfriday"
+ "github.com/spf13/viper"
"github.com/stretchr/testify/assert"
)
@@ -124,7 +125,7 @@ func TestTruncateWordsByRune(t *testing.T) {
}
func TestGetHTMLRendererFlags(t *testing.T) {
- ctx := &RenderingContext{}
+ ctx := newViperProvidedRenderingContext()
renderer := getHTMLRenderer(blackfriday.HTML_USE_XHTML, ctx)
flags := renderer.GetFlags()
if flags&blackfriday.HTML_USE_XHTML != blackfriday.HTML_USE_XHTML {
@@ -148,7 +149,7 @@ func TestGetHTMLRendererAllFlags(t *testing.T) {
{blackfriday.HTML_SMARTYPANTS_LATEX_DASHES},
}
defaultFlags := blackfriday.HTML_USE_XHTML
- ctx := &RenderingContext{}
+ ctx := newViperProvidedRenderingContext()
ctx.Config = ctx.getConfig()
ctx.Config.AngledQuotes = true
ctx.Config.Fractions = true
@@ -171,7 +172,7 @@ func TestGetHTMLRendererAllFlags(t *testing.T) {
}
func TestGetHTMLRendererAnchors(t *testing.T) {
- ctx := &RenderingContext{}
+ ctx := newViperProvidedRenderingContext()
ctx.DocumentID = "testid"
ctx.Config = ctx.getConfig()
ctx.Config.PlainIDAnchors = false
@@ -195,7 +196,7 @@ func TestGetHTMLRendererAnchors(t *testing.T) {
}
func TestGetMmarkHTMLRenderer(t *testing.T) {
- ctx := &RenderingContext{}
+ ctx := newViperProvidedRenderingContext()
ctx.DocumentID = "testid"
ctx.Config = ctx.getConfig()
ctx.Config.PlainIDAnchors = false
@@ -219,7 +220,7 @@ func TestGetMmarkHTMLRenderer(t *testing.T) {
}
func TestGetMarkdownExtensionsMasksAreRemovedFromExtensions(t *testing.T) {
- ctx := &RenderingContext{}
+ ctx := newViperProvidedRenderingContext()
ctx.Config = ctx.getConfig()
ctx.Config.Extensions = []string{"headerId"}
ctx.Config.ExtensionsMask = []string{"noIntraEmphasis"}
@@ -234,7 +235,7 @@ func TestGetMarkdownExtensionsByDefaultAllExtensionsAreEnabled(t *testing.T) {
type data struct {
testFlag int
}
- ctx := &RenderingContext{}
+ ctx := newViperProvidedRenderingContext()
ctx.Config = ctx.getConfig()
ctx.Config.Extensions = []string{""}
ctx.Config.ExtensionsMask = []string{""}
@@ -266,7 +267,7 @@ func TestGetMarkdownExtensionsByDefaultAllExtensionsAreEnabled(t *testing.T) {
}
func TestGetMarkdownExtensionsAddingFlagsThroughRenderingContext(t *testing.T) {
- ctx := &RenderingContext{}
+ ctx := newViperProvidedRenderingContext()
ctx.Config = ctx.getConfig()
ctx.Config.Extensions = []string{"definitionLists"}
ctx.Config.ExtensionsMask = []string{""}
@@ -278,7 +279,7 @@ func TestGetMarkdownExtensionsAddingFlagsThroughRenderingContext(t *testing.T) {
}
func TestGetMarkdownRenderer(t *testing.T) {
- ctx := &RenderingContext{}
+ ctx := newViperProvidedRenderingContext()
ctx.Content = []byte("testContent")
ctx.Config = ctx.getConfig()
actualRenderedMarkdown := markdownRender(ctx)
@@ -289,7 +290,7 @@ func TestGetMarkdownRenderer(t *testing.T) {
}
func TestGetMarkdownRendererWithTOC(t *testing.T) {
- ctx := &RenderingContext{RenderTOC: true}
+ ctx := &RenderingContext{RenderTOC: true, ConfigProvider: viper.GetViper()}
ctx.Content = []byte("testContent")
ctx.Config = ctx.getConfig()
actualRenderedMarkdown := markdownRender(ctx)
@@ -304,7 +305,7 @@ func TestGetMmarkExtensions(t *testing.T) {
type data struct {
testFlag int
}
- ctx := &RenderingContext{}
+ ctx := newViperProvidedRenderingContext()
ctx.Config = ctx.getConfig()
ctx.Config.Extensions = []string{"tables"}
ctx.Config.ExtensionsMask = []string{""}
@@ -333,7 +334,7 @@ func TestGetMmarkExtensions(t *testing.T) {
}
func TestMmarkRender(t *testing.T) {
- ctx := &RenderingContext{}
+ ctx := newViperProvidedRenderingContext()
ctx.Content = []byte("testContent")
ctx.Config = ctx.getConfig()
actualRenderedMarkdown := mmarkRender(ctx)
diff --git a/hugolib/config.go b/hugolib/config.go
index 285e3567a..c4292e81b 100644
--- a/hugolib/config.go
+++ b/hugolib/config.go
@@ -94,7 +94,7 @@ func loadDefaultSettings() {
viper.SetDefault("NewContentEditor", "")
viper.SetDefault("Paginate", 10)
viper.SetDefault("PaginatePath", "page")
- viper.SetDefault("Blackfriday", helpers.NewBlackfriday())
+ viper.SetDefault("Blackfriday", helpers.NewBlackfriday(viper.GetViper()))
viper.SetDefault("RSSUri", "index.xml")
viper.SetDefault("SectionPagesMenu", "")
viper.SetDefault("DisablePathToLower", false)
diff --git a/hugolib/embedded_shortcodes_test.go b/hugolib/embedded_shortcodes_test.go
index e668ff4c8..cebef0b8b 100644
--- a/hugolib/embedded_shortcodes_test.go
+++ b/hugolib/embedded_shortcodes_test.go
@@ -15,7 +15,6 @@ package hugolib
import (
"fmt"
- "html/template"
"net/url"
"os"
"path/filepath"
@@ -55,10 +54,9 @@ func doTestShortcodeCrossrefs(t *testing.T, relative bool) {
templ := tpl.New()
p, _ := pageFromString(simplePageWithURL, path)
- p.Node.Site = &SiteInfo{
- rawAllPages: &(Pages{p}),
- BaseURL: template.URL(helpers.SanitizeURLKeepTrailingSlash(baseURL)),
- }
+ p.Node.Site = newSiteInfoDefaultLanguage(
+ helpers.SanitizeURLKeepTrailingSlash(baseURL),
+ p)
output, err := HandleShortcodes(in, p, templ)
diff --git a/hugolib/hugo_sites.go b/hugolib/hugo_sites.go
index b41334fdc..8fd2a63b9 100644
--- a/hugolib/hugo_sites.go
+++ b/hugolib/hugo_sites.go
@@ -39,7 +39,7 @@ type HugoSites struct {
// NewHugoSites creates a new collection of sites given the input sites, building
// a language configuration based on those.
-func NewHugoSites(sites ...*Site) (*HugoSites, error) {
+func newHugoSites(sites ...*Site) (*HugoSites, error) {
langConfig, err := newMultiLingualFromSites(sites...)
if err != nil {
@@ -55,7 +55,7 @@ func NewHugoSitesFromConfiguration() (*HugoSites, error) {
if err != nil {
return nil, err
}
- return NewHugoSites(sites...)
+ return newHugoSites(sites...)
}
func createSitesFromConfig() ([]*Site, error) {
@@ -461,7 +461,7 @@ func buildAndRenderSite(s *Site, additionalTemplates ...string) error {
// Convenience func used in tests to build a single site/language.
func doBuildSite(s *Site, render bool, additionalTemplates ...string) error {
- sites, err := NewHugoSites(s)
+ sites, err := newHugoSites(s)
if err != nil {
return err
}
@@ -490,7 +490,7 @@ func newHugoSitesFromSourceAndLanguages(input []source.ByteSource, languages Lan
Language: languages[0],
}
if len(languages) == 1 {
- return NewHugoSites(first)
+ return newHugoSites(first)
}
sites := make([]*Site, len(languages))
@@ -499,7 +499,7 @@ func newHugoSitesFromSourceAndLanguages(input []source.ByteSource, languages Lan
sites[i] = &Site{Language: languages[i]}
}
- return NewHugoSites(sites...)
+ return newHugoSites(sites...)
}
@@ -507,3 +507,7 @@ func newHugoSitesFromSourceAndLanguages(input []source.ByteSource, languages Lan
func newHugoSitesFromLanguages(languages Languages) (*HugoSites, error) {
return newHugoSitesFromSourceAndLanguages(nil, languages)
}
+
+func newHugoSitesDefaultLanguage() (*HugoSites, error) {
+ return newHugoSitesFromSourceAndLanguages(nil, Languages{newDefaultLanguage()})
+}
diff --git a/hugolib/hugo_sites_test.go b/hugolib/hugo_sites_test.go
index 158b65124..9ccfed054 100644
--- a/hugolib/hugo_sites_test.go
+++ b/hugolib/hugo_sites_test.go
@@ -137,6 +137,12 @@ func TestMultiSitesBuild(t *testing.T) {
require.NotNil(t, frTags["frtag1"])
readDestination(t, "public/fr/plaques/frtag1/index.html")
readDestination(t, "public/en/tags/tag1/index.html")
+
+ // Check Blackfriday config
+ assert.True(t, strings.Contains(string(doc1fr.Content), "«"), string(doc1fr.Content))
+ assert.False(t, strings.Contains(string(doc1en.Content), "«"), string(doc1en.Content))
+ assert.True(t, strings.Contains(string(doc1en.Content), "“"), string(doc1en.Content))
+
}
func TestMultiSitesRebuild(t *testing.T) {
@@ -326,7 +332,6 @@ title = "Norsk"
// Watching does not work with in-memory fs, so we trigger a reload manually
require.NoError(t, viper.ReadInConfig())
-
err = sites.Build(BuildCfg{CreateSitesFromConfig: true})
if err != nil {
@@ -370,7 +375,10 @@ paginate = 2
DefaultContentLanguage = "fr"
[permalinks]
- other = "/somewhere/else/:filename"
+other = "/somewhere/else/:filename"
+
+[blackfriday]
+angledQuotes = true
[Taxonomies]
tag = "tags"
@@ -379,6 +387,8 @@ tag = "tags"
[Languages.en]
weight = 10
title = "English"
+[Languages.en.blackfriday]
+angledQuotes = false
[Languages.fr]
weight = 20
@@ -441,7 +451,7 @@ tags:
publishdate: "2000-01-01"
---
# doc1
-*some content*
+*some "content"*
NOTE: slug should be used as URL
`)},
{filepath.FromSlash("sect/doc1.fr.md"), []byte(`---
@@ -452,7 +462,7 @@ plaques:
publishdate: "2000-01-04"
---
# doc1
-*quelque contenu*
+*quelque "contenu"*
NOTE: should be in the 'en' Page's 'Translations' field.
NOTE: date is after "doc3"
`)},
diff --git a/hugolib/multilingual.go b/hugolib/multilingual.go
index cc9f607f2..9c5342f99 100644
--- a/hugolib/multilingual.go
+++ b/hugolib/multilingual.go
@@ -25,9 +25,14 @@ func NewLanguage(lang string) *Language {
return &Language{Lang: lang, params: make(map[string]interface{})}
}
-// TODO(bep) multilingo
func newDefaultLanguage() *Language {
- return NewLanguage("en")
+ defaultLang := viper.GetString("DefaultContentLanguage")
+
+ if defaultLang == "" {
+ defaultLang = "en"
+ }
+
+ return NewLanguage(defaultLang)
}
type Languages []*Language
@@ -74,16 +79,18 @@ func newMultiLingualFromSites(sites ...*Site) (*Multilingual, error) {
languages[i] = s.Language
}
- defaultLang := viper.GetString("DefaultContentLanguage")
+ return &Multilingual{Languages: languages, DefaultLang: newDefaultLanguage()}, nil
- if defaultLang == "" {
- defaultLang = "en"
- }
-
- return &Multilingual{Languages: languages, DefaultLang: NewLanguage(defaultLang)}, nil
+}
+func newMultiLingualDefaultLanguage() *Multilingual {
+ return newMultiLingualForLanguage(newDefaultLanguage())
}
+func newMultiLingualForLanguage(language *Language) *Multilingual {
+ languages := Languages{language}
+ return &Multilingual{Languages: languages, DefaultLang: language}
+}
func (ml *Multilingual) enabled() bool {
return len(ml.Languages) > 1
}
@@ -92,6 +99,7 @@ func (l *Language) Params() map[string]interface{} {
l.paramsInit.Do(func() {
// Merge with global config.
// TODO(bep) consider making this part of a constructor func.
+
globalParams := viper.GetStringMap("Params")
for k, v := range globalParams {
if _, ok := l.params[k]; !ok {
@@ -116,6 +124,9 @@ func (l *Language) GetStringMapString(key string) map[string]string {
}
func (l *Language) Get(key string) interface{} {
+ if l == nil {
+ panic("language not set")
+ }
key = strings.ToLower(key)
if v, ok := l.params[key]; ok {
return v
@@ -159,7 +170,7 @@ func toSortedLanguages(l map[string]interface{}) (Languages, error) {
}
// Put all into the Params map
- // TODO(bep) reconsile with the type handling etc. from other params handlers.
+ // TODO(bep) ml reconsile with the type handling etc. from other params handlers.
language.SetParam(loki, v)
}
diff --git a/hugolib/node.go b/hugolib/node.go
index db1d16631..773573c3c 100644
--- a/hugolib/node.go
+++ b/hugolib/node.go
@@ -22,6 +22,8 @@ import (
"sync"
"time"
+ jww "github.com/spf13/jwalterweatherman"
+
"github.com/spf13/hugo/helpers"
"github.com/spf13/cast"
@@ -45,8 +47,9 @@ type Node struct {
paginatorInit sync.Once
scratch *Scratch
- language *Language
- lang string // TODO(bep) multilingo
+ language *Language
+ languageInit sync.Once
+ lang string // TODO(bep) multilingo
translations Nodes
translationsInit sync.Once
@@ -191,6 +194,7 @@ func (n *Node) Scratch() *Scratch {
// TODO(bep) multilingo consolidate. See Page.
func (n *Node) Language() *Language {
+ n.initLanguage()
return n.language
}
@@ -204,6 +208,31 @@ func (n *Node) Lang() string {
return n.lang
}
+func (n *Node) initLanguage() {
+ n.languageInit.Do(func() {
+ pageLang := n.lang
+ ml := n.Site.multilingual
+ if ml == nil {
+ panic("Multilanguage not set")
+ }
+ if pageLang == "" {
+ n.language = ml.DefaultLang
+ return
+ }
+
+ language := ml.Language(pageLang)
+
+ if language == nil {
+ // TODO(bep) ml
+ // This may or may not be serious. It can be a file named stefano.chiodino.md.
+ jww.WARN.Printf("Page language (if it is that) not found in multilang setup: %s.", pageLang)
+ language = ml.DefaultLang
+ }
+
+ n.language = language
+ })
+}
+
func (n *Node) LanguagePrefix() string {
return n.Site.LanguagePrefix
}
@@ -261,7 +290,7 @@ func (n *Node) addMultilingualWebPrefix(outfile string) string {
hadSlashSuffix := strings.HasSuffix(outfile, "/")
lang := n.Lang()
- if lang == "" || !n.Site.Multilingual {
+ if lang == "" || !n.Site.IsMultiLingual() {
return outfile
}
outfile = "/" + path.Join(lang, outfile)
@@ -273,7 +302,7 @@ func (n *Node) addMultilingualWebPrefix(outfile string) string {
func (n *Node) addMultilingualFilesystemPrefix(outfile string) string {
lang := n.Lang()
- if lang == "" || !n.Site.Multilingual {
+ if lang == "" || !n.Site.IsMultiLingual() {
return outfile
}
return string(filepath.Separator) + filepath.Join(lang, outfile)
diff --git a/hugolib/page.go b/hugolib/page.go
index 493e5b512..99aa0db16 100644
--- a/hugolib/page.go
+++ b/hugolib/page.go
@@ -319,7 +319,8 @@ func (p *Page) setAutoSummary() error {
return nil
}
-func (p *Page) renderBytes(content []byte) []byte {
+// TODO(bep) ml not used???
+func (p *Page) _renderBytes(content []byte) []byte {
var fn helpers.LinkResolverFunc
var fileFn helpers.FileResolverFunc
if p.getRenderingConfig().SourceRelativeLinksEval {
@@ -331,8 +332,10 @@ func (p *Page) renderBytes(content []byte) []byte {
}
}
return helpers.RenderBytes(
- &helpers.RenderingContext{Content: content, PageFmt: p.determineMarkupType(),
- DocumentID: p.UniqueID(), Config: p.getRenderingConfig(), LinkResolver: fn, FileResolver: fileFn})
+ &helpers.RenderingContext{
+ Content: content, PageFmt: p.determineMarkupType(),
+ ConfigProvider: p.Language(),
+ DocumentID: p.UniqueID(), Config: p.getRenderingConfig(), LinkResolver: fn, FileResolver: fileFn})
}
func (p *Page) renderContent(content []byte) []byte {
@@ -346,16 +349,20 @@ func (p *Page) renderContent(content []byte) []byte {
return p.Node.Site.SourceRelativeLinkFile(ref, p)
}
}
- return helpers.RenderBytes(&helpers.RenderingContext{Content: content, RenderTOC: true, PageFmt: p.determineMarkupType(),
- DocumentID: p.UniqueID(), Config: p.getRenderingConfig(), LinkResolver: fn, FileResolver: fileFn})
+ return helpers.RenderBytes(&helpers.RenderingContext{
+ Content: content, RenderTOC: true, PageFmt: p.determineMarkupType(),
+ ConfigProvider: p.Language(),
+ DocumentID: p.UniqueID(), Config: p.getRenderingConfig(), LinkResolver: fn, FileResolver: fileFn})
}
func (p *Page) getRenderingConfig() *helpers.Blackfriday {
p.renderingConfigInit.Do(func() {
pageParam := cast.ToStringMap(p.GetParam("blackfriday"))
-
- p.renderingConfig = helpers.NewBlackfriday()
+ if p.Language() == nil {
+ panic(fmt.Sprintf("nil language for %s with source lang %s", p.BaseFileName(), p.lang))
+ }
+ p.renderingConfig = helpers.NewBlackfriday(p.Language())
if err := mapstructure.Decode(pageParam, p.renderingConfig); err != nil {
jww.FATAL.Printf("Failed to get rendering config for %s:\n%s", p.BaseFileName(), err.Error())
}
diff --git a/hugolib/pageSort_test.go b/hugolib/pageSort_test.go
index 7f0e89091..1ed99f318 100644
--- a/hugolib/pageSort_test.go
+++ b/hugolib/pageSort_test.go
@@ -141,9 +141,7 @@ func createSortTestPages(num int) Pages {
Section: "z",
URL: fmt.Sprintf("http://base/x/y/p%d.html", i),
},
- Site: &SiteInfo{
- BaseURL: "http://base/",
- },
+ Site: newSiteInfoDefaultLanguage("http://base/"),
},
Source: Source{File: *source.NewFile(filepath.FromSlash(fmt.Sprintf("/x/y/p%d.md", i)))},
}
diff --git a/hugolib/page_permalink_test.go b/hugolib/page_permalink_test.go
index a47bad85e..d185bebab 100644
--- a/hugolib/page_permalink_test.go
+++ b/hugolib/page_permalink_test.go
@@ -69,9 +69,7 @@ func TestPermalink(t *testing.T) {
Section: "z",
URL: test.url,
},
- Site: &SiteInfo{
- BaseURL: test.base,
- },
+ Site: newSiteInfoDefaultLanguage(string(test.base)),
},
Source: Source{File: *source.NewFile(filepath.FromSlash(test.file))},
}
diff --git a/hugolib/page_test.go b/hugolib/page_test.go
index 6927e6e82..da46151ed 100644
--- a/hugolib/page_test.go
+++ b/hugolib/page_test.go
@@ -1117,7 +1117,7 @@ func TestPagePaths(t *testing.T) {
for _, test := range tests {
p, _ := NewPageFrom(strings.NewReader(test.content), filepath.FromSlash(test.path))
- p.Node.Site = &SiteInfo{}
+ p.Node.Site = newSiteInfoDefaultLanguage("")
if test.hasPermalink {
p.Node.Site.Permalinks = siteParmalinksSetting
diff --git a/hugolib/pagination_test.go b/hugolib/pagination_test.go
index b67f5dce5..df2094d63 100644
--- a/hugolib/pagination_test.go
+++ b/hugolib/pagination_test.go
@@ -460,9 +460,7 @@ func createTestPages(num int) Pages {
Section: "z",
URL: fmt.Sprintf("http://base/x/y/p%d.html", i),
},
- Site: &SiteInfo{
- BaseURL: "http://base/",
- },
+ Site: newSiteInfoDefaultLanguage("http://base/"),
},
Source: Source{File: *source.NewFile(filepath.FromSlash(fmt.Sprintf("/x/y/p%d.md", i)))},
}
diff --git a/hugolib/shortcode.go b/hugolib/shortcode.go
index b63ba4a49..52cd6893b 100644
--- a/hugolib/shortcode.go
+++ b/hugolib/shortcode.go
@@ -242,7 +242,8 @@ func renderShortcode(sc shortcode, parent *ShortcodeWithPage, p *Page, t tpl.Tem
if sc.doMarkup {
newInner := helpers.RenderBytes(&helpers.RenderingContext{
Content: []byte(inner), PageFmt: p.determineMarkupType(),
- DocumentID: p.UniqueID(), Config: p.getRenderingConfig()})
+ ConfigProvider: p.Language(),
+ DocumentID: p.UniqueID(), Config: p.getRenderingConfig()})
// If the type is “unknown” or “markdown”, we assume the markdown
// generation has been performed. Given the input: `a line`, markdown
diff --git a/hugolib/shortcode_test.go b/hugolib/shortcode_test.go
index dd16bff07..1b5c6c847 100644
--- a/hugolib/shortcode_test.go
+++ b/hugolib/shortcode_test.go
@@ -28,29 +28,59 @@ import (
"github.com/spf13/hugo/target"
"github.com/spf13/hugo/tpl"
"github.com/spf13/viper"
+ "github.com/stretchr/testify/require"
)
+// TODO(bep) remove
func pageFromString(in, filename string) (*Page, error) {
return NewPageFrom(strings.NewReader(in), filename)
}
-func CheckShortCodeMatch(t *testing.T, input, expected string, template tpl.Template) {
- CheckShortCodeMatchAndError(t, input, expected, template, false)
+func CheckShortCodeMatch(t *testing.T, input, expected string, withTemplate func(templ tpl.Template