diff options
| author | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2018-01-05 12:01:13 +0100 |
|---|---|---|
| committer | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2018-01-06 10:29:13 +0100 |
| commit | ab82a27d055c3aa177821d81a45a5c6e972aa29e (patch) | |
| tree | d63246b0801d2cafbb755a204a5920beb067f94e /helpers | |
| parent | f25d8a9e17fb65fa41dafdcbf0358853d68eaf45 (diff) | |
Fix URLs for bundle resources in multihost mode
Fixes #4217
Diffstat (limited to 'helpers')
| -rw-r--r-- | helpers/pathspec.go | 10 | ||||
| -rw-r--r-- | helpers/pathspec_test.go | 2 | ||||
| -rw-r--r-- | helpers/url.go | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/helpers/pathspec.go b/helpers/pathspec.go index 450391f16..d35538b85 100644 --- a/helpers/pathspec.go +++ b/helpers/pathspec.go @@ -35,8 +35,8 @@ type PathSpec struct { uglyURLs bool canonifyURLs bool - language *Language - languages Languages + Language *Language + Languages Languages // pagination path handling paginatePath string @@ -70,7 +70,7 @@ type PathSpec struct { } func (p PathSpec) String() string { - return fmt.Sprintf("PathSpec, language %q, prefix %q, multilingual: %T", p.language.Lang, p.getLanguagePrefix(), p.multilingual) + return fmt.Sprintf("PathSpec, language %q, prefix %q, multilingual: %T", p.Language.Lang, p.getLanguagePrefix(), p.multilingual) } // NewPathSpec creats a new PathSpec from the given filesystems and Language. @@ -113,8 +113,8 @@ func NewPathSpec(fs *hugofs.Fs, cfg config.Provider) (*PathSpec, error) { uglyURLs: cfg.GetBool("uglyURLs"), canonifyURLs: cfg.GetBool("canonifyURLs"), multilingual: cfg.GetBool("multilingual"), - language: language, - languages: languages, + Language: language, + Languages: languages, defaultContentLanguageInSubdir: cfg.GetBool("defaultContentLanguageInSubdir"), defaultContentLanguage: cfg.GetString("defaultContentLanguage"), paginatePath: cfg.GetString("paginatePath"), diff --git a/helpers/pathspec_test.go b/helpers/pathspec_test.go index eb1623a5e..e10ccc639 100644 --- a/helpers/pathspec_test.go +++ b/helpers/pathspec_test.go @@ -50,7 +50,7 @@ func TestNewPathSpecFromConfig(t *testing.T) { require.True(t, p.removePathAccents) require.True(t, p.uglyURLs) require.Equal(t, "no", p.defaultContentLanguage) - require.Equal(t, "no", p.language.Lang) + require.Equal(t, "no", p.Language.Lang) require.Equal(t, "side", p.paginatePath) require.Equal(t, "http://base.com", p.BaseURL.String()) diff --git a/helpers/url.go b/helpers/url.go index e2501cd1a..ef08a7530 100644 --- a/helpers/url.go +++ b/helpers/url.go @@ -208,7 +208,7 @@ func (p *PathSpec) getLanguagePrefix() string { defaultLang := p.defaultContentLanguage defaultInSubDir := p.defaultContentLanguageInSubdir - currentLang := p.language.Lang + currentLang := p.Language.Lang if currentLang == "" || (currentLang == defaultLang && !defaultInSubDir) { return "" } @@ -221,7 +221,7 @@ func (p *PathSpec) GetLangSubDir(lang string) string { return "" } - if p.languages.IsMultihost() { + if p.Languages.IsMultihost() { return "" } |