From 24c1770288803bd7a344f5903dd4f03cccc6a8f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?=
 <bjorn.erik.pedersen@gmail.com>
Date: Sat, 25 Mar 2017 19:21:19 +0100
Subject: [PATCH] hugolib: Revise paginator alias path handling

---
 helpers/path.go        | 17 -----------------
 hugolib/site_render.go | 13 ++++++++-----
 2 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/helpers/path.go b/helpers/path.go
index 14d98e2c0..554e9977d 100644
--- a/helpers/path.go
+++ b/helpers/path.go
@@ -358,23 +358,6 @@ func GetRelativePath(path, base string) (final string, err error) {
 	return name, nil
 }
 
-// PaginateAliasPath creates a path used to access the aliases in the paginator.
-func (p *PathSpec) PaginateAliasPath(base string, page int) string {
-	paginatePath := p.paginatePath
-	uglify := p.uglyURLs
-	var pth string
-	if base != "" {
-		pth = filepath.FromSlash(fmt.Sprintf("/%s/%s/%d", base, paginatePath, page))
-	} else {
-		pth = filepath.FromSlash(fmt.Sprintf("/%s/%d", paginatePath, page))
-	}
-	if uglify {
-		pth += ".html"
-	}
-
-	return pth
-}
-
 // GuessSection returns the section given a source path.
 // A section is the part between the root slash and the second slash
 // or before the first slash.
diff --git a/hugolib/site_render.go b/hugolib/site_render.go
index be512fe48..fdac03489 100644
--- a/hugolib/site_render.go
+++ b/hugolib/site_render.go
@@ -122,12 +122,15 @@ func (s *Site) renderPaginator(p *PageOutput) error {
 		paginatePath := s.Cfg.GetString("paginatePath")
 
 		// write alias for page 1
-		// TODO(bep) ml all of these n.addLang ... fix.
-		//TODO(bep) output fix
+		addend := fmt.Sprintf("/%s/%d", paginatePath, 1)
+		target, err := p.createTargetPath(p.outputFormat, addend)
+		if err != nil {
+			return err
+		}
 
-		aliasPath := p.addLangPathPrefix(s.PathSpec.PaginateAliasPath(path.Join(p.sections...), 1))
-		link := p.Permalink()
-		s.writeDestAlias(aliasPath, link, nil)
+		// TODO(bep) output do better
+		link := newOutputFormat(p.Page, p.outputFormat).Permalink()
+		s.writeDestAlias(target, link, nil)
 
 		pagers := p.paginator.Pagers()