From 82107b5d47122b486d2bdd78f11e72d6a3dd5860 Mon Sep 17 00:00:00 2001
From: xdavidwu <xdavidwuph@gmail.com>
Date: Sat, 1 May 2021 16:24:02 +0800
Subject: [PATCH] normalize feed footer

---
 _config.yml           |  5 +++--
 _data/ui-text.yml     | 34 ----------------------------------
 _includes/footer.html |  2 --
 _includes/head.html   |  2 +-
 4 files changed, 4 insertions(+), 39 deletions(-)

diff --git a/_config.yml b/_config.yml
index 41fa811..3a25d09 100644
--- a/_config.yml
+++ b/_config.yml
@@ -52,8 +52,6 @@ comments:
 reCaptcha:
   siteKey:
   secret:
-atom_feed:
-  path: # blank (default) uses feed.xml
 search: true # true, false (default)
 search_full_content: false # true, false (default)
 search_provider: "lunr" # lunr (default), algolia, google
@@ -145,6 +143,9 @@ footer:
     - label: "Back to top"
       icon: "fab fa-fw fa-angle-double-up"
       url: "#"
+    - label: "Feed"
+      icon: "fas fa-fw fa-rss-square"
+      url: "/feed.xml"
 
 
 # Reading Files
diff --git a/_data/ui-text.yml b/_data/ui-text.yml
index 45390e1..c002557 100644
--- a/_data/ui-text.yml
+++ b/_data/ui-text.yml
@@ -28,7 +28,6 @@ en: &DEFAULT_EN
   more_label                 : "Learn more"
   related_label              : "You may also enjoy"
   follow_label               : "Follow:"
-  feed_label                 : "Feed"
   powered_by                 : "Powered by"
   website_label              : "Website"
   email_label                : "Email"
@@ -87,7 +86,6 @@ es: &DEFAULT_ES
   more_label                 : "Ver más"
   related_label              : "Puede que también te interese"
   follow_label               : "Seguir:"
-  feed_label                 : "Feed"
   powered_by                 : "Funciona con"
   website_label              : "Sitio web"
   email_label                : "Correo electrónico"
@@ -142,7 +140,6 @@ fr: &DEFAULT_FR
   more_label                 : "Lire plus"
   related_label              : "Vous pourriez aimer aussi"
   follow_label               : "Contact"
-  feed_label                 : "Flux"
   powered_by                 : "Propulsé par"
   website_label              : "Site"
   email_label                : "Email"
@@ -199,7 +196,6 @@ tr: &DEFAULT_TR
   more_label                 : "Daha fazlasını öğrenin"
   related_label              : "Bunlar ilginizi çekebilir:"
   follow_label               : "Takip et:"
-  feed_label                 : "RSS"
   powered_by                 : "Emeği geçenler: "
   website_label              : "Web sayfası"
   email_label                : "E-posta"
@@ -249,7 +245,6 @@ pt: &DEFAULT_PT
   more_label                 : "Saber mais"
   related_label              : "Também pode gostar de"
   follow_label               : "Siga:"
-  feed_label                 : "Feed"
   powered_by                 : "Feito com"
   website_label              : "Site"
   email_label                : "Email"
@@ -297,7 +292,6 @@ pt-BR:
   more_label                 : "Saiba mais"
   related_label              : "Talvez você também goste"
   follow_label               : "Acompanhe no"
-  feed_label                 : "Feed"
   powered_by                 : "Desenvolvido com"
   website_label              : "Site"
   email_label                : "E-mail"
@@ -348,7 +342,6 @@ it: &DEFAULT_IT
   more_label                 : "Scopri di più"
   related_label              : "Potrebbe Piacerti Anche"
   follow_label               : "Segui:"
-  feed_label                 : "Feed"
   powered_by                 : "Powered by"
   website_label              : "Website"
   email_label                : "Email"
@@ -401,7 +394,6 @@ zh: &DEFAULT_ZH_HANS
   more_label                 : "了解更多"
   related_label              : "猜您还喜欢"
   follow_label               : "关注:"
-  feed_label                 : "Feed"
   powered_by                 : "技术来自于"
   website_label              : "网站"
   email_label                : "电子邮箱"
@@ -454,7 +446,6 @@ zh-TW: &DEFAULT_ZH_HANT
   more_label                 : "了解更多"
   related_label              : "猜您有與趣"
   follow_label               : "追蹤:"
-  feed_label                 : "RSS Feed"
   powered_by                 : "Powered by"
   website_label              : "網站"
   email_label                : "電子信箱"
@@ -507,7 +498,6 @@ de: &DEFAULT_DE
   more_label                 : "Mehr anzeigen"
   related_label              : "Ihnen gefällt vielleicht auch"
   follow_label               : "Folgen:"
-  feed_label                 : "Feed"
   powered_by                 : "Möglich durch"
   website_label              : "Webseite"
   email_label                : "E-Mail"
@@ -569,7 +559,6 @@ ne: &DEFAULT_NE
   more_label                 : "अझै सिक्नुहोस्"
   related_label              : "तपाईं रुचाउन सक्नुहुन्छ "
   follow_label               : "पछ्याउनुहोस्:"
-  feed_label                 : "फिड"
   powered_by                 : "Powered by"
   website_label              : "वेबसाइट"
   email_label                : "इमेल"
@@ -619,7 +608,6 @@ ko: &DEFAULT_KO
   more_label                 : "더 보기"
   related_label              : "참고"
   follow_label               : "팔로우:"
-  feed_label                 : "피드"
   powered_by                 : "Powered by"
   website_label              : "웹사이트"
   email_label                : "이메일"
@@ -672,7 +660,6 @@ ru: &DEFAULT_RU
   more_label                 : "Читать далее"
   related_label              : "Вам также может понравиться"
   follow_label               : "Связаться со мной:"
-  feed_label                 : "RSS-лента"
   powered_by                 : "Сайт работает на"
   website_label              : "Сайт"
   email_label                : "Электронная почта"
@@ -724,7 +711,6 @@ lt: &DEFAULT_LT
   more_label                 : "Skaityti daugiau"
   related_label              : "Taip pat turėtų patikti"
   follow_label               : "Sekti:"
-  feed_label                 : "Šaltinis"
   powered_by                 : "Sukurta su"
   website_label              : "Tinklapis"
   email_label                : "El. paštas"
@@ -774,7 +760,6 @@ gr: &DEFAULT_GR
   more_label                 : "Διάβαστε περισσότερα"
   related_label              : "Σχετικές αναρτήσεις"
   follow_label               : "Ακολουθήστε:"
-  feed_label                 : "RSS Feed"
   powered_by                 : "Δημιουργήθηκε με"
   website_label              : "Ιστοσελίδα"
   email_label                : "Email"
@@ -826,7 +811,6 @@ sv: &DEFAULT_SV
   more_label                 : "Lär dig mer"
   related_label              : "Du kanske vill även läsa:"
   follow_label               : "Följ:"
-  feed_label                 : "Flöde"
   powered_by                 : "Framställd med"
   website_label              : "Webbsida"
   email_label                : "E-post"
@@ -881,7 +865,6 @@ nl: &DEFAULT_NL
   more_label                 : "Meer informatie"
   related_label              : "Bekijk ook eens"
   follow_label               : "Volg:"
-  feed_label                 : "Feed"
   powered_by                 : "Aangedreven door"
   website_label              : "Website"
   email_label                : "Email"
@@ -936,7 +919,6 @@ id: &DEFAULT_ID
   more_label                 : "Pelajari lagi"
   related_label              : "Anda juga akan suka"
   follow_label               : "Ikuti:"
-  feed_label                 : "Feed"
   powered_by                 : "Didukung oleh"
   website_label              : "Website"
   email_label                : "Email"
@@ -986,7 +968,6 @@ vi: &DEFAULT_VI
   more_label                 : "Mở rộng"
   related_label              : "Có thể bạn cũng thích"
   follow_label               : "Theo dõi:"
-  feed_label                 : "Feed"
   powered_by                 : "Xây dựng trên nền tảng"
   website_label              : "Website"
   email_label                : "Email"
@@ -1039,7 +1020,6 @@ da: &DEFAULT_DA
   more_label                 : "Lær mere"
   related_label              : "Måske kan du også lide"
   follow_label               : "Følg:"
-  feed_label                 : "Feed"
   powered_by                 : "Drives af"
   website_label              : "Website"
   email_label                : "E-mail"
@@ -1092,7 +1072,6 @@ pl: &DEFAULT_PL
   more_label                 : "Dowiedz się więcej"
   related_label              : "Także może Ci się spodobać"
   follow_label               : "Śledź:"
-  feed_label                 : "Feed"
   powered_by                 : "Powstało dzięki"
   website_label              : "Strona"
   email_label                : "Email"
@@ -1142,7 +1121,6 @@ ja: &DEFAULT_JA
   more_label                 : "さらに詳しく"
   related_label              : "関連記事"
   follow_label               : "フォロー"
-  feed_label                 :
   powered_by                 :
   website_label              :
   email_label                :
@@ -1194,7 +1172,6 @@ sk: &DEFAULT_SK
   more_label                 : "Dozvedieť sa viac"
   related_label              : "Podobné články"
   follow_label               : "Sleduj:"
-  feed_label                 : "Zoznam"
   powered_by                 : "Stránka vytvorená pomocou"
   website_label              : "Web stránka"
   email_label                : "Email"
@@ -1247,7 +1224,6 @@ hu: &DEFAULT_HU
   more_label                 : "Tovább"
   related_label              : "Ajánlások"
   follow_label               : "Követés:"
-  feed_label                 : "Folyam"
   powered_by                 : "Powered by"
   website_label              : "Honlap"
   email_label                : "Email"
@@ -1300,7 +1276,6 @@ ro: &DEFAULT_RO
   more_label                 : "Citește mai departe"
   related_label              : "S-ar putea să-ți placă"
   follow_label               : "Urmărește:"
-  feed_label                 : "Feed RSS"
   powered_by                 : "Cu sprijinul"
   website_label              : "Site"
   email_label                : "Email"
@@ -1353,7 +1328,6 @@ pa: &DEFAULT_PA
   more_label                 : "ਹੋਰ ਜਾਣੋ"
   related_label              : "ਤੁਸੀਂ ਇਸਦਾ ਆਨੰਦ ਵੀ ਲੈ ਸਕਦੇ ਹੋ"
   follow_label               : "ਫਾਲੋ ਅੱਪ ਕਰੋ:"
-  feed_label                 : "ਫੀਡ"
   powered_by                 : "ਦੁਆਰਾ ਸੰਚਾਲਿਤ"
   website_label              : "ਵੈੱਬਸਾਇਟ"
   email_label                : "ਈਮੇਲ"
@@ -1405,7 +1379,6 @@ fa: &DEFAULT_FA
   more_label                 : "ادامه مطلب"
   related_label              : "ممکن است از این مطالب نیز لذت ببرید"
   follow_label               : "دنبال کنید: "
-  feed_label                 : "خوراک"
   powered_by                 : "طراحی شده توسط"
   website_label              : "سایت اینترنتی"
   email_label                : "پست الکترونیک"
@@ -1459,7 +1432,6 @@ ml: &DEFAULT_ML
   more_label                 : "കൂടുതൽ  അറിയുവാൻ"
   related_label              : "നിങ്ങൾക് ഇതും ഇഷ്ടപ്പെട്ടേക്കാം"
   follow_label               : "പിന്തുടരുക:"
-  feed_label                 : "ഫീഡ്"
   powered_by                 : "പവേർഡ് ബൈ"
   website_label              : "വെബ്സൈറ്റ്"
   email_label                : "ഇ-മെയിൽ"
@@ -1512,7 +1484,6 @@ th: &DEFAULT_TH
   more_label                 : "อ่านต่อ"
   related_label              : "คุณอาจจะชอบสิ่งนี้"
   follow_label               : "ติดตาม:"
-  feed_label                 : "ฟืดข่าว"
   powered_by                 : "ขับเคลื่อนโดย"
   website_label              : "เว็บไซต์"
   email_label                : "อีเมล"
@@ -1564,7 +1535,6 @@ hi: &DEFAULT_HI
   more_label                 : "और अधिक जानें"
   related_label              : "आप इसका भी आनंद ले सकते हैं"
   follow_label               : "अनुसरण करे:"
-  feed_label                 : "फ़ीड"
   powered_by                 : "द्वारा संचालित"
   website_label              : "वेबसाइट"
   email_label                : "ईमेल"
@@ -1617,7 +1587,6 @@ ca: &DEFAULT_CA
   more_label                 : "Llegeix més"
   related_label              : "També et pot agradar"
   follow_label               : "Segueix-me:"
-  feed_label                 : "Feed"
   powered_by                 : "Funciona amb"
   website_label              : "Pàgina web"
   email_label                : "Correu electrònic"
@@ -1669,7 +1638,6 @@ ga: &DEFAULT_GA
   comments_title             : "Tráchtanna"
   more_label                 : "Foghlaim níos mó"
   follow_label               : "Lean:"
-  feed_label                 : "Feed"
   powered_by                 : "Ag fáil cumhacht as"
   website_label              : "Suíomh gréasáin"
   email_label                : "R-phost"
@@ -1718,7 +1686,6 @@ fi: &DEFAULT_FI
   more_label                 : "Lisää"
   related_label              : "Voit olla kiinnostunut myös"
   follow_label               : "Seuraa:"
-  feed_label                 : "Syöte"
   powered_by                 : "Voimanlähteenä"
   website_label              : "Websivu"
   email_label                : "Email"
@@ -1769,7 +1736,6 @@ my: &DEFAULT_MY
   more_label                 : "ပိုမိုသိရှိရန်"
   related_label              : "သင်နှစ်သက်နိုင်​သော"
   follow_label               : "သတင်းလိုက်ယူရန် -"
-  feed_label                 : "Feed ယူရန် -"
   powered_by                 : "ပံ့ပိုးသည်"
   website_label              : "ဝဘ်ဆိုက်"
   email_label                : "အီးမေးလ်"
diff --git a/_includes/footer.html b/_includes/footer.html
index dbcd1b2..e46a1af 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -7,8 +7,6 @@
         {% endif %}
       {% endfor %}
     {% endif %}
-
-    <li><a href="{% if site.atom_feed.path %}{{ site.atom_feed.path }}{% else %}{{ '/feed.xml' | relative_url }}{% endif %}"><i class="fas fa-fw fa-rss-square" aria-hidden="true"></i> {{ site.data.ui-text[site.locale].feed_label | default: "Feed" }}</a></li>
   </ul>
 </div>
 
diff --git a/_includes/head.html b/_includes/head.html
index 6cdfb29..235ddd4 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -2,7 +2,7 @@
 
 {% include seo.html %}
 
-<link href="{% if site.atom_feed.path %}{{ site.atom_feed.path }}{% else %}{{ '/feed.xml' | relative_url }}{% endif %}" type="application/atom+xml" rel="alternate" title="Feed">
+<link href="{{ '/feed.xml' | relative_url }}" type="application/atom+xml" rel="alternate" title="Feed">
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 <script>
   document.documentElement.className = '';
-- 
2.43.0