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

Fix handling of content files with "." in them

Browse Source 
As in, more dots than just to separate the extension and any language indicator.

Fixes #4559
This commit is contained in:
Bjørn Erik Pedersen
2018-04-07 10:10:06 +02:00
parent 623c9afa84
commit 2817e84240
4 changed files with 54 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/fileInfo.go
View File

@@ -204,9 +204,8 @@ func (sp *SourceSpec) NewFileInfo(baseDir, filename string, isLeafBundle bool, f
// This is usyally provided by the filesystem. But this FileInfo is also
// created in a standalone context when doing "hugo new". This is
// an approximate implementation, which is "good enough" in that case.
translationBaseName = strings.TrimSuffix(baseName, ext)
fileLangExt := filepath.Ext(translationBaseName)
translationBaseName = strings.TrimSuffix(translationBaseName, fileLangExt)
fileLangExt := filepath.Ext(baseName)
translationBaseName = strings.TrimSuffix(baseName, fileLangExt)
}
f := &FileInfo{

7
source/fileInfo_test.go
View File

@@ -49,6 +49,13 @@ func TestFileInfo(t *testing.T) {
assert.Equal("b", f.Section())
}},
{filepath.FromSlash("/a/"), filepath.FromSlash("/a/b/page.en.MD"), func(f *FileInfo) {
assert.Equal("b", f.Section())
assert.Equal(filepath.FromSlash("b/page.en.MD"), f.Path())
assert.Equal(filepath.FromSlash("page"), f.TranslationBaseName())
assert.Equal(filepath.FromSlash("page.en"), f.BaseFileName())
}},
} {
f := s.NewFileInfo(this.base, this.filename, false, nil)
this.assert(f)