diff --git a/website/config/_default/languages.en.toml b/website/config/_default/languages.en.toml deleted file mode 100644 index 120628c13c..0000000000 --- a/website/config/_default/languages.en.toml +++ /dev/null @@ -1,4 +0,0 @@ -title = "The FreeBSD Project" -contentDir = "content/en" -languageName = "English" -weight = 1 diff --git a/website/config/_default/languages.ru.toml b/website/config/_default/languages.ru.toml deleted file mode 100644 index 7dfbab8551..0000000000 --- a/website/config/_default/languages.ru.toml +++ /dev/null @@ -1,4 +0,0 @@ -title = "The FreeBSD Project" -contentDir = "content/ru" -languageName = "Russian" -weight = 12 diff --git a/website/config/_default/languages.zh-tw.toml b/website/config/_default/languages.zh-tw.toml deleted file mode 100644 index 3c37da111a..0000000000 --- a/website/config/_default/languages.zh-tw.toml +++ /dev/null @@ -1,4 +0,0 @@ -title = "The FreeBSD Project" -contentDir = "content/zh-tw" -languageName = "繁體中文" -weight = 6 diff --git a/website/config/_default/hugo.toml b/website/hugo.toml similarity index 82% rename from website/config/_default/hugo.toml rename to website/hugo.toml index 0c1d93f723..22e19c1cb1 100644 --- a/website/config/_default/hugo.toml +++ b/website/hugo.toml @@ -1,51 +1,65 @@ # FreeBSD website baseURL = "https://www.freebsd.org/" title = "The FreeBSD Project" copyright = "BSD 2-clause 'Simplified' License" DefaultContentLanguage = "en" defaultContentLanguageInSubdir = false theme = "beastie" disableKinds = [ "taxonomy" ] disablePathToLower = true authors = [ "carlavilla@FreeBSD.org" ] ignoreFiles = [ "\\.po$" ] enableRobotsTXT = true enableGitInfo = true preserveTOC = true [markup.asciidocExt] preserveTOC = true extensions = ["man-macro", "inter-document-references-macro", "sectnumoffset-treeprocessor", "packages-macro", "git-macro"] [security] enableInlineShortcodes = false [security.exec] allow = ["^dart-sass-embedded$", "^go$", "^git$", "^npx$", "^postcss$", "^asciidoctor$"] osEnv = ["(?i)^(PATH|PATHEXT|APPDATA|TMP|TEMP|TERM|LOAD_PATH|RUBYLIB)$"] [security.funcs] getenv = ["^HUGO_"] [security.http] methods = ["(?i)GET|POST"] urls = [".*"] staticDir = ["static", "shared"] [outputs] home = [ "HTML" ] page = [ "HTML" ] section = [ "HTML", "RSS", "Calendar" ] [outputFormats] [outputFormats.Calendar] BaseName = "calendar" IsHTML = true IsPlainText = false [outputFormats.RSS] MediaType = "application/rss+xml" BaseName = "feed" IsHTML = true IsPlainText = false noUgly = true Rel = "alternate" + +[languages] + [languages.en] + contentDir = "content/en" + label = "English" + weight = 1 + [languages.ru] + contentDir = "content/ru" + label = "Russian" + weight = 2 + [languages.zh-tw] + contentDir = "content/zh-tw" + label = "繁體中文" + weight = 3 diff --git a/website/themes/beastie/layouts/baseof.html b/website/themes/beastie/layouts/baseof.html index 46d88a99a9..7ecbe294ee 100644 --- a/website/themes/beastie/layouts/baseof.html +++ b/website/themes/beastie/layouts/baseof.html @@ -1,13 +1,13 @@ - + {{ partial "site-head.html" . }}

diff --git a/website/themes/beastie/theme.toml b/website/themes/beastie/theme.toml index 5058603475..74a6ee7a06 100644 --- a/website/themes/beastie/theme.toml +++ b/website/themes/beastie/theme.toml @@ -1,11 +1,11 @@ name = "Beastie" copyright = "BSD 2-clause 'Simplified' License" description = "Theme to build the FreeBSD website" homepage = "https://www.freebsd.org" tags = ["website", "freebsd", "bsd"] -min_version = "0.146.0" +min_version = "0.153.0" [author] name = "Sergio Carlavilla" homepage = "https://www.carlavilla.es" repository = "https://www.gitlab.com/carlavilla"