mirror of
https://github.com/gohugoio/hugo.git
synced 2024-11-07 20:30:36 -05:00
parent
f53145b274
commit
74ffb45fbe
1 changed files with 28 additions and 24 deletions
|
@ -169,20 +169,22 @@ func AbsURL(in string, addLanguage bool) string {
|
|||
|
||||
if addLanguage {
|
||||
prefix := getLanguagePrefix()
|
||||
hasPrefix := false
|
||||
// avoid adding language prefix if already present
|
||||
if strings.HasPrefix(in, "/") {
|
||||
hasPrefix = strings.HasPrefix(in[1:], prefix)
|
||||
} else {
|
||||
hasPrefix = strings.HasPrefix(in, prefix)
|
||||
}
|
||||
if prefix != "" {
|
||||
hasPrefix := false
|
||||
// avoid adding language prefix if already present
|
||||
if strings.HasPrefix(in, "/") {
|
||||
hasPrefix = strings.HasPrefix(in[1:], prefix)
|
||||
} else {
|
||||
hasPrefix = strings.HasPrefix(in, prefix)
|
||||
}
|
||||
|
||||
if prefix != "" && !hasPrefix {
|
||||
addSlash := in == "" || strings.HasSuffix(in, "/")
|
||||
in = path.Join(prefix, in)
|
||||
if !hasPrefix {
|
||||
addSlash := in == "" || strings.HasSuffix(in, "/")
|
||||
in = path.Join(prefix, in)
|
||||
|
||||
if addSlash {
|
||||
in += "/"
|
||||
if addSlash {
|
||||
in += "/"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -231,21 +233,23 @@ func RelURL(in string, addLanguage bool) string {
|
|||
|
||||
if addLanguage {
|
||||
prefix := getLanguagePrefix()
|
||||
hasPrefix := false
|
||||
// avoid adding language prefix if already present
|
||||
if strings.HasPrefix(in, "/") {
|
||||
hasPrefix = strings.HasPrefix(in[1:], prefix)
|
||||
} else {
|
||||
hasPrefix = strings.HasPrefix(in, prefix)
|
||||
}
|
||||
if prefix != "" {
|
||||
hasPrefix := false
|
||||
// avoid adding language prefix if already present
|
||||
if strings.HasPrefix(in, "/") {
|
||||
hasPrefix = strings.HasPrefix(in[1:], prefix)
|
||||
} else {
|
||||
hasPrefix = strings.HasPrefix(in, prefix)
|
||||
}
|
||||
|
||||
if prefix != "" && !hasPrefix {
|
||||
hadSlash := strings.HasSuffix(u, "/")
|
||||
if !hasPrefix {
|
||||
hadSlash := strings.HasSuffix(u, "/")
|
||||
|
||||
u = path.Join(prefix, u)
|
||||
u = path.Join(prefix, u)
|
||||
|
||||
if hadSlash {
|
||||
u += "/"
|
||||
if hadSlash {
|
||||
u += "/"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue