summaryrefslogtreecommitdiffstats
path: root/commands
diff options
context:
space:
mode:
authorBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2018-01-25 17:03:29 +0100
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2018-01-26 14:04:14 +0100
commit6413559f7575e2653d76227a8037a7edbaae82aa (patch)
tree4b2d2be2943e1f7c37d6aa09937bec4391c1e678 /commands
parent322c567220aa4123a5d707629c1bebd375599912 (diff)
Add a way to disable one or more languages
This commit adds a new config setting: ```toml disableLanguages = ["fr"] ``` If this is a multilingual site: * No site for the French language will be created * French content pages will be ignored/not read * The French language configuration (menus etc.) will also be ignored This makes it possible to start translating new languages and turn it on when you're happy etc. Fixes #4297 Fixed #4329
Diffstat (limited to 'commands')
-rw-r--r--commands/server.go23
1 files changed, 13 insertions, 10 deletions
diff --git a/commands/server.go b/commands/server.go
index 0ae58c991..f2522aaf7 100644
--- a/commands/server.go
+++ b/commands/server.go
@@ -173,20 +173,23 @@ func server(cmd *cobra.Command, args []string) error {
c.Set("liveReloadPort", serverPorts[0])
}
- if c.languages.IsMultihost() {
- for i, language := range c.languages {
- baseURL, err := fixURL(language, baseURL, serverPorts[i])
- if err != nil {
- return err
- }
- language.Set("baseURL", baseURL)
+ isMultiHost := c.languages.IsMultihost()
+ for i, language := range c.languages {
+ var serverPort int
+ if isMultiHost {
+ serverPort = serverPorts[i]
+ } else {
+ serverPort = serverPorts[0]
}
- } else {
- baseURL, err := fixURL(c.Cfg, baseURL, serverPorts[0])
+
+ baseURL, err := fixURL(language, baseURL, serverPort)
if err != nil {
return err
}
- c.Set("baseURL", baseURL)
+ language.Set("baseURL", baseURL)
+ if i == 0 {
+ c.Set("baseURL", baseURL)
+ }
}
return nil