Add Hugo Modules
This commit implements Hugo Modules.
This is a broad subject, but some keywords include:
* A new `module` configuration section where you can import almost anything. You can configure both your own file mounts nd the file mounts of the modules you import. This is the new recommended way of configuring what you earlier put in `configDir`, `staticDir` etc. And it also allows you to mount folders in non-Hugo-projects, e.g. the `SCSS` folder in the Bootstrap GitHub project.
* A module consists of a set of mounts to the standard 7 component types in Hugo: `static`, `content`, `layouts`, `data`, `assets`, `i18n`, and `archetypes`. Yes, Theme Components can now include content, which should be very useful, especially in bigger multilingual projects.
* Modules not in your local file cache will be downloaded automatically and even "hot replaced" while the server is running.
* Hugo Modules supports and encourages semver versioned modules, and uses the minimal version selection algorithm to resolve versions.
* A new set of CLI commands are provided to manage all of this: `hugo mod init`, `hugo mod get`, `hugo mod graph`, `hugo mod tidy`, and `hugo mod vendor`.
All of the above is backed by Go Modules.
Fixes #5973
Fixes #5996
Fixes #6010
Fixes #5911
Fixes #5940
Fixes #6074
Fixes #6082
Fixes #6092
2019-05-03 03:16:58 -04:00
|
|
|
// Copyright 2018 The Hugo Authors. All rights reserved.
|
|
|
|
//
|
|
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
|
|
// you may not use this file except in compliance with the License.
|
|
|
|
// You may obtain a copy of the License at
|
|
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
//
|
|
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
|
|
// See the License for the specific language governing permissions and
|
|
|
|
// limitations under the License.
|
|
|
|
|
|
|
|
package langs
|
|
|
|
|
|
|
|
import (
|
|
|
|
"fmt"
|
|
|
|
"path/filepath"
|
|
|
|
"sort"
|
|
|
|
"strings"
|
|
|
|
|
|
|
|
"github.com/gohugoio/hugo/common/maps"
|
|
|
|
|
|
|
|
"github.com/spf13/cast"
|
|
|
|
|
|
|
|
"github.com/pkg/errors"
|
|
|
|
|
|
|
|
"github.com/gohugoio/hugo/config"
|
|
|
|
)
|
|
|
|
|
|
|
|
type LanguagesConfig struct {
|
|
|
|
Languages Languages
|
|
|
|
Multihost bool
|
|
|
|
DefaultContentLanguageInSubdir bool
|
|
|
|
}
|
|
|
|
|
|
|
|
func LoadLanguageSettings(cfg config.Provider, oldLangs Languages) (c LanguagesConfig, err error) {
|
2020-10-09 04:00:50 -04:00
|
|
|
defaultLang := strings.ToLower(cfg.GetString("defaultContentLanguage"))
|
Add Hugo Modules
This commit implements Hugo Modules.
This is a broad subject, but some keywords include:
* A new `module` configuration section where you can import almost anything. You can configure both your own file mounts nd the file mounts of the modules you import. This is the new recommended way of configuring what you earlier put in `configDir`, `staticDir` etc. And it also allows you to mount folders in non-Hugo-projects, e.g. the `SCSS` folder in the Bootstrap GitHub project.
* A module consists of a set of mounts to the standard 7 component types in Hugo: `static`, `content`, `layouts`, `data`, `assets`, `i18n`, and `archetypes`. Yes, Theme Components can now include content, which should be very useful, especially in bigger multilingual projects.
* Modules not in your local file cache will be downloaded automatically and even "hot replaced" while the server is running.
* Hugo Modules supports and encourages semver versioned modules, and uses the minimal version selection algorithm to resolve versions.
* A new set of CLI commands are provided to manage all of this: `hugo mod init`, `hugo mod get`, `hugo mod graph`, `hugo mod tidy`, and `hugo mod vendor`.
All of the above is backed by Go Modules.
Fixes #5973
Fixes #5996
Fixes #6010
Fixes #5911
Fixes #5940
Fixes #6074
Fixes #6082
Fixes #6092
2019-05-03 03:16:58 -04:00
|
|
|
if defaultLang == "" {
|
|
|
|
defaultLang = "en"
|
|
|
|
cfg.Set("defaultContentLanguage", defaultLang)
|
|
|
|
}
|
|
|
|
|
|
|
|
var languages map[string]interface{}
|
|
|
|
|
2021-06-09 04:58:18 -04:00
|
|
|
languagesFromConfig := cfg.GetParams("languages")
|
Add Hugo Modules
This commit implements Hugo Modules.
This is a broad subject, but some keywords include:
* A new `module` configuration section where you can import almost anything. You can configure both your own file mounts nd the file mounts of the modules you import. This is the new recommended way of configuring what you earlier put in `configDir`, `staticDir` etc. And it also allows you to mount folders in non-Hugo-projects, e.g. the `SCSS` folder in the Bootstrap GitHub project.
* A module consists of a set of mounts to the standard 7 component types in Hugo: `static`, `content`, `layouts`, `data`, `assets`, `i18n`, and `archetypes`. Yes, Theme Components can now include content, which should be very useful, especially in bigger multilingual projects.
* Modules not in your local file cache will be downloaded automatically and even "hot replaced" while the server is running.
* Hugo Modules supports and encourages semver versioned modules, and uses the minimal version selection algorithm to resolve versions.
* A new set of CLI commands are provided to manage all of this: `hugo mod init`, `hugo mod get`, `hugo mod graph`, `hugo mod tidy`, and `hugo mod vendor`.
All of the above is backed by Go Modules.
Fixes #5973
Fixes #5996
Fixes #6010
Fixes #5911
Fixes #5940
Fixes #6074
Fixes #6082
Fixes #6092
2019-05-03 03:16:58 -04:00
|
|
|
disableLanguages := cfg.GetStringSlice("disableLanguages")
|
|
|
|
|
|
|
|
if len(disableLanguages) == 0 {
|
|
|
|
languages = languagesFromConfig
|
|
|
|
} else {
|
2021-06-09 04:58:18 -04:00
|
|
|
languages = make(maps.Params)
|
Add Hugo Modules
This commit implements Hugo Modules.
This is a broad subject, but some keywords include:
* A new `module` configuration section where you can import almost anything. You can configure both your own file mounts nd the file mounts of the modules you import. This is the new recommended way of configuring what you earlier put in `configDir`, `staticDir` etc. And it also allows you to mount folders in non-Hugo-projects, e.g. the `SCSS` folder in the Bootstrap GitHub project.
* A module consists of a set of mounts to the standard 7 component types in Hugo: `static`, `content`, `layouts`, `data`, `assets`, `i18n`, and `archetypes`. Yes, Theme Components can now include content, which should be very useful, especially in bigger multilingual projects.
* Modules not in your local file cache will be downloaded automatically and even "hot replaced" while the server is running.
* Hugo Modules supports and encourages semver versioned modules, and uses the minimal version selection algorithm to resolve versions.
* A new set of CLI commands are provided to manage all of this: `hugo mod init`, `hugo mod get`, `hugo mod graph`, `hugo mod tidy`, and `hugo mod vendor`.
All of the above is backed by Go Modules.
Fixes #5973
Fixes #5996
Fixes #6010
Fixes #5911
Fixes #5940
Fixes #6074
Fixes #6082
Fixes #6092
2019-05-03 03:16:58 -04:00
|
|
|
for k, v := range languagesFromConfig {
|
|
|
|
for _, disabled := range disableLanguages {
|
|
|
|
if disabled == defaultLang {
|
|
|
|
return c, fmt.Errorf("cannot disable default language %q", defaultLang)
|
|
|
|
}
|
|
|
|
|
|
|
|
if strings.EqualFold(k, disabled) {
|
2021-06-09 04:58:18 -04:00
|
|
|
v.(maps.Params)["disabled"] = true
|
Add Hugo Modules
This commit implements Hugo Modules.
This is a broad subject, but some keywords include:
* A new `module` configuration section where you can import almost anything. You can configure both your own file mounts nd the file mounts of the modules you import. This is the new recommended way of configuring what you earlier put in `configDir`, `staticDir` etc. And it also allows you to mount folders in non-Hugo-projects, e.g. the `SCSS` folder in the Bootstrap GitHub project.
* A module consists of a set of mounts to the standard 7 component types in Hugo: `static`, `content`, `layouts`, `data`, `assets`, `i18n`, and `archetypes`. Yes, Theme Components can now include content, which should be very useful, especially in bigger multilingual projects.
* Modules not in your local file cache will be downloaded automatically and even "hot replaced" while the server is running.
* Hugo Modules supports and encourages semver versioned modules, and uses the minimal version selection algorithm to resolve versions.
* A new set of CLI commands are provided to manage all of this: `hugo mod init`, `hugo mod get`, `hugo mod graph`, `hugo mod tidy`, and `hugo mod vendor`.
All of the above is backed by Go Modules.
Fixes #5973
Fixes #5996
Fixes #6010
Fixes #5911
Fixes #5940
Fixes #6074
Fixes #6082
Fixes #6092
2019-05-03 03:16:58 -04:00
|
|
|
break
|
|
|
|
}
|
|
|
|
}
|
|
|
|
languages[k] = v
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
var languages2 Languages
|
|
|
|
|
|
|
|
if len(languages) == 0 {
|
|
|
|
languages2 = append(languages2, NewDefaultLanguage(cfg))
|
|
|
|
} else {
|
|
|
|
languages2, err = toSortedLanguages(cfg, languages)
|
|
|
|
if err != nil {
|
|
|
|
return c, errors.Wrap(err, "Failed to parse multilingual config")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if oldLangs != nil {
|
|
|
|
// When in multihost mode, the languages are mapped to a server, so
|
|
|
|
// some structural language changes will need a restart of the dev server.
|
|
|
|
// The validation below isn't complete, but should cover the most
|
|
|
|
// important cases.
|
|
|
|
var invalid bool
|
|
|
|
if languages2.IsMultihost() != oldLangs.IsMultihost() {
|
|
|
|
invalid = true
|
|
|
|
} else {
|
|
|
|
if languages2.IsMultihost() && len(languages2) != len(oldLangs) {
|
|
|
|
invalid = true
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if invalid {
|
|
|
|
return c, errors.New("language change needing a server restart detected")
|
|
|
|
}
|
|
|
|
|
|
|
|
if languages2.IsMultihost() {
|
|
|
|
// We need to transfer any server baseURL to the new language
|
|
|
|
for i, ol := range oldLangs {
|
|
|
|
nl := languages2[i]
|
|
|
|
nl.Set("baseURL", ol.GetString("baseURL"))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// The defaultContentLanguage is something the user has to decide, but it needs
|
|
|
|
// to match a language in the language definition list.
|
|
|
|
langExists := false
|
|
|
|
for _, lang := range languages2 {
|
|
|
|
if lang.Lang == defaultLang {
|
|
|
|
langExists = true
|
|
|
|
break
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if !langExists {
|
|
|
|
return c, fmt.Errorf("site config value %q for defaultContentLanguage does not match any language definition", defaultLang)
|
|
|
|
}
|
|
|
|
|
|
|
|
c.Languages = languages2
|
|
|
|
c.Multihost = languages2.IsMultihost()
|
|
|
|
c.DefaultContentLanguageInSubdir = c.Multihost
|
|
|
|
|
|
|
|
sortedDefaultFirst := make(Languages, len(c.Languages))
|
|
|
|
for i, v := range c.Languages {
|
|
|
|
sortedDefaultFirst[i] = v
|
|
|
|
}
|
|
|
|
sort.Slice(sortedDefaultFirst, func(i, j int) bool {
|
|
|
|
li, lj := sortedDefaultFirst[i], sortedDefaultFirst[j]
|
|
|
|
if li.Lang == defaultLang {
|
|
|
|
return true
|
|
|
|
}
|
|
|
|
|
|
|
|
if lj.Lang == defaultLang {
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
|
|
|
|
return i < j
|
|
|
|
})
|
|
|
|
|
|
|
|
cfg.Set("languagesSorted", c.Languages)
|
|
|
|
cfg.Set("languagesSortedDefaultFirst", sortedDefaultFirst)
|
|
|
|
cfg.Set("multilingual", len(languages2) > 1)
|
|
|
|
|
|
|
|
multihost := c.Multihost
|
|
|
|
|
|
|
|
if multihost {
|
|
|
|
cfg.Set("defaultContentLanguageInSubdir", true)
|
|
|
|
cfg.Set("multihost", true)
|
|
|
|
}
|
|
|
|
|
|
|
|
if multihost {
|
|
|
|
// The baseURL may be provided at the language level. If that is true,
|
|
|
|
// then every language must have a baseURL. In this case we always render
|
|
|
|
// to a language sub folder, which is then stripped from all the Permalink URLs etc.
|
|
|
|
for _, l := range languages2 {
|
|
|
|
burl := l.GetLocal("baseURL")
|
|
|
|
if burl == nil {
|
|
|
|
return c, errors.New("baseURL must be set on all or none of the languages")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-08-01 05:50:12 -04:00
|
|
|
for _, language := range c.Languages {
|
|
|
|
if language.initErr != nil {
|
|
|
|
return c, language.initErr
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Add Hugo Modules
This commit implements Hugo Modules.
This is a broad subject, but some keywords include:
* A new `module` configuration section where you can import almost anything. You can configure both your own file mounts nd the file mounts of the modules you import. This is the new recommended way of configuring what you earlier put in `configDir`, `staticDir` etc. And it also allows you to mount folders in non-Hugo-projects, e.g. the `SCSS` folder in the Bootstrap GitHub project.
* A module consists of a set of mounts to the standard 7 component types in Hugo: `static`, `content`, `layouts`, `data`, `assets`, `i18n`, and `archetypes`. Yes, Theme Components can now include content, which should be very useful, especially in bigger multilingual projects.
* Modules not in your local file cache will be downloaded automatically and even "hot replaced" while the server is running.
* Hugo Modules supports and encourages semver versioned modules, and uses the minimal version selection algorithm to resolve versions.
* A new set of CLI commands are provided to manage all of this: `hugo mod init`, `hugo mod get`, `hugo mod graph`, `hugo mod tidy`, and `hugo mod vendor`.
All of the above is backed by Go Modules.
Fixes #5973
Fixes #5996
Fixes #6010
Fixes #5911
Fixes #5940
Fixes #6074
Fixes #6082
Fixes #6092
2019-05-03 03:16:58 -04:00
|
|
|
return c, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func toSortedLanguages(cfg config.Provider, l map[string]interface{}) (Languages, error) {
|
|
|
|
languages := make(Languages, len(l))
|
|
|
|
i := 0
|
|
|
|
|
|
|
|
for lang, langConf := range l {
|
2019-11-21 15:59:38 -05:00
|
|
|
langsMap, err := maps.ToStringMapE(langConf)
|
Add Hugo Modules
This commit implements Hugo Modules.
This is a broad subject, but some keywords include:
* A new `module` configuration section where you can import almost anything. You can configure both your own file mounts nd the file mounts of the modules you import. This is the new recommended way of configuring what you earlier put in `configDir`, `staticDir` etc. And it also allows you to mount folders in non-Hugo-projects, e.g. the `SCSS` folder in the Bootstrap GitHub project.
* A module consists of a set of mounts to the standard 7 component types in Hugo: `static`, `content`, `layouts`, `data`, `assets`, `i18n`, and `archetypes`. Yes, Theme Components can now include content, which should be very useful, especially in bigger multilingual projects.
* Modules not in your local file cache will be downloaded automatically and even "hot replaced" while the server is running.
* Hugo Modules supports and encourages semver versioned modules, and uses the minimal version selection algorithm to resolve versions.
* A new set of CLI commands are provided to manage all of this: `hugo mod init`, `hugo mod get`, `hugo mod graph`, `hugo mod tidy`, and `hugo mod vendor`.
All of the above is backed by Go Modules.
Fixes #5973
Fixes #5996
Fixes #6010
Fixes #5911
Fixes #5940
Fixes #6074
Fixes #6082
Fixes #6092
2019-05-03 03:16:58 -04:00
|
|
|
if err != nil {
|
|
|
|
return nil, fmt.Errorf("Language config is not a map: %T", langConf)
|
|
|
|
}
|
|
|
|
|
|
|
|
language := NewLanguage(lang, cfg)
|
|
|
|
|
|
|
|
for loki, v := range langsMap {
|
|
|
|
switch loki {
|
|
|
|
case "title":
|
|
|
|
language.Title = cast.ToString(v)
|
|
|
|
case "languagename":
|
|
|
|
language.LanguageName = cast.ToString(v)
|
2020-03-10 05:10:58 -04:00
|
|
|
case "languagedirection":
|
|
|
|
language.LanguageDirection = cast.ToString(v)
|
Add Hugo Modules
This commit implements Hugo Modules.
This is a broad subject, but some keywords include:
* A new `module` configuration section where you can import almost anything. You can configure both your own file mounts nd the file mounts of the modules you import. This is the new recommended way of configuring what you earlier put in `configDir`, `staticDir` etc. And it also allows you to mount folders in non-Hugo-projects, e.g. the `SCSS` folder in the Bootstrap GitHub project.
* A module consists of a set of mounts to the standard 7 component types in Hugo: `static`, `content`, `layouts`, `data`, `assets`, `i18n`, and `archetypes`. Yes, Theme Components can now include content, which should be very useful, especially in bigger multilingual projects.
* Modules not in your local file cache will be downloaded automatically and even "hot replaced" while the server is running.
* Hugo Modules supports and encourages semver versioned modules, and uses the minimal version selection algorithm to resolve versions.
* A new set of CLI commands are provided to manage all of this: `hugo mod init`, `hugo mod get`, `hugo mod graph`, `hugo mod tidy`, and `hugo mod vendor`.
All of the above is backed by Go Modules.
Fixes #5973
Fixes #5996
Fixes #6010
Fixes #5911
Fixes #5940
Fixes #6074
Fixes #6082
Fixes #6092
2019-05-03 03:16:58 -04:00
|
|
|
case "weight":
|
|
|
|
language.Weight = cast.ToInt(v)
|
|
|
|
case "contentdir":
|
|
|
|
language.ContentDir = filepath.Clean(cast.ToString(v))
|
|
|
|
case "disabled":
|
|
|
|
language.Disabled = cast.ToBool(v)
|
|
|
|
case "params":
|
2019-11-21 15:59:38 -05:00
|
|
|
m := maps.ToStringMap(v)
|
Add Hugo Modules
This commit implements Hugo Modules.
This is a broad subject, but some keywords include:
* A new `module` configuration section where you can import almost anything. You can configure both your own file mounts nd the file mounts of the modules you import. This is the new recommended way of configuring what you earlier put in `configDir`, `staticDir` etc. And it also allows you to mount folders in non-Hugo-projects, e.g. the `SCSS` folder in the Bootstrap GitHub project.
* A module consists of a set of mounts to the standard 7 component types in Hugo: `static`, `content`, `layouts`, `data`, `assets`, `i18n`, and `archetypes`. Yes, Theme Components can now include content, which should be very useful, especially in bigger multilingual projects.
* Modules not in your local file cache will be downloaded automatically and even "hot replaced" while the server is running.
* Hugo Modules supports and encourages semver versioned modules, and uses the minimal version selection algorithm to resolve versions.
* A new set of CLI commands are provided to manage all of this: `hugo mod init`, `hugo mod get`, `hugo mod graph`, `hugo mod tidy`, and `hugo mod vendor`.
All of the above is backed by Go Modules.
Fixes #5973
Fixes #5996
Fixes #6010
Fixes #5911
Fixes #5940
Fixes #6074
Fixes #6082
Fixes #6092
2019-05-03 03:16:58 -04:00
|
|
|
// Needed for case insensitive fetching of params values
|
2021-06-09 04:58:18 -04:00
|
|
|
maps.PrepareParams(m)
|
Add Hugo Modules
This commit implements Hugo Modules.
This is a broad subject, but some keywords include:
* A new `module` configuration section where you can import almost anything. You can configure both your own file mounts nd the file mounts of the modules you import. This is the new recommended way of configuring what you earlier put in `configDir`, `staticDir` etc. And it also allows you to mount folders in non-Hugo-projects, e.g. the `SCSS` folder in the Bootstrap GitHub project.
* A module consists of a set of mounts to the standard 7 component types in Hugo: `static`, `content`, `layouts`, `data`, `assets`, `i18n`, and `archetypes`. Yes, Theme Components can now include content, which should be very useful, especially in bigger multilingual projects.
* Modules not in your local file cache will be downloaded automatically and even "hot replaced" while the server is running.
* Hugo Modules supports and encourages semver versioned modules, and uses the minimal version selection algorithm to resolve versions.
* A new set of CLI commands are provided to manage all of this: `hugo mod init`, `hugo mod get`, `hugo mod graph`, `hugo mod tidy`, and `hugo mod vendor`.
All of the above is backed by Go Modules.
Fixes #5973
Fixes #5996
Fixes #6010
Fixes #5911
Fixes #5940
Fixes #6074
Fixes #6082
Fixes #6092
2019-05-03 03:16:58 -04:00
|
|
|
for k, vv := range m {
|
|
|
|
language.SetParam(k, vv)
|
|
|
|
}
|
2021-08-01 05:50:12 -04:00
|
|
|
case "timezone":
|
|
|
|
if err := language.loadLocation(cast.ToString(v)); err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
Add Hugo Modules
This commit implements Hugo Modules.
This is a broad subject, but some keywords include:
* A new `module` configuration section where you can import almost anything. You can configure both your own file mounts nd the file mounts of the modules you import. This is the new recommended way of configuring what you earlier put in `configDir`, `staticDir` etc. And it also allows you to mount folders in non-Hugo-projects, e.g. the `SCSS` folder in the Bootstrap GitHub project.
* A module consists of a set of mounts to the standard 7 component types in Hugo: `static`, `content`, `layouts`, `data`, `assets`, `i18n`, and `archetypes`. Yes, Theme Components can now include content, which should be very useful, especially in bigger multilingual projects.
* Modules not in your local file cache will be downloaded automatically and even "hot replaced" while the server is running.
* Hugo Modules supports and encourages semver versioned modules, and uses the minimal version selection algorithm to resolve versions.
* A new set of CLI commands are provided to manage all of this: `hugo mod init`, `hugo mod get`, `hugo mod graph`, `hugo mod tidy`, and `hugo mod vendor`.
All of the above is backed by Go Modules.
Fixes #5973
Fixes #5996
Fixes #6010
Fixes #5911
Fixes #5940
Fixes #6074
Fixes #6082
Fixes #6092
2019-05-03 03:16:58 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
// Put all into the Params map
|
|
|
|
language.SetParam(loki, v)
|
|
|
|
|
|
|
|
// Also set it in the configuration map (for baseURL etc.)
|
|
|
|
language.Set(loki, v)
|
|
|
|
}
|
|
|
|
|
|
|
|
languages[i] = language
|
|
|
|
i++
|
|
|
|
}
|
|
|
|
|
|
|
|
sort.Sort(languages)
|
|
|
|
|
|
|
|
return languages, nil
|
|
|
|
}
|