Make paginate settings configurable per language

Fixes #2449

3 files changed, 14 insertions, 3 deletions

diff --git a/helpers/configProvider.go b/helpers/configProvider.go
index 16a203302..35500f6de 100644
--- a/helpers/configProvider.go
+++ b/helpers/configProvider.go
@@ -17,9 +17,20 @@
 // string operations on content.
 package helpers
 
+import (
+	"github.com/spf13/viper"
+)
+
 // ConfigProvider provides the configuration settings for Hugo.
 type ConfigProvider interface {
 	GetString(key string) string
+	GetInt(key string) int
 	GetStringMap(key string) map[string]interface{}
 	GetStringMapString(key string) map[string]string
 }
+
+// Config returns the currently active Hugo config. This will be set
+// per site (language) rendered.
+func Config() ConfigProvider {
+	return viper.Get("CurrentContentLanguage").(ConfigProvider)
+}
diff --git a/helpers/language.go b/helpers/language.go
index c822dedd0..9ebec5a65 100644
--- a/helpers/language.go
+++ b/helpers/language.go
@@ -84,9 +84,9 @@ func (l *Language) SetParam(k string, v interface{}) {
 	l.params[k] = v
 }
 
-func (l *Language) GetBool(key string) bool { return cast.ToBool(l.Get(key)) }
-
+func (l *Language) GetBool(key string) bool     { return cast.ToBool(l.Get(key)) }
 func (l *Language) GetString(key string) string { return cast.ToString(l.Get(key)) }
+func (l *Language) GetInt(key string) int       { return cast.ToInt(l.Get(key)) }
 
 func (ml *Language) GetStringMap(key string) map[string]interface{} {
 	return cast.ToStringMap(ml.Get(key))
diff --git a/helpers/path.go b/helpers/path.go
index b7e6f51a9..b8f642470 100644
--- a/helpers/path.go
+++ b/helpers/path.go
@@ -341,7 +341,7 @@ func GetRelativePath(path, base string) (final string, err error) {
 
 // PaginateAliasPath creates a path used to access the aliases in the paginator.
 func PaginateAliasPath(base string, page int) string {
-	paginatePath := viper.GetString("paginatePath")
+	paginatePath := Config().GetString("paginatePath")
 	uglify := viper.GetBool("UglyURLs")
 	var p string
 	if base != "" {