git: 42b64a1521 - main - Fix links in the main page. Add releases.toml to git ignored files Fix bad translation in German configuration file
Sergio Carlavilla Delgado <[email protected]>
| Newsgroups | gmane.os.freebsd.devel.cvs.doc |
|---|---|
| Message-ID | <[email protected]> |
The branch main has been updated by carlavilla: URL: https://cgit.FreeBSD.org/doc/commit/?id=42b64a1521a30e293dceed35110f4c7bc376cd79 commit 42b64a1521a30e293dceed35110f4c7bc376cd79 Author: Sergio Carlavilla Delgado <[email protected]> AuthorDate: 2021-01-26 11:47:42 +0000 Commit: Sergio Carlavilla Delgado <[email protected]> CommitDate: 2021-01-26 11:47:42 +0000 Fix links in the main page. Add releases.toml to git ignored files Fix bad translation in German configuration file --- website/.gitignore | 3 ++ website/config/_default/languages.de.toml | 4 +- website/data/releases.toml | 83 ------------------------------- website/themes/beastie/layouts/index.html | 9 ++-- 4 files changed, 10 insertions(+), 89 deletions(-) diff --git a/website/.gitignore b/website/.gitignore index c210fc6f5e..abe4edda37 100644 --- a/website/.gitignore +++ b/website/.gitignore @@ -4,3 +4,6 @@ resources # Shared folder /shared + +# Autogenerated content +/data/releases.toml diff --git a/website/config/_default/languages.de.toml b/website/config/_default/languages.de.toml index 14efbfa181..95ff9c72bc 100644 --- a/website/config/_default/languages.de.toml +++ b/website/config/_default/languages.de.toml @@ -1,4 +1,4 @@ -title = "El Proyecto FreeBSD" +title = "The FreeBSD Project" contentDir = "content/de" -languageName = "Spanish" +languageName = "German" weight = 2 diff --git a/website/data/releases.toml b/website/data/releases.toml deleted file mode 100644 index 63746ade57..0000000000 --- a/website/data/releases.toml +++ /dev/null @@ -1,83 +0,0 @@ -# Code generated by the FreeBSD Documentation toolchain. DO NOT EDIT. -# Please don't change this file manually but run `make` to update it. -# For more information, please read the FreeBSD Documentation Project Primer - -numports="36000" -ports-size="500 MB" -beta-local-where="IGNORE" -beta2-local-where="IGNORE" -rel-head-major="13" -rel-head="13.0" -beta-upcoming="IGNORE" -beta-testing="IGNORE" -betarel-current="12.2" -betarel-vers="RELEASE" -u-betarel-schedule="https://www.FreeBSD.org/releases/12.2R/schedule/" -beta2-upcoming="INCLUDE" -beta2-testing="IGNORE" -betarel2-current="13.0" -betarel2-vers="RELEASE" -u-betarel2-schedule="https://www.FreeBSD.org/releases/13.0R/schedule/" -rel122-current-major="12" -rel122-current="12.2" -rel122-current-date="October, 2020" -u-rel122-notes="https://www.FreeBSD.org/releases/12.2R/relnotes/" -u-rel122-announce="https://www.FreeBSD.org/releases/12.2R/announce/" -u-rel122-errata="https://www.FreeBSD.org/releases/12.2R/errata/" -u-rel122-hardware="https://www.FreeBSD.org/releases/12.2R/hardware/" -u-rel122-installation="https://www.FreeBSD.org/releases/12.2R/installation/" -u-rel122-readme="https://www.FreeBSD.org/releases/12.2R/readme/" -u-rel122-signatures="https://www.FreeBSD.org/releases/12.2R/signatures/" -rel121-current-major="12" -rel121-current="12.1" -rel121-current-date="November, 2019" -u-rel121-notes="https://www.FreeBSD.org/releases/12.1R/relnotes/" -u-rel121-announce="https://www.FreeBSD.org/releases/12.1R/announce/" -u-rel121-errata="https://www.FreeBSD.org/releases/12.1R/errata/" -u-rel121-hardware="https://www.FreeBSD.org/releases/12.1R/hardware/" -u-rel121-installation="https://www.FreeBSD.org/releases/12.1R/installation/" -u-rel121-readme="https://www.FreeBSD.org/releases/12.1R/readme/" -u-rel121-signatures="https://www.FreeBSD.org/releases/12.1R/signatures/" -rel120-current-major="12" -rel120-current="12.0" -rel120-current-date="December, 2018" -u-rel120-notes="https://www.FreeBSD.org/releases/12.0R/relnotes/" -u-rel120-announce="https://www.FreeBSD.org/releases/12.0R/announce/" -u-rel120-errata="https://www.FreeBSD.org/releases/12.0R/errata/" -u-rel120-hardware="https://www.FreeBSD.org/releases/12.0R/hardware/" -u-rel120-installation="https://www.FreeBSD.org/releases/12.0R/installation/" -u-rel120-readme="https://www.FreeBSD.org/releases/12.0R/readme/" -u-rel120-signatures="https://www.FreeBSD.org/releases/12.0R/signatures/" -rel114-current-major="11" -rel114-current="11.4" -rel114-current-date="June, 2020" -u-rel114-notes="https://www.FreeBSD.org/releases/11.4R/relnotes.html" -u-rel114-announce="https://www.FreeBSD.org/releases/11.4R/announce/" -u-rel114-errata="https://www.FreeBSD.org/releases/11.4R/errata.html" -u-rel114-hardware="https://www.FreeBSD.org/releases/11.4R/hardware.html" -u-rel114-installation="https://www.FreeBSD.org/releases/11.4R/installation.html" -u-rel114-readme="https://www.FreeBSD.org/releases/11.4R/readme.html" -u-rel114-signatures="https://www.FreeBSD.org/releases/11.4R/signatures/" -rel113-current-major="11" -rel113-current="11.3" -rel113-current-date="July, 2019" -u-rel113-notes="https://www.FreeBSD.org/releases/11.3R/relnotes.html" -u-rel113-announce="https://www.FreeBSD.org/releases/11.3R/announce.html" -u-rel113-errata="https://www.FreeBSD.org/releases/11.3R/errata.html" -u-rel113-hardware="https://www.FreeBSD.org/releases/11.3R/hardware.html" -u-rel113-installation="https://www.FreeBSD.org/releases/11.3R/installation.html" -u-rel113-readme="https://www.FreeBSD.org/releases/11.3R/readme.html" -u-rel113-signatures="https://www.FreeBSD.org/releases/11.3R/signatures.html" -rel112-current-major="11" -rel112-current="11.2" -rel112-current-date="June, 2018" -u-rel112-notes="https://www.FreeBSD.org/releases/11.2R/relnotes.html" -u-rel112-announce="https://www.FreeBSD.org/releases/11.2R/announce.html" -u-rel112-errata="https://www.FreeBSD.org/releases/11.2R/errata.html" -u-rel112-hardware="https://www.FreeBSD.org/releases/11.2R/hardware.html" -u-rel112-installation="https://www.FreeBSD.org/releases/11.2R/installation.html" -u-rel112-readme="https://www.FreeBSD.org/releases/11.2R/readme.html" -u-rel112-signatures="https://www.FreeBSD.org/releases/11.2R/signatures.html" -gnomeoldver="2.30" -gnomever="2.32" -gnomedevelver="3.6" diff --git a/website/themes/beastie/layouts/index.html b/website/themes/beastie/layouts/index.html index fcf30826de..85a21c8e8c 100755 --- a/website/themes/beastie/layouts/index.html +++ b/website/themes/beastie/layouts/index.html @@ -1,4 +1,5 @@ {{ define "main" }} +{{ $currentLang := $.Site.Language.Lang }} <div id="content"> <div id="frontcontainer"> <div id="frontfeaturecontainer"> @@ -9,9 +10,9 @@ {{ i18n "freebsdDescription1" }} <a href={{ "platforms/" | absLangURL }}>{{ i18n "freebsdDescription2" }}</a> {{ i18n "freebsdDescription3" }} - <a href="https://docs.FreeBSD.org/en/articles/contributors/#staff-committers">{{ i18n "freebsdDescription4" }}</a> + <a href={{ printf "%s%s%s" "https://docs.FreeBSD.org/" $currentLang "/articles/contributors/#staff-committers/" }}>{{ i18n "freebsdDescription4" }}</a> {{ i18n "freebsdDescription5" }} - <a href="https://docs.FreeBSD.org/en/articles/handbook/book/#introduction-nutshell-users">{{ i18n "freebsdDescription6" }}</a> + <a href={{ printf "%s%s%s" "https://docs.FreeBSD.org/" $currentLang "/books/handbook/introduction/#introduction-nutshell-users" }}>{{ i18n "freebsdDescription6" }}</a> {{ i18n "freebsdDescription7" }} </p> <div id="txtfrontfeaturelink"> »<a href={{ "about/" | absLangURL }} title={{ i18n "learnMore" }}>{{ i18n "learnMore" }}</a></div> @@ -98,10 +99,10 @@ <a href={{ "support/bugreports/" | absLangURL }} title={{ i18n "reportingProblems" }}>{{ i18n "reportingProblems" }}</a> </li> <li> - <a href="https://docs.FreeBSD.org/books/faq" title={{ i18n "FAQ" }}>{{ i18n "FAQ" }}</a> + <a href={{ printf "%s%s%s" "https://docs.FreeBSD.org/" $currentLang "/books/faq/" }} title={{ i18n "FAQ" }}>{{ i18n "FAQ" }}</a> </li> <li> - <a href="https://docs.FreeBSD.org/books/handbook" title={{ i18n "handbook" }}>{{ i18n "handbook" }}</a> + <a href={{ printf "%s%s%s" "https://docs.FreeBSD.org/" $currentLang "/books/handbook/" }} title={{ i18n "handbook" }}>{{ i18n "handbook" }}</a> </li> <li> <a href={{ "ports/" | absLangURL }} title="Ports">Ports</a> _______________________________________________ [email protected] mailing list https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all To unsubscribe, send any mail to "[email protected]"