diff options
author | Joe Mooring <[email protected]> | 2024-03-12 08:18:23 -0700 |
---|---|---|
committer | Bjørn Erik Pedersen <[email protected]> | 2024-03-13 17:34:42 +0200 |
commit | dc6a292133bf3249f1741a7624075b0782b16f84 (patch) | |
tree | ee11263c7a02b7f68e33185851511c08bb14c843 /hugolib | |
parent | 4f92f949eaf8c9827a758b3caadc672e0335480b (diff) | |
download | hugo-dc6a292133bf3249f1741a7624075b0782b16f84.tar.gz hugo-dc6a292133bf3249f1741a7624075b0782b16f84.zip |
common/hugo: Rename IsMultiHost and IsMultiLingual
hugo.IsMultiHost => hugo.IsMultihost
hugo.IsMultiLingual => hugo.IsMultilingual
Closes #12232
Diffstat (limited to 'hugolib')
-rw-r--r-- | hugolib/config_test.go | 42 | ||||
-rw-r--r-- | hugolib/content_map_page.go | 2 | ||||
-rw-r--r-- | hugolib/filesystems/basefs_test.go | 4 | ||||
-rw-r--r-- | hugolib/hugo_sites.go | 2 | ||||
-rw-r--r-- | hugolib/hugo_sites_multihost_test.go | 4 | ||||
-rw-r--r-- | hugolib/site.go | 3 | ||||
-rw-r--r-- | hugolib/site_new.go | 6 | ||||
-rw-r--r-- | hugolib/site_render.go | 2 |
8 files changed, 32 insertions, 33 deletions
diff --git a/hugolib/config_test.go b/hugolib/config_test.go index 7914dda45..22beea655 100644 --- a/hugolib/config_test.go +++ b/hugolib/config_test.go @@ -508,12 +508,12 @@ func TestLoadConfigFromThemeDir(t *testing.T) { theme = "test-theme" [params] -m1 = "mv1" +m1 = "mv1" ` themeConfig := ` [params] -t1 = "tv1" +t1 = "tv1" t2 = "tv2" ` @@ -885,9 +885,9 @@ ThisIsAParam: {{ site.Params.thisIsAParam }} ).BuildE() b.Assert(err, qt.IsNil) - b.AssertFileContent("public/index.html", ` + b.AssertFileContent("public/index.html", ` MyParam: enParamValue -ThisIsAParam: thisIsAParamValue +ThisIsAParam: thisIsAParamValue `) } @@ -919,7 +919,7 @@ title: "My Swedish Section" -- layouts/index.html -- LanguageCode: {{ eq site.LanguageCode site.Language.LanguageCode }}|{{ site.Language.LanguageCode }}| {{ range $i, $e := (slice site .Site) }} -{{ $i }}|AllPages: {{ len .AllPages }}|Sections: {{ if .Sections }}true{{ end }}| Author: {{ .Authors }}|BuildDrafts: {{ .BuildDrafts }}|IsMultiLingual: {{ .IsMultiLingual }}|Param: {{ .Language.Params.myparam }}|Language string: {{ .Language }}|Languages: {{ .Languages }} +{{ $i }}|AllPages: {{ len .AllPages }}|Sections: {{ if .Sections }}true{{ end }}| Author: {{ .Authors }}|BuildDrafts: {{ .BuildDrafts }}|IsMultilingual: {{ .IsMultiLingual }}|Param: {{ .Language.Params.myparam }}|Language string: {{ .Language }}|Languages: {{ .Languages }} {{ end }} @@ -939,9 +939,9 @@ LanguageCode: {{ eq site.LanguageCode site.Language.LanguageCode }}|{{ site.Lang b.AssertFileContent("public/index.html", ` AllPages: 4| Sections: true| -Param: enParamValue -Param: enParamValue -IsMultiLingual: true +Param: enParamValue +Param: enParamValue +IsMultilingual: true LanguageCode: true|en-US| `) @@ -1062,7 +1062,7 @@ Home ).BuildE() b.Assert(err, qt.IsNil) - b.AssertFileContent("public/index.html", ` + b.AssertFileContent("public/index.html", ` Home `) @@ -1095,7 +1095,7 @@ HTML. HTACCESS. - + ` b := Test(t, files) @@ -1111,7 +1111,7 @@ languageCode = "en-US" -- layouts/index.html -- LanguageCode: {{ .Site.LanguageCode }}|{{ site.Language.LanguageCode }}| - + ` b := Test(t, files) @@ -1137,7 +1137,7 @@ suffixes = ["bar"] -- layouts/index.html -- Home. - + ` b := Test(t, files) @@ -1164,8 +1164,8 @@ func TestConfigMiscPanics(t *testing.T) { params: -- layouts/index.html -- Foo: {{ site.Params.foo }}| - - + + ` b := Test(t, files) @@ -1188,8 +1188,8 @@ defaultContentLanguage = "en" weight = 1 -- layouts/index.html -- Foo: {{ site.Params.foo }}| - - + + ` b, err := NewIntegrationTestBuilder( IntegrationTestConfig{ @@ -1215,8 +1215,8 @@ languageCode = "en" languageName = "English" weight = 1 - - + + ` b, err := NewIntegrationTestBuilder( IntegrationTestConfig{ @@ -1241,7 +1241,7 @@ contentDir = "mycontent" -- layouts/index.html -- Home. - + ` b := Test(t, files) @@ -1343,7 +1343,7 @@ disabled = true -- layouts/index.html -- Home. - + ` b := Test(t, files) @@ -1438,7 +1438,7 @@ home = ["html"] -- hugo.toml -- baseURL = "https://example.com" disableKinds = ["taxonomy", "term", "RSS", "sitemap", "robotsTXT", "page", "section"] - + ` runVariant(t, files, nil) diff --git a/hugolib/content_map_page.go b/hugolib/content_map_page.go index 764078623..906fced77 100644 --- a/hugolib/content_map_page.go +++ b/hugolib/content_map_page.go @@ -1778,7 +1778,7 @@ func (sa *sitePagesAssembler) addStandalonePages() error { if sitemapEnabled { addStandalone("/_sitemap", kinds.KindSitemap, output.SitemapFormat) - skipSitemapIndex := s.Conf.IsMultihost() || !(s.Conf.DefaultContentLanguageInSubdir() || s.Conf.IsMultiLingual()) + skipSitemapIndex := s.Conf.IsMultihost() || !(s.Conf.DefaultContentLanguageInSubdir() || s.Conf.IsMultilingual()) if !skipSitemapIndex { addStandalone("/_sitemapindex", kinds.KindSitemapIndex, output.SitemapIndexFormat) diff --git a/hugolib/filesystems/basefs_test.go b/hugolib/filesystems/basefs_test.go index 10b4a4cb2..e39709386 100644 --- a/hugolib/filesystems/basefs_test.go +++ b/hugolib/filesystems/basefs_test.go @@ -315,7 +315,7 @@ func TestStaticFs(t *testing.T) { checkFileContent(sfs, "f2.txt", c, "Hugo Themes Still Rocks!") } -func TestStaticFsMultiHost(t *testing.T) { +func TestStaticFsMultihost(t *testing.T) { c := qt.New(t) v := config.New() workDir := "mywork" @@ -537,7 +537,7 @@ SCSS Match: {{ with resources.Match "**.scss" }}{{ . | len }}|{{ range .}}{{ .Re b := hugolib.Test(t, files) - b.AssertFileContent("public/index.html", ` + b.AssertFileContent("public/index.html", ` SCSS: /scss/app.scss|body { color: blue; }| SCSS Match: 2| `) diff --git a/hugolib/hugo_sites.go b/hugolib/hugo_sites.go index 99dc88b10..671785f44 100644 --- a/hugolib/hugo_sites.go +++ b/hugolib/hugo_sites.go @@ -269,7 +269,7 @@ func (h *HugoSites) pickOneAndLogTheRest(errors []error) error { return errors[i] } -func (h *HugoSites) isMultiLingual() bool { +func (h *HugoSites) isMultilingual() bool { return len(h.Sites) > 1 } diff --git a/hugolib/hugo_sites_multihost_test.go b/hugolib/hugo_sites_multihost_test.go index 4b779ee92..937166146 100644 --- a/hugolib/hugo_sites_multihost_test.go +++ b/hugolib/hugo_sites_multihost_test.go @@ -66,12 +66,12 @@ robots|{{ site.Language.Lang }} 404|{{ site.Language.Lang }} - + ` b := Test(t, files) - b.Assert(b.H.Conf.IsMultiLingual(), qt.Equals, true) + b.Assert(b.H.Conf.IsMultilingual(), qt.Equals, true) b.Assert(b.H.Conf.IsMultihost(), qt.Equals, true) // helpers.PrintFs(b.H.Fs.PublishDir, "", os.Stdout) diff --git a/hugolib/site.go b/hugolib/site.go index 5a58e8373..117e10144 100644 --- a/hugolib/site.go +++ b/hugolib/site.go @@ -297,7 +297,6 @@ func (s *siteRefLinker) refLink(ref string, source any, relative bool, outputFor ref = filepath.ToSlash(ref) refURL, err = url.Parse(ref) - if err != nil { return s.notFoundURL, err } @@ -681,7 +680,7 @@ func (s *Site) getLanguagePermalinkLang(alwaysInSubDir bool) string { return "" } - if s.h.Conf.IsMultiLingual() && alwaysInSubDir { + if s.h.Conf.IsMultilingual() && alwaysInSubDir { return s.Language().Lang } diff --git a/hugolib/site_new.go b/hugolib/site_new.go index 5a5811958..21d5ace96 100644 --- a/hugolib/site_new.go +++ b/hugolib/site_new.go @@ -484,10 +484,10 @@ func (s *Site) BuildDrafts() bool { return s.conf.BuildDrafts } -// Deprecated: Use hugo.IsMultiLingual instead. +// Deprecated: Use hugo.IsMultilingual instead. func (s *Site) IsMultiLingual() bool { - hugo.Deprecate(".Site.IsMultiLingual", "Use hugo.IsMultiLingual instead.", "v0.124.0") - return s.h.isMultiLingual() + hugo.Deprecate(".Site.IsMultiLingual", "Use hugo.IsMultilingual instead.", "v0.124.0") + return s.h.isMultilingual() } func (s *Site) LanguagePrefix() string { diff --git a/hugolib/site_render.go b/hugolib/site_render.go index 1cf4b9a61..86be897fa 100644 --- a/hugolib/site_render.go +++ b/hugolib/site_render.go @@ -334,7 +334,7 @@ func (s *Site) renderAliases() error { // renderMainLanguageRedirect creates a redirect to the main language home, // depending on if it lives in sub folder (e.g. /en) or not. func (s *Site) renderMainLanguageRedirect() error { - if s.h.Conf.IsMultihost() || !(s.h.Conf.DefaultContentLanguageInSubdir() || s.h.Conf.IsMultiLingual()) { + if s.h.Conf.IsMultihost() || !(s.h.Conf.DefaultContentLanguageInSubdir() || s.h.Conf.IsMultilingual()) { // No need for a redirect return nil } |