From 186db7cd7ad56051d5a064ee5120e6ec73f575a0 Mon Sep 17 00:00:00 2001 From: Prashant Karmakar Date: Tue, 1 Nov 2016 18:48:24 +0530 Subject: Fix page names that contain dot changes: - in hugolib/page.go, `func permalink` and `func TargetPath` Fixed the attempt to *replace* the extension of something that was *already* a basename. - in source/file.go, `func NewFile` added check for allowed languages before translating filename Fixes #2555 --- source/file.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'source') 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()) -- cgit v1.2.3