diff options
| author | Prashant Karmakar <webster15july@gmail.com> | 2016-11-01 16:18:24 +0300 |
|---|---|---|
| committer | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2016-11-01 16:18:24 +0300 |
| commit | 186db7cd7ad56051d5a064ee5120e6ec73f575a0 (patch) | |
| tree | 58ccdae205c55af5a01be7f87a9a5ce1a27051b9 /source | |
| parent | cda3b36fe2c1fd708fe5c9b9388c3880004bd1c6 (diff) | |
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
Diffstat (limited to 'source')
| -rw-r--r-- | source/file.go | 9 |
1 files changed, 6 insertions, 3 deletions
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()) |