hugolib: Render 404.html for all languages

 Fixes #3598

diff --git a/hugolib/site_render.go b/hugolib/site_render.go
index a24946cf34a8f3f24b5e03d6797da4e34caf6dc0..42433a70a78342cd7e71ca9470bb03eb80f31f88 100644 (file)
--- 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 {