mirror of
https://github.com/tiennm99/hugoDocs.git
synced 2026-10-13 18:15:45 +00:00
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
This commit is contained in:
1 parent
cda3b36fe2
commit
186db7cd7a
2 files changed
+8
-5
No files matched your search
+2
-2
@@ -586,7 +586,7 @@ func (p *Page) permalink() (*url.URL, error) {
|
|||||||
permalink = helpers.URLPrep(viper.GetBool("uglyURLs"), path.Join(dir, p.Slug+"."+p.Extension()))
|
permalink = helpers.URLPrep(viper.GetBool("uglyURLs"), path.Join(dir, p.Slug+"."+p.Extension()))
|
||||||
} else {
|
} else {
|
||||||
t := p.Source.TranslationBaseName()
|
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()
|
outfile = strings.TrimSpace(p.Slug) + "." + p.Extension()
|
||||||
} else {
|
} else {
|
||||||
// Fall back to filename
|
// 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(
|
return p.addLangFilepathPrefix(filepath.Join(strings.ToLower(
|
||||||
|
|||||||
+6
-3
@@ -126,11 +126,14 @@ func NewFile(relpath string) *File {
|
|||||||
f.ext = strings.TrimPrefix(filepath.Ext(f.LogicalName()), ".")
|
f.ext = strings.TrimPrefix(filepath.Ext(f.LogicalName()), ".")
|
||||||
f.baseName = helpers.Filename(f.LogicalName())
|
f.baseName = helpers.Filename(f.LogicalName())
|
||||||
|
|
||||||
f.lang = strings.TrimPrefix(filepath.Ext(f.baseName), ".")
|
lang := strings.TrimPrefix(filepath.Ext(f.baseName), ".")
|
||||||
if f.lang == "" {
|
if _, ok := viper.GetStringMap("languages")[lang]; lang == "" || !ok {
|
||||||
f.lang = viper.GetString("defaultContentLanguage")
|
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.section = helpers.GuessSection(f.Dir())
|
||||||
f.uniqueID = helpers.Md5String(f.LogicalName())
|
f.uniqueID = helpers.Md5String(f.LogicalName())
|
||||||
|
|||||||
Reference in new issue
Block a user