From d8a256c155d23ad451625fcb292b297d85888c4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?= Date: Wed, 10 Aug 2016 22:46:02 +0200 Subject: Fix YAML loading of multilingual config And some other minor fixes from code review. Updates #2309 --- helpers/url.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'helpers/url.go') diff --git a/helpers/url.go b/helpers/url.go index 4d06fb042..1d87cf89f 100644 --- a/helpers/url.go +++ b/helpers/url.go @@ -183,12 +183,13 @@ func AbsURL(in string, addLanguage bool) string { } func getLanguagePrefix() string { - defaultLang := viper.GetString("DefaultContentLanguage") - defaultInSubDir := viper.GetBool("DefaultContentLanguageInSubdir") - if !viper.GetBool("Multilingual") { return "" } + + defaultLang := viper.GetString("DefaultContentLanguage") + defaultInSubDir := viper.GetBool("DefaultContentLanguageInSubdir") + currentLang := viper.Get("CurrentContentLanguage").(*Language).Lang if currentLang == "" || (currentLang == defaultLang && !defaultInSubDir) { return "" -- cgit v1.2.3