mirror/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2025-09-08 23:40:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6149 from bep/sort-caseinsensitive

Browse Source 
Implement lexicographically string sorting
This commit is contained in:
Bjørn Erik Pedersen
2019-08-01 10:19:19 +02:00
committed by GitHub
parent a4f96a9d8c
commit 53077b0da5
14 changed files with 246 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hugolib/menu_test.go
View File

@@ -213,8 +213,8 @@ menu: "main"
b.Build(BuildCfg{})
b.AssertFileContent("public/index.html", "AMP and HTML|/blog/html-amp/|AMP only|/amp/blog/amp/|HTML only|/blog/html/|Home Sweet Home|/|")
b.AssertFileContent("public/amp/index.html", "AMP and HTML|/amp/blog/html-amp/|AMP only|/amp/blog/amp/|HTML only|/blog/html/|Home Sweet Home|/amp/|")
b.AssertFileContent("public/index.html", "AMP and HTML|/blog/html-amp/|AMP only|/amp/blog/amp/|Home Sweet Home|/|HTML only|/blog/html/|")
b.AssertFileContent("public/amp/index.html", "AMP and HTML|/amp/blog/html-amp/|AMP only|/amp/blog/amp/|Home Sweet Home|/amp/|HTML only|/blog/html/|")
}
// https://github.com/gohugoio/hugo/issues/5989

6
hugolib/taxonomy.go
View File

@@ -18,6 +18,8 @@ import (
"path"
"sort"
"github.com/gohugoio/hugo/compare"
"github.com/gohugoio/hugo/resources/page"
"github.com/gohugoio/hugo/resources/resource"
)
@@ -73,7 +75,7 @@ func (i Taxonomy) TaxonomyArray() OrderedTaxonomy {
// Alphabetical returns an ordered taxonomy sorted by key name.
func (i Taxonomy) Alphabetical() OrderedTaxonomy {
name := func(i1, i2 *OrderedTaxonomyEntry) bool {
return i1.Name < i2.Name
return compare.LessStrings(i1.Name, i2.Name)
}
ia := i.TaxonomyArray()
@@ -89,7 +91,7 @@ func (i Taxonomy) ByCount() OrderedTaxonomy {
li2 := len(i2.WeightedPages)
if li1 == li2 {
return i1.Name < i2.Name
return compare.LessStrings(i1.Name, i2.Name)
}
return li1 > li2
}