From nobody Thu Apr 2 19:29:16 2026 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fmsNx5g9bz6YbVb for ; Thu, 02 Apr 2026 19:29:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fmsNx4xYyz3fCw for ; Thu, 02 Apr 2026 19:29:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775158161; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qcrQzHTHyeizbcXl7eVQUxUM2tlYNnFc0jWVHT8jf6U=; b=fMonF0o7AmmHtReBs6eidVr1L5tn7SugRB8AJ1fbEQdLo5s/HcHGNWTVyRu7wM8Bk7GMff +1CPROJhT6BK+MsoO+GPLzhG6bI3GvuoYSWmk9i0GLtk+m9ZlHX+c6FOuOO11bWN1l5kzM 0GWnCJkEORPqoDzfYWmRgXDeVMsxeOnNBwdTD3csJKHYlgzfCJh18snETxGvWuiHh2Yamv 13yELHiAXoBdETyAoZp7+ubfgernZHZGBBcNzC7wFQb5loZBdIeZ4AkpeJ7Noej2KGY/rU 9bLMebDoSu4WGqqcjWDK/xNWKQmd5KGtO+iDa0EWzK8pJ2+mNb0p90LjIAg1Cw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775158161; a=rsa-sha256; cv=none; b=SxsdXkCxH7BdPQDb2VHk4hsPSFvWQ1bj4r/blJwZ6bIv1myp9vAXJW5kqQoagh6dD8V5VS pui5NPI9BXDgaF4ree7SwD7JOYpoP4R7WwgCo/JE/RHXXRYhDKPJFcVq82w6oyv+zbde/8 13ri6eqLxx8UbaC6vjVSRmn9hhtxJFAlCY7YiXwzXNPKgN41wWE1QZdquhhgLhS//LPI41 Eqeq02ZpmPo3XKiQvfF+ByeJ2psd92XwJHff6rkj9gq1BaeyObBfD6DaTxgMVYvvVHJbOP tohdZEq++9SgbooDZ13f2XPirBBWuMXDKNCClY3Tz7HnjaQ6V9tIYdVK7F+chw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775158161; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qcrQzHTHyeizbcXl7eVQUxUM2tlYNnFc0jWVHT8jf6U=; b=w/q1FOjU+Faie2IgXT6dCyjvwexDrr2j/HIu9EvZOd0z+6vKI0XBSzU15/fJ3WprVNqCIJ EEHiV+XsvZ50YtM0K9gJFcbtAt5B97rF7szjB6kwYJb9XnxCr+5EAYgRP1MzO2LjlsMre/ McTVkSyEl4wrNzfGsjnncIutpD+rFwVJqDvDanczrUQrTRCp/qYnNvFXH7+RmLAfnwytSp C24BEkXWSy9ovtoLvLojSNHGIL7k/n6IyGVpyP0fq4RxDw+PpvNPLYMxab+0cWvA9Eqs1B 4iD+od/HaiJla6kHsiCdzslHuPJKcqy2XqKH5GblFA/9ew4wPx/K+Br007joGg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fmsNx4TSRzMv for ; Thu, 02 Apr 2026 19:29:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31434 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 02 Apr 2026 19:29:16 +0000 To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Alexander Ziaee Subject: git: 1971d0d1ff - main - website: Modernize and simplify language logic List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-doc-all@freebsd.org Sender: owner-dev-commits-doc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1971d0d1ff1d9b059eb15377e08c41b397b5a1ed Auto-Submitted: auto-generated Date: Thu, 02 Apr 2026 19:29:16 +0000 Message-Id: <69cec38c.31434.6b6fb1e6@gitrepo.freebsd.org> The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/doc/commit/?id=1971d0d1ff1d9b059eb15377e08c41b397b5a1ed commit 1971d0d1ff1d9b059eb15377e08c41b397b5a1ed Author: Alexander Ziaee AuthorDate: 2026-04-02 19:27:05 +0000 Commit: Alexander Ziaee CommitDate: 2026-04-02 19:28:17 +0000 website: Modernize and simplify language logic The website has really complex deprecated hugo logic for localization. To simplify this and eliminate linter warnings, we first need a modern hugo language key. Build that in hugo.toml, and remove all the extra files related to the old way of doing this. This removes several INFO messages about deprecated syntax during the build, increases clarity of the build system, and allows us to begin transitioning off the remaining deprecated elements. Reviewed by: carlavilla Differential Revision: https://reviews.freebsd.org/D56173 --- website/config/_default/languages.en.toml | 4 ---- website/config/_default/languages.ru.toml | 4 ---- website/config/_default/languages.zh-tw.toml | 4 ---- website/{config/_default => }/hugo.toml | 14 ++++++++++++++ website/themes/beastie/layouts/baseof.html | 2 +- website/themes/beastie/theme.toml | 2 +- 6 files changed, 16 insertions(+), 14 deletions(-) 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 @@ -49,3 +49,17 @@ 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,5 +1,5 @@ - + {{ 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 @@ -3,7 +3,7 @@ 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"