From 4c735a78782e5b2e488729fa895fc757fcd0a6ed Mon Sep 17 00:00:00 2001
From: Joel Scoble <joel.scoble@outlook.com>
Date: Thu, 21 Aug 2014 18:01:34 -0500
Subject: [PATCH] preserve alias case while lowercasing taxonomy

---
 helpers/helpers_test.go | 23 +++++++++++++++++++++++
 helpers/path.go         | 13 +++++++++++--
 hugolib/taxonomy.go     |  2 +-
 3 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/helpers/helpers_test.go b/helpers/helpers_test.go
index 71e894766..822783025 100644
--- a/helpers/helpers_test.go
+++ b/helpers/helpers_test.go
@@ -36,6 +36,28 @@ func TestUgly(t *testing.T) {
 }
 
 func TestMakePath(t *testing.T) {
+	tests := []struct {
+		input    string
+		expected string
+	}{
+		{"  Foo bar  ", "Foo-bar"},
+		{"Foo.Bar/foo_Bar-Foo", "Foo.Bar/foo_Bar-Foo"},
+		{"fOO,bar:foo%bAR", "fOObarfoobAR"},
+		{"FOo/BaR.html", "FOo/BaR.html"},
+		{"трям/трям", "трям/трям"},
+		{"은행","은행"},
+		{"Банковский кассир","Банковский-кассир"},
+	}
+
+	for _, test := range tests {
+		output := MakePath(test.input)
+		if output != test.expected {
+			t.Errorf("Expected %#v, got %#v\n", test.expected, output)
+		}
+	}
+}
+
+func TestMakeToLower(t *testing.T) {
 	tests := []struct {
 		input    string
 		expected string
@@ -45,6 +67,7 @@ func TestMakePath(t *testing.T) {
 		{"foo,bar:foo%bar", "foobarfoobar"},
 		{"foo/bar.html", "foo/bar.html"},
 		{"трям/трям", "трям/трям"},
+		{"은행","은행"},
 	}
 
 	for _, test := range tests {
diff --git a/helpers/path.go b/helpers/path.go
index 0cd56e0d9..2f63c718c 100644
--- a/helpers/path.go
+++ b/helpers/path.go
@@ -29,9 +29,18 @@ import (
 var sanitizeRegexp = regexp.MustCompile("[^a-zA-Z0-9./_-]")
 
 // Take a string with any characters and replace it so the string could be used in a path.
-// E.g. Social Media -> social-media
+// MakePath creates a Unicode sanitized string, with the spaces replaced, whilst
+// preserving the original casing of the string.
+// E.g. Social Media -> Social-Media
 func MakePath(s string) string {
-	return UnicodeSanitize(strings.ToLower(strings.Replace(strings.TrimSpace(s), " ", "-", -1)))
+	return UnicodeSanitize(strings.Replace(strings.TrimSpace(s), " ", "-", -1))
+}
+
+// MakePathToLowerr creates a Unicode santized string, with the spaces replaced,
+// and transformed to lower case.
+// E.g. Social Media -> social-media
+func MakePathToLower(s string) string {
+        return UnicodeSanitize(strings.ToLower(strings.Replace(strings.TrimSpace(s), " ", "-", -1)))
 }
 
 func MakeTitle(inpath string) string {
diff --git a/hugolib/taxonomy.go b/hugolib/taxonomy.go
index 5bb69eb90..6939e076d 100644
--- a/hugolib/taxonomy.go
+++ b/hugolib/taxonomy.go
@@ -60,7 +60,7 @@ type OrderedTaxonomyEntry struct {
 
 // KeyPrep... Taxonomies should be case insensitive. Can make it easily conditional later.
 func kp(in string) string {
-	return helpers.MakePath(in)
+	return helpers.MakePathToLower(in)
 }
 
 func (i Taxonomy) Get(key string) WeightedPages { return i[kp(key)] }