Date: Sun, 16 May 2021 07:53:14 GMT From: Sergio Carlavilla Delgado <carlavilla@FreeBSD.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org Subject: git: 23babb1f54 - main - Fix broken links in main page for i18n Message-ID: <202105160753.14G7rEbM067675@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by carlavilla: URL: https://cgit.FreeBSD.org/doc/commit/?id=23babb1f54c9bb09d3ed8b97092a4f37d240bf7c commit 23babb1f54c9bb09d3ed8b97092a4f37d240bf7c Author: Sergio Carlavilla Delgado <carlavilla@FreeBSD.org> AuthorDate: 2021-05-16 07:47:14 +0000 Commit: Sergio Carlavilla Delgado <carlavilla@FreeBSD.org> CommitDate: 2021-05-16 07:53:02 +0000 Fix broken links in main page for i18n In i18n sites the links for more news, press, events and security advisories and notices are broken. Also add events, news, press and security pages for zh-tw PR: 255165 Submitted by: rcyu@ --- website/content/zh-tw/events/_index.adoc | 10 ++++++++++ website/content/zh-tw/news/_index.adoc | 26 ++++++++++++++++++++++++++ website/content/zh-tw/news/newsflash.adoc | 21 +++++++++++++++++++++ website/content/zh-tw/press/_index.adoc | 10 ++++++++++ website/content/zh-tw/security/advisories.adoc | 11 +++++++++++ website/content/zh-tw/security/notices.adoc | 9 +++++++++ website/themes/beastie/layouts/index.html | 17 ++++++++++++----- 7 files changed, 99 insertions(+), 5 deletions(-) diff --git a/website/content/zh-tw/events/_index.adoc b/website/content/zh-tw/events/_index.adoc new file mode 100644 index 0000000000..41ac0fc4f8 --- /dev/null +++ b/website/content/zh-tw/events/_index.adoc @@ -0,0 +1,10 @@ +--- +title: "FreeBSD Events" +sidenav: community +--- + += FreeBSD Events + +Please send details of any FreeBSD related events or events that are of interest for FreeBSD users which are not listed here to freebsd-doc@FreeBSD.org. + +Countries and regions displayed in dark red on the map below are hosting upcoming FreeBSD-related events. Countries that have hosted FreeBSD-related events in the past show up in yellow or orange, with darker colors representing a larger number of previous events. diff --git a/website/content/zh-tw/news/_index.adoc b/website/content/zh-tw/news/_index.adoc new file mode 100644 index 0000000000..ecd93a22a6 --- /dev/null +++ b/website/content/zh-tw/news/_index.adoc @@ -0,0 +1,26 @@ +--- +title: "FreeBSD News" +sidenav: about +loadNews: false +--- + += FreeBSD News + +== Local news + +* link:newsflash[Newsflash]: New releases, drivers, committers, security announcements, and other news. +* https://www.freebsdfoundation.org/news-and-events/latest-news/[Foundation Press Releases]: Press releases from the FreeBSD Foundation. +* link:../press/[Press articles]: FreeBSD appearing in the regular press. +* link:../news/status/[Status reports]: FreeBSD development status reports. + +== Podcasts + +* http://www.bsdnow.tv/[BSD Now]: BSD Now is a weekly video podcast which covers the latest news, interviews and tutorials from the world of BSD. +* http://bsdtalk.blogspot.com/[bsdtalk]: bsdtalk is an audio podcast with interesting interviews of people in the BSD community. + +== Other sites + +* http://www.daemonforums.org/[Daemon Forums]: Active online forums and news community site dedicated to FreeBSD and other BSDs. +* http://www.freebsddiary.org/[FreeBSD Diary]: One man's record of his trials and triumphs with FreeBSD. +* http://www.osnews.com/[OSNews]: Daily articles and news about Linux, BSD and other operating systems. +* http://slashdot.org/bsd/[Slashdot's BSD section]: Pointers and discussion about BSD news, not just FreeBSD. diff --git a/website/content/zh-tw/news/newsflash.adoc b/website/content/zh-tw/news/newsflash.adoc new file mode 100644 index 0000000000..54187878ae --- /dev/null +++ b/website/content/zh-tw/news/newsflash.adoc @@ -0,0 +1,21 @@ +--- +title: "FreeBSD News Flash" +sidenav: about +loadNews: true +--- + += FreeBSD News Flash + +[.right] +image:../../../gifs/news.jpg[FreeBSD News] + +FreeBSD 是個發展迅速的作業系統。 保持最新的開發版是比較繁瑣的！你可以定期來查閱本頁，此外，也可能訂閱 https://lists.freebsd.org/mailman/listinfo/freebsd-announce[freebsd-announce 郵件論壇] 或使用 link:../feed.xml[RSS feed]。 + +下列的每項都有自己的新聞頁面，裡面有這些的更新細節。 + +* https://freebsd.kde.org/[FreeBSD 上的 KDE] +* link:../../gnome[FreeBSD 上的 GNOME] + +更詳細的描述、介紹、和未來的發行版本，請看 link:../../releases[Release 資訊]這頁。 + +對於 FreeBSD 的安全公告， 請查閱 link:../../security[安全資訊] 頁面。 diff --git a/website/content/zh-tw/press/_index.adoc b/website/content/zh-tw/press/_index.adoc new file mode 100644 index 0000000000..89a4bab74a --- /dev/null +++ b/website/content/zh-tw/press/_index.adoc @@ -0,0 +1,10 @@ +--- +title: "FreeBSD in the Press" +sidenav: about +loadPress: true +--- + += FreeBSD in the Press + +Please send details of any news stories featuring FreeBSD to freebsd-doc@FreeBSD.org. + diff --git a/website/content/zh-tw/security/advisories.adoc b/website/content/zh-tw/security/advisories.adoc new file mode 100644 index 0000000000..cc2d90b230 --- /dev/null +++ b/website/content/zh-tw/security/advisories.adoc @@ -0,0 +1,11 @@ +--- +title: "FreeBSD Security Advisories" +sidenav: support +security: advisories +--- + += FreeBSD Security Advisories + +This web page contains a list of released FreeBSD Security Advisories. See the link:../[FreeBSD Security Information] page for general security information about FreeBSD. + +Issues affecting the FreeBSD Ports Collection are covered in http://vuxml.freebsd.org/[the FreeBSD VuXML document]. diff --git a/website/content/zh-tw/security/notices.adoc b/website/content/zh-tw/security/notices.adoc new file mode 100644 index 0000000000..22686e1109 --- /dev/null +++ b/website/content/zh-tw/security/notices.adoc @@ -0,0 +1,9 @@ +--- +title: "FreeBSD Errata Notices" +sidenav: support +security: notices +--- + += FreeBSD Errata Notices + +This web page contains a list of released FreeBSD Errata Notices. diff --git a/website/themes/beastie/layouts/index.html b/website/themes/beastie/layouts/index.html index a9a12d6124..9b5d0ecefd 100755 --- a/website/themes/beastie/layouts/index.html +++ b/website/themes/beastie/layouts/index.html @@ -131,6 +131,13 @@ </div> </div> </div> + {{ $language := "" }} + {{ $currentLang := $.Site.Language.Lang }} + {{ $siteBaseUrl := absLangURL ($.Site.BaseURL) }} + + {{ if ne $currentLang "en" }} + {{ $language = $currentLang }} + {{ end }} <div id="frontnemscontainer"> <div id="frontnews"> <div id="frontnewscontent" class="txtnewsevent"> @@ -140,7 +147,7 @@ <div> <ul class="newseventslist"> <li class="first-child"> - <a href="{{ absLangURL ($.Site.BaseURL) }}news/newsflash/" title={{ i18n "moreNews" }}>{{ i18n "moreNews" }}</a> + <a href={{ printf "%s%s/%s" $siteBaseUrl $language "news/newsflash/" }} title={{ i18n "moreNews" }}>{{ i18n "moreNews" }}</a> </li> <li class="last-child"> <a href="{{ absLangURL ($.Site.BaseURL) }}news/feed.xml" title={{ i18n "rssNews" }}> @@ -160,7 +167,7 @@ <h2>{{ i18n "upcomingEvents" }}</h2> <div class="newseventswrap"> {{ partial "events.html" . }} - <a href="{{ absLangURL ($.Site.BaseURL) }}events/" title={{ i18n "moreEvents" }}>{{ i18n "moreEvents" }}</a> + <a href={{ printf "%s%s/%s" $siteBaseUrl $language "events/" }} title={{ i18n "moreEvents" }}>{{ i18n "moreEvents" }}</a> </div> </div> </div> @@ -172,7 +179,7 @@ <h2>{{ i18n "press" }}</h2> <div class="newseventswrap"> {{ partial "press.html" . }} - <a href="{{ absLangURL ($.Site.BaseURL) }}press/" title={{ i18n "moreMedia" }}>{{ i18n "moreMedia" }}</a> + <a href={{ printf "%s%s/%s" $siteBaseUrl $language "press/" }} title={{ i18n "moreMedia" }}>{{ i18n "moreMedia" }}</a> </div> </div> </div> @@ -187,7 +194,7 @@ <div> <ul class="newseventslist"> <li class="first-child"> - <a href="{{ absLangURL ($.Site.BaseURL) }}security/advisories/" title={{ i18n "moreErrata" }}>{{ i18n "more" }}</a> + <a href={{ printf "%s%s/%s" $siteBaseUrl $language "security/advisories/" }} title={{ i18n "moreErrata" }}>{{ i18n "more" }}</a> </li> <li class="last-child"> <a href="{{ absLangURL ($.Site.BaseURL) }}security/feed.xml" title={{ i18n "rssSecurity" }}> @@ -204,7 +211,7 @@ <div> <ul class="newseventslist"> <li class="first-child"> - <a href="{{ absLangURL ($.Site.BaseURL) }}security/notices/" title={{ i18n "moreErrata" }}>{{ i18n "more" }}</a> + <a href={{ printf "%s%s/%s" $siteBaseUrl $language "security/notices/" }} title={{ i18n "moreErrata" }}>{{ i18n "more" }}</a> </li> <li class="last-child"> <a href="{{ absLangURL ($.Site.BaseURL) }}security/feed.xml" title={{ i18n "rssSecurity" }}>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202105160753.14G7rEbM067675>