diff options
| author | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2016-08-10 22:46:02 +0200 |
|---|---|---|
| committer | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2016-09-06 18:32:20 +0300 |
| commit | d8a256c155d23ad451625fcb292b297d85888c4c (patch) | |
| tree | ed3e7218c7b819b31dc62bb177baa011cf6c61c9 /helpers/url.go | |
| parent | 446e606a098aeacbaaf89a53c7addd33cd888a74 (diff) | |
| download | hugo-d8a256c155d23ad451625fcb292b297d85888c4c.tar.gz hugo-d8a256c155d23ad451625fcb292b297d85888c4c.zip | |
Fix YAML loading of multilingual config
And some other minor fixes from code review.
Updates #2309
Diffstat (limited to 'helpers/url.go')
| -rw-r--r-- | helpers/url.go | 7 |
1 files changed, 4 insertions, 3 deletions
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 "" |