hugolib: Render 404.html for all languages - hugo - [fork] hugo port for 9front
(HTM) git clone git@git.drkhsh.at/hugo.git
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) Submodules
(DIR) README
(DIR) LICENSE
---
(DIR) commit 41805dca9e40e9b0952e04d06074e6fc91140495
(DIR) parent 7ee1f25e9ef3be8f99c171e8e7982f4f82c13e16
(HTM) Author: Mitchell Cohen <mitch.cohen@me.com>
Date: Sat, 1 Jul 2017 16:58:52 -0400
hugolib: Render 404.html for all languages
Fixes #3598
Diffstat:
M hugolib/site_render.go | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
---
(DIR) diff --git a/hugolib/site_render.go b/hugolib/site_render.go
@@ -239,10 +239,6 @@ func (s *Site) render404() error {
return nil
}
- if s.owner.multilingual.enabled() && (s.Language.Lang != s.owner.multilingual.DefaultLang.Lang) {
- return nil
- }
-
p := s.newNodePage(kind404)
p.Title = "404 Page not found"
@@ -256,13 +252,20 @@ func (s *Site) render404() error {
nfLayouts := []string{"404.html"}
- pageOutput, err := newPageOutput(p, false, output.HTMLFormat)
+ htmlOut := output.HTMLFormat
+ htmlOut.BaseName = "404"
+
+ pageOutput, err := newPageOutput(p, false, htmlOut)
if err != nil {
return err
}
- return s.renderAndWritePage("404 page", "404.html", pageOutput, s.appendThemeTemplates(nfLayouts)...)
+ targetPath, err := pageOutput.targetPath()
+ if err != nil {
+ s.Log.ERROR.Printf("Failed to create target path for page %q: %s", p, err)
+ }
+ return s.renderAndWritePage("404 page", targetPath, pageOutput, s.appendThemeTemplates(nfLayouts)...)
}
func (s *Site) renderSitemap() error {