mirror/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2025-08-16 20:53:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix YAML loading of multilingual config

Browse Source 
And some other minor fixes from code review.

Updates #2309
This commit is contained in:
Bjørn Erik Pedersen
2016-08-10 22:46:02 +02:00
parent 446e606a09
commit d8a256c155
5 changed files with 74 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
helpers/url.go
View File

@@ -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 ""