git: afb8f803e4 - main - website: Rename "More Events", "More Media" and "More News" to just "More"

From: Mateusz Piotrowski <0mp_at_FreeBSD.org>
Date: Mon, 15 Jul 2024 17:50:57 UTC
The branch main has been updated by 0mp:

URL: https://cgit.FreeBSD.org/doc/commit/?id=afb8f803e4898ac29ee92e5233def53c907a8761

commit afb8f803e4898ac29ee92e5233def53c907a8761
Author:     Janek Szynal <mail@janek.ooo>
AuthorDate: 2024-07-15 17:49:15 +0000
Commit:     Mateusz Piotrowski <0mp@FreeBSD.org>
CommitDate: 2024-07-15 17:49:15 +0000

    website: Rename "More Events", "More Media" and "More News" to just "More"
    
    The naming of these buttons is inconsistent - two of them just say
    "More" and three say "More X". Because the section tittles are very
    close and mention "X", I believe just "More" is better. This also allows
    the removal of some i18n entries, including one that was inconsistent
    (missing 1 of 4 entries).
    
    Reviewed by:            0mp
    Differential Revision:  https://reviews.freebsd.org/D45809
---
 website/themes/beastie/i18n/de.toml       | 12 ------------
 website/themes/beastie/i18n/en.toml       | 12 ------------
 website/themes/beastie/i18n/es.toml       | 10 ----------
 website/themes/beastie/i18n/fr.toml       | 12 ------------
 website/themes/beastie/i18n/ja.toml       |  9 ---------
 website/themes/beastie/i18n/nl.toml       | 12 ------------
 website/themes/beastie/i18n/ru.toml       | 12 ------------
 website/themes/beastie/i18n/zh-cn.toml    | 12 ------------
 website/themes/beastie/i18n/zh-tw.toml    | 12 ------------
 website/themes/beastie/layouts/index.html | 32 ++++++++++++++++++++++++++-----
 10 files changed, 27 insertions(+), 108 deletions(-)

diff --git a/website/themes/beastie/i18n/de.toml b/website/themes/beastie/i18n/de.toml
index 96b6f38990..e26885286c 100644
--- a/website/themes/beastie/i18n/de.toml
+++ b/website/themes/beastie/i18n/de.toml
@@ -224,18 +224,6 @@ other = "SICHERHEITS-HINWEISE"
 [errataNotices]
 other = "FEHLER-HINWEISE"
 
-[moreNews]
-other = "Weitere Neuigkeiten"
-
-[moreEvents]
-other = "Weitere Veranstaltungen"
-
-[moreMedia]
-other = "Weitere Berichte"
-
-[moreErrata]
-other = "Mehr"
-
 [more]
 other = "Mehr"
 
diff --git a/website/themes/beastie/i18n/en.toml b/website/themes/beastie/i18n/en.toml
index 563375f550..73d78f71e7 100644
--- a/website/themes/beastie/i18n/en.toml
+++ b/website/themes/beastie/i18n/en.toml
@@ -236,18 +236,6 @@ other = "SECURITY ADVISORIES"
 [errataNotices]
 other = "ERRATA NOTICES"
 
-[moreNews]
-other = "More News"
-
-[moreEvents]
-other = "More Events"
-
-[moreMedia]
-other = "More Media"
-
-[moreErrata]
-other = "More Errata Notices"
-
 [more]
 other = "More"
 
diff --git a/website/themes/beastie/i18n/es.toml b/website/themes/beastie/i18n/es.toml
index 6368668b8d..b98c98b6e8 100644
--- a/website/themes/beastie/i18n/es.toml
+++ b/website/themes/beastie/i18n/es.toml
@@ -221,15 +221,6 @@ other = "AVISOS DE SEGURIDAD"
 [errataNotices]
 other = "AVISOS SOBRE ERRORES"
 
-[moreNews]
-other = "Más noticias"
-
-[moreEvents]
-other = "Más eventos"
-
-[moreMedia]
-other = "Más medios"
-
 [more]
 other = "Más"
 
@@ -555,4 +546,3 @@ other = "Informar de un problema"
 
 [webresources]
 other = "Recursos Web"
-
diff --git a/website/themes/beastie/i18n/fr.toml b/website/themes/beastie/i18n/fr.toml
index 767ddb2d39..d5ef5ac271 100644
--- a/website/themes/beastie/i18n/fr.toml
+++ b/website/themes/beastie/i18n/fr.toml
@@ -224,18 +224,6 @@ other = "AVIS DE SÉCURITÉ"
 [errataNotices]
 other = "ERRATA"
 
-[moreNews]
-other = "Plus de nouvelles"
-
-[moreEvents]
-other = "Plus d'événements"
-
-[moreMedia]
-other = "Plus de médias"
-
-[moreErrata]
-other = "Plus d'errata"
-
 [more]
 other = "Plus"
 
diff --git a/website/themes/beastie/i18n/ja.toml b/website/themes/beastie/i18n/ja.toml
index cf5a3c7e0d..121f7c8088 100644
--- a/website/themes/beastie/i18n/ja.toml
+++ b/website/themes/beastie/i18n/ja.toml
@@ -227,15 +227,6 @@ other = "セキュリティ勧告"
 [errataNotices]
 other = "Errata 情報"
 
-[moreNews]
-other = "すべてのニュース"
-
-[moreEvents]
-other = "すべてのイベント"
-
-[moreMedia]
-other = "すべてのニュース記事"
-
 [more]
 other = "すべて表示"
 
diff --git a/website/themes/beastie/i18n/nl.toml b/website/themes/beastie/i18n/nl.toml
index a738157dab..f181481677 100644
--- a/website/themes/beastie/i18n/nl.toml
+++ b/website/themes/beastie/i18n/nl.toml
@@ -203,18 +203,6 @@ other = "SECURITY ADVISORIES"
 [errataNotices]
 other = "ERRATA NOTICES"
 
-[moreNews]
-other = "More News"
-
-[moreEvents]
-other = "More Events"
-
-[moreMedia]
-other = "More Media"
-
-[moreErrata]
-other = "More Errata Notices"
-
 [more]
 other = "More"
 
diff --git a/website/themes/beastie/i18n/ru.toml b/website/themes/beastie/i18n/ru.toml
index 849643c51c..e18282da8a 100644
--- a/website/themes/beastie/i18n/ru.toml
+++ b/website/themes/beastie/i18n/ru.toml
@@ -235,18 +235,6 @@ other = "БЮЛЛЕТЕНИ БЕЗОПАСНОСТИ"
 [errataNotices]
 other = "ОШИБКИ"
 
-[moreNews]
-other = "Все новости"
-
-[moreEvents]
-other = "Все события"
-
-[moreMedia]
-other = "Все публикации"
-
-[moreErrata]
-other = "Все важные исправления"
-
 [more]
 other = "Больше"
 
diff --git a/website/themes/beastie/i18n/zh-cn.toml b/website/themes/beastie/i18n/zh-cn.toml
index 26458fc2c8..acd52ea224 100644
--- a/website/themes/beastie/i18n/zh-cn.toml
+++ b/website/themes/beastie/i18n/zh-cn.toml
@@ -221,18 +221,6 @@ other = "安全公告"
 [errataNotices]
 other = "勘误公告"
 
-[moreNews]
-other = "更多新闻"
-
-[moreEvents]
-other = "更多活动"
-
-[moreMedia]
-other = "更多媒体报道"
-
-[moreErrata]
-other = "更多安全公告"
-
 [more]
 other = "更多勘误公告"
 
diff --git a/website/themes/beastie/i18n/zh-tw.toml b/website/themes/beastie/i18n/zh-tw.toml
index 1950967574..de8bd5c37a 100644
--- a/website/themes/beastie/i18n/zh-tw.toml
+++ b/website/themes/beastie/i18n/zh-tw.toml
@@ -224,18 +224,6 @@ other = "安全公告"
 [errataNotices]
 other = "勘誤公告"
 
-[moreNews]
-other = "更多新聞"
-
-[moreEvents]
-other = "更多活動"
-
-[moreMedia]
-other = "更多媒體報導"
-
-[moreErrata]
-other = "More Errata Notices"
-
 [more]
 other = "更多"
 
diff --git a/website/themes/beastie/layouts/index.html b/website/themes/beastie/layouts/index.html
index 97554a5cf9..42d9c06631 100755
--- a/website/themes/beastie/layouts/index.html
+++ b/website/themes/beastie/layouts/index.html
@@ -153,7 +153,7 @@
             <div>
               <ul class="newseventslist">
                 <li class="first-child">
-                  <a href={{ printf "%s%s/%s" $siteBaseUrl $language "news/newsflash/" }} title={{ i18n "moreNews" }}>{{ i18n "moreNews" }}</a>
+                  <a href={{ printf "%s%s/%s" $siteBaseUrl $language "news/newsflash/" }} title={{ i18n "more" }}>{{ i18n "more" }}</a>
                 </li>
                 <li class="last-child">
                   <a href="{{ absLangURL ($.Site.BaseURL) }}news/feed.xml" title={{ i18n "rssNews" }}>
@@ -173,7 +173,18 @@
           <h2>{{ i18n "upcomingEvents" }}</h2>
           <div class="newseventswrap">
             {{ partial "events.html" . }}
-            <a href={{ printf "%s%s/%s" $siteBaseUrl $language "events/" }} title={{ i18n "moreEvents" }}>{{ i18n "moreEvents" }}</a>
+            <div>
+              <ul class="newseventslist">
+                <li class="first-child">
+                  <a href={{ printf "%s%s/%s" $siteBaseUrl $language "events/" }} title={{ i18n "more" }}>{{ i18n "more" }}</a>
+                </li>
+                <li class="last-child">
+                  <a href="{{ absLangURL ($.Site.BaseURL) }}events/feed.xml" title={{ i18n "rssEvents" }}>
+                    <img class="rssimage" src="{{ absLangURL ($.Site.BaseURL) }}images/ico_rss.png" alt={{ i18n "rssEvents" }} width="27" height="12" />
+                  </a>
+                </li>
+              </ul>
+            </div>
           </div>
         </div>
       </div>
@@ -185,7 +196,18 @@
           <h2>{{ i18n "press" }}</h2>
           <div class="newseventswrap">
             {{ partial "press.html" . }}
-            <a href={{ printf "%s%s/%s" $siteBaseUrl $language "press/" }} title={{ i18n "moreMedia" }}>{{ i18n "moreMedia" }}</a>
+            <div>
+              <ul class="newseventslist">
+                <li class="first-child">
+                  <a href={{ printf "%s%s/%s" $siteBaseUrl $language "press/" }} title={{ i18n "more" }}>{{ i18n "more" }}</a>
+                </li>
+                <li class="last-child">
+                  <a href="{{ absLangURL ($.Site.BaseURL) }}press/feed.xml" title={{ i18n "rssMedia" }}>
+                    <img class="rssimage" src="{{ absLangURL ($.Site.BaseURL) }}images/ico_rss.png" alt={{ i18n "rssMedia" }} width="27" height="12" />
+                  </a>
+                </li>
+              </ul>
+            </div>
           </div>
         </div>
       </div>
@@ -200,7 +222,7 @@
             <div>
               <ul class="newseventslist">
                 <li class="first-child">
-                  <a href={{ printf "%s%s/%s" $siteBaseUrl $language "security/advisories/" }} title={{ i18n "moreErrata" }}>{{ i18n "more" }}</a>
+                  <a href={{ printf "%s%s/%s" $siteBaseUrl $language "security/advisories/" }} title={{ i18n "more" }}>{{ i18n "more" }}</a>
                 </li>
                 <li class="last-child">
                   <a href="{{ absLangURL ($.Site.BaseURL) }}security/feed.xml" title={{ i18n "rssSecurity" }}>
@@ -217,7 +239,7 @@
             <div>
               <ul class="newseventslist">
                 <li class="first-child">
-                  <a href={{ printf "%s%s/%s" $siteBaseUrl $language "security/notices/" }} title={{ i18n "moreErrata" }}>{{ i18n "more" }}</a>
+                  <a href={{ printf "%s%s/%s" $siteBaseUrl $language "security/notices/" }} title={{ i18n "more" }}>{{ i18n "more" }}</a>
                 </li>
                 <li class="last-child">
                   <a href="{{ absLangURL ($.Site.BaseURL) }}security/feed.xml" title={{ i18n "rssSecurity" }}>