From 5f2a4877a88cc5f6903deb7772adabd60d29cb8d Mon Sep 17 00:00:00 2001
From: Justin W. Flory (he/him) <jwf@redhat.com>
Date: Jun 11 2023 17:08:52 +0000
Subject: footer: Refactor and update URLs


This commit reworks most of the data used in the footer of the Flock
website. Notable changes:

* Add more Fedora social media channels
* Update docs links for Fedora Project overview and Fedora Legal
* Add more Fedora Linux editions
* Fix links to Fedora Linux downloads with the new websites from F38
* Update links for getting support to relevant docs or landing places
* Update copyright year

Signed-off-by: Justin W. Flory (he/him) <jwf@redhat.com>

---

diff --git a/flocktofedora.org/data/templates/footer.html b/flocktofedora.org/data/templates/footer.html
index f040253..9338b5d 100644
--- a/flocktofedora.org/data/templates/footer.html
+++ b/flocktofedora.org/data/templates/footer.html
@@ -14,35 +14,44 @@
                         <h3 class="widget-title">${_('About')}</h3>
                         <div class="widget-body">
                             <dl>
-                                <dd><a href="//fedoraproject.org/wiki/Overview">${_('About Fedora')}</a></dd>
-                                <dd><a href="//getfedora.org/${lang}/sponsors">${_('Sponsors')}</a></dd>
-                                <dd><a href="//fedoramagazine.org">${_('Fedora Magazine')}</a></dd>
-                                <dd><a href="https://fedoraproject.org/wiki/Legal:Main#Legal">${_('Legal')}</a></dd>
+                                <dd><a href="https://docs.fedoraproject.org/en-US/project/">${_('About Fedora')}</a></dd>
+                                <dd><a href="https://getfedora.org/${lang}/sponsors">${_('Sponsors')}</a></dd>
+                                <dd><a href="https://fedoramagazine.org">${_('Fedora Magazine')}</a></dd>
+                                <dd><a href="https://docs.fedoraproject.org/en-US/legal/">${_('Legal')}</a></dd>
                                 <dd><a href="https://docs.fedoraproject.org/en-US/project/code-of-conduct/">${_('Fedora Code of Conduct')}</a></dd>
                             </dl>
                             <ul class="list-inline">
-                            <li>
-                                <a href="https://www.facebook.com/TheFedoraProject" class="btn-social btn-outline"><i class="fa fa-fw fa-facebook"></i></a>
-                            </li>
-                            <li>
-                                <a href="https://twitter.com/fedora" class="btn-social btn-outline"><i class="fa fa-fw fa-twitter"></i></a>
-                            </li>
+                                <li>
+                                    <a href="https://fosstodon.org/@fedora" class="btn-social btn-outline"><i class="fa fa-fw fa-mastodon"></i></a>
+                                </li>
+                                <li>
+                                    <a href="https://www.linkedin.com/company/fedora-project/" class="btn-social btn-outline"><i class="fa fa-fw fa-linkedin"></i></a>
+                                </li>
+                                <li>
+                                    <a href="https://www.youtube.com/@fedora" class="btn-social btn-outline"><i class="fa fa-fw fa-youtube"></i></a>
+                                </li>
+                                <li>
+                                    <a href="https://twitter.com/fedora" class="btn-social btn-outline"><i class="fa fa-fw fa-twitter"></i></a>
+                                </li>
+                                <li>
+                                    <a href="https://www.facebook.com/TheFedoraProject" class="btn-social btn-outline"><i class="fa fa-fw fa-facebook"></i></a>
+                                </li>
                         </ul>
                         </div>
                     </div>
 
                     <div class="col-sm-3 col-xs-6 widget">
-                        <h3 class="widget-title uppercase">${_('Download')}</h3>
+                        <h3 class="widget-title uppercase">${_('Fedora Linux')}</h3>
                         <div class="widget-body">
                           <dl>
-                            <dd><a href="//getfedora.org/${lang}/workstation/download">${_('Get Fedora Workstation')}</a></dd>
-                            <dd><a href="//getfedora.org/${lang}/server/download">${_('Get Fedora Server')}</a></dd>
-                            <dd><a href="//silverblue.fedoraproject.org/download">${_('Get Fedora Silverblue')}</a></dd>
-                            <dd><a href="//spins.fedoraproject.org">${_('Fedora Spins')}</a></dd>
-                            <dd><a href="//labs.fedoraproject.org">${_('Fedora Labs')}</a></dd>
-                            <dd><a href="//arm.fedoraproject.org">${Markup(_('Fedora ARM&lt;span class="sup"&gt;&reg;&lt;/span&gt;'))}</a></dd>
-                            <dd><a href="//alt.fedoraproject.org/">${_('Alternative Downloads')}</a></dd>
-
+                            <dd><a href="https://fedoraproject.org//workstation/">${_('Fedora Workstation')}</a></dd>
+                            <dd><a href="https://fedoraproject.org/server/">${_('Fedora Server')}</a></dd>
+                            <dd><a href="https://fedoraproject.org/cloud/">${_('Fedora Cloud')}</a></dd>
+                            <dd><a href="https://fedoraproject.org/coreos/">${_('Fedora CoreOS')}</a></dd>
+                            <dd><a href="https://fedoraproject.org/iot/">${_('Fedora IoT')}</a></dd>
+                            <dd><a href="https://fedoraproject.org/silverblue/">${_('Fedora Silverblue')}</a></dd>
+                            <dd><a href="https://spins.fedoraproject.org">${_('Fedora Spins')}</a></dd>
+                            <dd><a href="https://labs.fedoraproject.org">${_('Fedora Labs')}</a></dd>
                         </dl>
                         </div>
                     </div>
@@ -51,11 +60,11 @@
                         <h3 class="widget-title">${_('Support')}</h3>
                         <div class="widget-body">
                             <dl>
-                                <dd><a href="//fedoraproject.org/wiki/Communicating_and_getting_help">${_('Get Help')}</a></dd>
-                                <dd><a href="//ask.fedoraproject.org/">${_('Ask Fedora')}</a></dd>
-                                <dd><a href="//fedoraproject.org/wiki/Common_F${global_variables.release['curr_id']}_bugs">${_('Common Bugs')}</a></dd>
-                                <dd><a href="//developer.fedoraproject.org/">${_('Fedora Developer Portal')}</a></dd>
-                                <dd><a href="//docs.fedoraproject.org/en-US/fedora/latest/install-guide/">${_('Installation Guide')}</a></dd>
+                                <dd><a href="https://docs.fedoraproject.org/en-US/project/communications/">${_('Get Help')}</a></dd>
+                                <dd><a href="https://discussion.fedoraproject.org/c/ask/6">${_('Ask Fedora')}</a></dd>
+                                <dd><a href="https://fedoraproject.org/wiki/Common_F${global_variables.release['curr_id']}_bugs">${_('Common Bugs')}</a></dd>
+                                <dd><a href="https://developer.fedoraproject.org/">${_('Fedora Developer Portal')}</a></dd>
+                                <dd><a href="https://docs.fedoraproject.org/en-US/fedora/latest/install-guide/">${_('Installation Guide')}</a></dd>
                             </dl>
                         </div>
                     </div>
@@ -64,11 +73,10 @@
                         <h3 class="widget-title">${_('Join')}</h3>
                         <div class="widget-body">
                             <dl>
-                                <dd><a href="//fedoraproject.org/wiki/Join">${_('Join Fedora')}</a></dd>
+                                <dd><a href="https://docs.fedoraproject.org/en-US/fedora-join/welcome/welcome/">${_('Join Fedora')}</a></dd>
                                 <dd><a href="https://communityblog.fedoraproject.org/">${_('Fedora Community Blog')}</a></dd>
-                                <dd><a href="//fedoraproject.org/wiki/SIGs">${_('Fedora SIGs')}</a></dd>
-                                <dd><a href="//admin.fedoraproject.org/accounts/">${_('Fedora Account System')}</a></dd>
-                                <dd><a href="http://fedoracommunity.org/">${_('Fedora Community')}</a></dd>
+                                <dd><a href="https://fedoraproject.org/wiki/SIGs">${_('Fedora SIGs')}</a></dd>
+                                <dd><a href="https://accounts.fedoraproject.org/">${_('Fedora Account System')}</a></dd>
                             </dl>
                         </div>
                     </div>
@@ -84,7 +92,7 @@
                         <div class="widget-body">
                             <p class="sponsor">${_('Fedora is sponsored by Red Hat.')}</p>
                             <p class="sponsor"><a href="https://www.redhat.com/en/topics/linux/fedora-vs-red-hat-enterprise-linux">${_('Learn more about the relationship between Red Hat and Fedora &raquo;')}</a></p>
-                            <p class="copy">${_('&copy; %(year)s Red Hat, Inc. and others.') % {'year':'2022'}} ${Markup(_('Please send any comments or corrections to the &lt;a href="//pagure.io/fedora-websites"&gt;websites team&lt;/a&gt;.'))}</p>
+                            <p class="copy">${_('&copy; %(year)s Red Hat, Inc. and others.') % {'year':'2023'}} ${Markup(_('Please send comments or corrections to the &lt;a href=&quot;https://discussion.fedoraproject.org/tag/websites-and-apps-team&quot;&gt;Fedora Websites &amp; Apps Team&lt;/a&gt;.'))}</p>
                         </div>
                     </div>
                     <div class="col-md-3">
diff --git a/flocktofedora.org/po/flocktofedora.pot b/flocktofedora.org/po/flocktofedora.pot
index e48aa94..01126c5 100644
--- a/flocktofedora.org/po/flocktofedora.pot
+++ b/flocktofedora.org/po/flocktofedora.pot
@@ -1,21 +1,21 @@
 # Translations template for PROJECT.
-# Copyright (C) 2022 ORGANIZATION
+# Copyright (C) 2023 ORGANIZATION
 # This file is distributed under the same license as the PROJECT project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2022.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2023.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-03-15 19:12-0400\n"
+"POT-Creation-Date: 2023-06-11 17:05+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.9.1\n"
+"Generated-By: Babel 2.6.0\n"
 
 #: data/content/index.html:8
 msgid "Flock To Fedora: Fedora Contributor Conference"
@@ -435,103 +435,104 @@ msgstr ""
 msgid "Fedora Code of Conduct"
 msgstr ""
 
-#: data/templates/footer.html:35
-msgid "Download"
+#: data/templates/footer.html:44
+msgid "Fedora Linux"
 msgstr ""
 
-#: data/templates/footer.html:38
-msgid "Get Fedora Workstation"
+#: data/templates/footer.html:47
+msgid "Fedora Workstation"
 msgstr ""
 
-#: data/templates/footer.html:39
-msgid "Get Fedora Server"
+#: data/templates/footer.html:48
+msgid "Fedora Server"
 msgstr ""
 
-#: data/templates/footer.html:40
-msgid "Get Fedora Silverblue"
+#: data/templates/footer.html:49
+msgid "Fedora Cloud"
 msgstr ""
 
-#: data/templates/footer.html:41
-msgid "Fedora Spins"
+#: data/templates/footer.html:50
+msgid "Fedora CoreOS"
 msgstr ""
 
-#: data/templates/footer.html:42
-msgid "Fedora Labs"
+#: data/templates/footer.html:51
+msgid "Fedora IoT"
 msgstr ""
 
-#: data/templates/footer.html:43
-msgid "Fedora ARM<span class=\"sup\">®</span>"
+#: data/templates/footer.html:52
+msgid "Fedora Silverblue"
 msgstr ""
 
-#: data/templates/footer.html:44
-msgid "Alternative Downloads"
+#: data/templates/footer.html:53
+msgid "Fedora Spins"
 msgstr ""
 
-#: data/templates/footer.html:51
+#: data/templates/footer.html:54
+msgid "Fedora Labs"
+msgstr ""
+
+#: data/templates/footer.html:60
 msgid "Support"
 msgstr ""
 
-#: data/templates/footer.html:54
+#: data/templates/footer.html:63
 msgid "Get Help"
 msgstr ""
 
-#: data/templates/footer.html:55
+#: data/templates/footer.html:64
 msgid "Ask Fedora"
 msgstr ""
 
-#: data/templates/footer.html:56
+#: data/templates/footer.html:65
 msgid "Common Bugs"
 msgstr ""
 
-#: data/templates/footer.html:57
+#: data/templates/footer.html:66
 msgid "Fedora Developer Portal"
 msgstr ""
 
-#: data/templates/footer.html:58
+#: data/templates/footer.html:67
 msgid "Installation Guide"
 msgstr ""
 
-#: data/templates/footer.html:64
+#: data/templates/footer.html:73
 msgid "Join"
 msgstr ""
 
-#: data/templates/footer.html:67
+#: data/templates/footer.html:76
 msgid "Join Fedora"
 msgstr ""
 
-#: data/templates/footer.html:68
+#: data/templates/footer.html:77
 msgid "Fedora Community Blog"
 msgstr ""
 
-#: data/templates/footer.html:69
+#: data/templates/footer.html:78
 msgid "Fedora SIGs"
 msgstr ""
 
-#: data/templates/footer.html:70
+#: data/templates/footer.html:79
 msgid "Fedora Account System"
 msgstr ""
 
-#: data/templates/footer.html:71
-msgid "Fedora Community"
-msgstr ""
-
-#: data/templates/footer.html:85
+#: data/templates/footer.html:93
 msgid "Fedora is sponsored by Red Hat."
 msgstr ""
 
-#: data/templates/footer.html:86
+#: data/templates/footer.html:94
 msgid "Learn more about the relationship between Red Hat and Fedora »"
 msgstr ""
 
-#: data/templates/footer.html:87
+#: data/templates/footer.html:95
 #, python-format
 msgid "© %(year)s Red Hat, Inc. and others."
 msgstr ""
 
-#: data/templates/footer.html:87
+#: data/templates/footer.html:95
 msgid ""
-"Please send any comments or corrections to the <a href=\"//pagure.io"
-"/fedora-websites\">websites team</a>."
+"Please send comments or corrections to the <a "
+"href=\"https://discussion.fedoraproject.org/tag/websites-and-apps-"
+"team\">Fedora Websites & Apps Team</a>."
 msgstr ""
 
 #: data/templates/head.html:26