diff options
| -rw-r--r-- | hugolib/page.go | 4 | ||||
| -rw-r--r-- | source/file.go | 9 |
2 files changed, 8 insertions, 5 deletions
diff --git a/hugolib/page.go b/hugolib/page.go index 111cb52bd..79889cd3f 100644 --- a/hugolib/page.go +++ b/hugolib/page.go @@ -586,7 +586,7 @@ func (p *Page) permalink() (*url.URL, error) { permalink = helpers.URLPrep(viper.GetBool("uglyURLs"), path.Join(dir, p.Slug+"."+p.Extension())) } else { t := p.Source.TranslationBaseName() - permalink = helpers.URLPrep(viper.GetBool("uglyURLs"), path.Join(dir, helpers.ReplaceExtension(strings.TrimSpace(t), p.Extension()))) + permalink = helpers.URLPrep(viper.GetBool("uglyURLs"), path.Join(dir, (strings.TrimSpace(t)+"."+p.Extension()))) } } @@ -1163,7 +1163,7 @@ func (p *Page) TargetPath() (outfile string) { outfile = strings.TrimSpace(p.Slug) + "." + p.Extension() } else { // Fall back to filename - outfile = helpers.ReplaceExtension(p.Source.TranslationBaseName(), p.Extension()) + outfile = (p.Source.TranslationBaseName() + "." + p.Extension()) } return p.addLangFilepathPrefix(filepath.Join(strings.ToLower( diff --git a/source/file.go b/source/file.go index 7e3e7d7c4..c309bbd03 100644 --- a/source/file.go +++ b/source/file.go @@ -126,11 +126,14 @@ func NewFile(relpath string) *File { f.ext = strings.TrimPrefix(filepath.Ext(f.LogicalName()), ".") f.baseName = helpers.Filename(f.LogicalName()) - f.lang = strings.TrimPrefix(filepath.Ext(f.baseName), ".") - if f.lang == "" { + lang := strings.TrimPrefix(filepath.Ext(f.baseName), ".") + if _, ok := viper.GetStringMap("languages")[lang]; lang == "" || !ok { f.lang = viper.GetString("defaultContentLanguage") + f.translationBaseName = f.baseName + } else { + f.lang = lang + f.translationBaseName = helpers.Filename(f.baseName) } - f.translationBaseName = helpers.Filename(f.baseName) f.section = helpers.GuessSection(f.Dir()) f.uniqueID = helpers.Md5String(f.LogicalName()) |