projects / brevno-suite / hugo / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: cdb8b08)
Add lang attribute to internal alias template
authorJoe Mooring <joe.mooring@veriphor.com>
Wed, 2 Mar 2022 04:27:52 +0000 (20:27 -0800)
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Wed, 9 Mar 2022 18:06:59 +0000 (19:06 +0100)
Closes #9586

hugolib/alias_test.go patch | blob | history
hugolib/hugo_sites_build_test.go patch | blob | history
hugolib/page_test.go patch | blob | history
tpl/tplimpl/embedded/templates/alias.html patch | blob | history

diff --git a/hugolib/alias_test.go b/hugolib/alias_test.go
index d5ffc06fe610f775973a41a4e20fcad0974de46c..8c00f8360f08a920e96a576e1d8c953e03efbc11 100644 (file)
--- a/hugolib/alias_test.go
+++ b/hugolib/alias_test.go
@@ -71,8 +71,8 @@ func TestAlias(t *testing.T) {
                // the real page
                b.AssertFileContent("public/blog/page"+test.fileSuffix, "For some moments the old man")
                // the alias redirectors
-               b.AssertFileContent("public/foo/bar"+test.fileSuffix, "<meta http-equiv=\"refresh\" content=\"0; url="+test.urlPrefix+"/blog/page"+test.urlSuffix+"\" />")
-               b.AssertFileContent("public/blog/rel"+test.fileSuffix, "<meta http-equiv=\"refresh\" content=\"0; url="+test.urlPrefix+"/blog/page"+test.urlSuffix+"\" />")
+               b.AssertFileContent("public/foo/bar"+test.fileSuffix, "<meta http-equiv=\"refresh\" content=\"0; url="+test.urlPrefix+"/blog/page"+test.urlSuffix+"\">")
+               b.AssertFileContent("public/blog/rel"+test.fileSuffix, "<meta http-equiv=\"refresh\" content=\"0; url="+test.urlPrefix+"/blog/page"+test.urlSuffix+"\">")
        }
 }
 
diff --git a/hugolib/hugo_sites_build_test.go b/hugolib/hugo_sites_build_test.go
index fdfc33c5a158db5607b64bc204565ed08cd61e8e..35804b89a5231d441dbbb85bf5ab832f79b9a66e 100644 (file)
--- a/hugolib/hugo_sites_build_test.go
+++ b/hugolib/hugo_sites_build_test.go
@@ -83,14 +83,14 @@ func doTestMultiSitesMainLangInRoot(t *testing.T, defaultInSubDir bool) {
                c.Assert(frRelPerm, qt.Equals, "/blog/fr/sect/doc1/")
 
                // should have a redirect on top level.
-               b.AssertFileContent("public/index.html", `<meta http-equiv="refresh" content="0; url=http://example.com/blog/fr" />`)
+               b.AssertFileContent("public/index.html", `<meta http-equiv="refresh" content="0; url=http://example.com/blog/fr">`)
        } else {
                // Main language in root
                c.Assert(frPerm, qt.Equals, "http://example.com/blog/sect/doc1/")
                c.Assert(frRelPerm, qt.Equals, "/blog/sect/doc1/")
 
                // should have redirect back to root
-               b.AssertFileContent("public/fr/index.html", `<meta http-equiv="refresh" content="0; url=http://example.com/blog" />`)
+               b.AssertFileContent("public/fr/index.html", `<meta http-equiv="refresh" content="0; url=http://example.com/blog">`)
        }
        b.AssertFileContent(pathMod("public/fr/index.html"), "Home", "Bonjour")
        b.AssertFileContent("public/en/index.html", "Home", "Hello")
diff --git a/hugolib/page_test.go b/hugolib/page_test.go
index 637ac46f77a72ffded1f8a410efe13a6f1bc69fa..926fdb354bccd8dfcf9ba728d772a86e43dca684 100644 (file)
--- a/hugolib/page_test.go
+++ b/hugolib/page_test.go
@@ -1653,11 +1653,11 @@ tags:
                                th.assertFileContent(pathFunc("public/post/test0.dot/index.html"), "some content")
 
                                if uglyURLs {
-                                       th.assertFileContent("public/post/page/1.html", `canonical" href="/post.html"/`)
+                                       th.assertFileContent("public/post/page/1.html", `canonical" href="/post.html"`)
                                        th.assertFileContent("public/post.html", `<body>P1|URL: /post.html|Next: /post/page/2.html</body>`)
                                        th.assertFileContent("public/post/page/2.html", `<body>P2|URL: /post/page/2.html|Next: /post/page/3.html</body>`)
                                } else {
-                                       th.assertFileContent("public/post/page/1/index.html", `canonical" href="/post/"/`)
+                                       th.assertFileContent("public/post/page/1/index.html", `canonical" href="/post/"`)
                                        th.assertFileContent("public/post/index.html", `<body>P1|URL: /post/|Next: /post/page/2/</body>`)
                                        th.assertFileContent("public/post/page/2/index.html", `<body>P2|URL: /post/page/2/|Next: /post/page/3/</body>`)
                                        th.assertFileContent("public/tags/.net/index.html", `<body>P1|URL: /tags/.net/|Next: /tags/.net/page/2/</body>`)
diff --git a/tpl/tplimpl/embedded/templates/alias.html b/tpl/tplimpl/embedded/templates/alias.html
index ee3f556e517f00474abcaba6434df3130fe9f7e1..8448760fab5d2a72e4cb3fdb8b528db17286177f 100644 (file)
--- a/tpl/tplimpl/embedded/templates/alias.html
+++ b/tpl/tplimpl/embedded/templates/alias.html
@@ -1 +1,10 @@
-<!DOCTYPE html><html><head><title>{{ .Permalink }}</title><link rel="canonical" href="{{ .Permalink }}"/><meta name="robots" content="noindex"><meta charset="utf-8" /><meta http-equiv="refresh" content="0; url={{ .Permalink }}" /></head></html>
\ No newline at end of file
+<!DOCTYPE html>
+<html{{ with site.LanguageCode | default site.Language.Lang }} lang="{{ . }}"{{ end }}>
+  <head>
+    <title>{{ .Permalink }}</title>
+    <link rel="canonical" href="{{ .Permalink }}">
+    <meta name="robots" content="noindex">
+    <meta charset="utf-8">
+    <meta http-equiv="refresh" content="0; url={{ .Permalink }}">
+  </head>
+</html>
Unnamed repository; edit this file 'description' to name the repository.