Make removal of accents in taxonomy and section paths optional

And default off.

Fixes #1180

diff --git a/commands/hugo.go b/commands/hugo.go
index 2b0250965fafa33a0d700c18b9baf15e396bc60d..5cea9d0950e30ccf06516661c2778ea5cd741240 100644 (file)
--- a/commands/hugo.go
+++ b/commands/hugo.go
@@ -141,6 +141,7 @@ func LoadDefaultSettings() {
        viper.SetDefault("IgnoreCache", false)
        viper.SetDefault("CanonifyURLs", false)
        viper.SetDefault("RelativeURLs", false)
+       viper.SetDefault("RemovePathAccents", false)
        viper.SetDefault("Taxonomies", map[string]string{"tag": "tags", "category": "categories"})
        viper.SetDefault("Permalinks", make(hugolib.PermalinkOverrides, 0))
        viper.SetDefault("Sitemap", hugolib.Sitemap{Priority: -1})
@@ -192,7 +193,7 @@ func InitializeConfig() {
        if hugoCmdV.PersistentFlags().Lookup("disableSitemap").Changed {
                viper.Set("DisableSitemap", DisableSitemap)
        }
-       
+
        if hugoCmdV.PersistentFlags().Lookup("verbose").Changed {
                viper.Set("Verbose", Verbose)
        }

diff --git a/helpers/path.go b/helpers/path.go
index 5e5e3fa897cb0b73850afcb649f265cedc8b1a2d..0c601a8686a91932c4ffe69d08944377e78170d0 100644 (file)
--- a/helpers/path.go
+++ b/helpers/path.go
@@ -99,9 +99,16 @@ func UnicodeSanitize(s string) string {
                }
        }
 
-       // remove accents - see https://blog.golang.org/normalization
-       t := transform.Chain(norm.NFD, transform.RemoveFunc(isMn), norm.NFC)
-       result, _, _ := transform.String(t, string(target))
+       var result string
+
+       if viper.GetBool("RemovePathAccents") {
+               // remove accents - see https://blog.golang.org/normalization
+               t := transform.Chain(norm.NFD, transform.RemoveFunc(isMn), norm.NFC)
+               result, _, _ = transform.String(t, string(target))
+       } else {
+               result = string(target)
+       }
+
        return result
 
        return string(target)

diff --git a/helpers/path_test.go b/helpers/path_test.go
index 3fdb94a4f166b0eedbf835d41405b940188e2872..5cf863b6c10021f4205250954166f2a4bbe2df4f 100644 (file)
--- a/helpers/path_test.go
+++ b/helpers/path_test.go
@@ -17,6 +17,10 @@ import (
 )
 
 func TestMakePath(t *testing.T) {
+       viper.Reset()
+       defer viper.Reset()
+       viper.Set("RemovePathAccents", true)
+
        tests := []struct {
                input    string
                expected string
@@ -717,7 +721,7 @@ func TestGetTempDir(t *testing.T) {
                {testDir + "FOo/BaR.html", dir + testDir + "FOo/BaR.html" + FilePathSeparator},
                {testDir + "трям/трям", dir + testDir + "трям/трям" + FilePathSeparator},
                {testDir + "은행", dir + testDir + "은행" + FilePathSeparator},
-               {testDir + "Ð\91анковÑ\81кий каÑ\81Ñ\81иÑ\80", dir + testDir + "Ð\91анковÑ\81кии-кассир" + FilePathSeparator},
+               {testDir + "Ð\91анковÑ\81кий каÑ\81Ñ\81иÑ\80", dir + testDir + "Ð\91анковÑ\81кий-кассир" + FilePathSeparator},
        }
 
        for _, test := range tests {