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

helpers: Improve the language prefix logic

Browse Source 
See #2444
This commit is contained in:
Bjørn Erik Pedersen
2016-09-13 23:44:16 +02:00
parent f53145b274
commit 74ffb45fbe
1 changed files with 28 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
helpers/url.go
View File

@@ -169,6 +169,7 @@ func AbsURL(in string, addLanguage bool) string {
if addLanguage { if addLanguage {
prefix := getLanguagePrefix() prefix := getLanguagePrefix()
if prefix != "" {
hasPrefix := false hasPrefix := false
// avoid adding language prefix if already present // avoid adding language prefix if already present
if strings.HasPrefix(in, "/") { if strings.HasPrefix(in, "/") {
@@ -177,7 +178,7 @@ func AbsURL(in string, addLanguage bool) string {
hasPrefix = strings.HasPrefix(in, prefix) hasPrefix = strings.HasPrefix(in, prefix)
} }
if prefix != "" && !hasPrefix { if !hasPrefix {
addSlash := in == "" || strings.HasSuffix(in, "/") addSlash := in == "" || strings.HasSuffix(in, "/")
in = path.Join(prefix, in) in = path.Join(prefix, in)
@@ -186,6 +187,7 @@ func AbsURL(in string, addLanguage bool) string {
} }
} }
} }
}
return MakePermalink(baseURL, in).String() return MakePermalink(baseURL, in).String()
} }
@@ -231,6 +233,7 @@ func RelURL(in string, addLanguage bool) string {
if addLanguage { if addLanguage {
prefix := getLanguagePrefix() prefix := getLanguagePrefix()
if prefix != "" {
hasPrefix := false hasPrefix := false
// avoid adding language prefix if already present // avoid adding language prefix if already present
if strings.HasPrefix(in, "/") { if strings.HasPrefix(in, "/") {
@@ -239,7 +242,7 @@ func RelURL(in string, addLanguage bool) string {
hasPrefix = strings.HasPrefix(in, prefix) hasPrefix = strings.HasPrefix(in, prefix)
} }
if prefix != "" && !hasPrefix { if !hasPrefix {
hadSlash := strings.HasSuffix(u, "/") hadSlash := strings.HasSuffix(u, "/")
u = path.Join(prefix, u) u = path.Join(prefix, u)
@@ -249,6 +252,7 @@ func RelURL(in string, addLanguage bool) string {
} }
} }
} }
}
if !canonifyURLs { if !canonifyURLs {
u = AddContextRoot(baseURL, u) u = AddContextRoot(baseURL, u)