From b8c624b673c255560baeb53f4abe997f790d32fd Mon Sep 17 00:00:00 2001
From: Darius Kazemi <darius@meedan.com>
Date: Thu, 1 Dec 2022 19:36:42 -0800
Subject: [PATCH] Fix references to Mastodon in footer

We now link the Hometown documentation, and list Hometown first as the place to report issues.

Fixes #1206
---
 .../features/ui/components/link_footer.js        | 16 +++++++++-------
 app/javascript/mastodon/locales/en.json          |  4 ++--
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/app/javascript/mastodon/features/ui/components/link_footer.js b/app/javascript/mastodon/features/ui/components/link_footer.js
index 5367d11ca..ee85197a2 100644
--- a/app/javascript/mastodon/features/ui/components/link_footer.js
+++ b/app/javascript/mastodon/features/ui/components/link_footer.js
@@ -56,22 +56,24 @@ class LinkFooter extends React.PureComponent {
           <li><a href='https://joinmastodon.org/apps' target='_blank'><FormattedMessage id='navigation_bar.apps' defaultMessage='Mobile apps' /></a> · </li>
           <li><a href='/terms' target='_blank'><FormattedMessage id='getting_started.terms' defaultMessage='Terms of service' /></a> · </li>
           <li><a href='/settings/applications' target='_blank'><FormattedMessage id='getting_started.developers' defaultMessage='Developers' /></a> · </li>
-          <li><a href='https://docs.joinmastodon.org' target='_blank'><FormattedMessage id='getting_started.documentation' defaultMessage='Documentation' /></a> · </li>
+          <li><a href='https://github.com/hometown-fork/hometown/wiki' target='_blank'><FormattedMessage id='getting_started.documentation' defaultMessage='Documentation' /></a> · </li>
           <li><a href='/auth/sign_out' onClick={this.handleLogoutClick}><FormattedMessage id='navigation_bar.logout' defaultMessage='Logout' /></a></li>
         </ul>
 
         <p>
-          <FormattedMessage
-            id='getting_started.open_source_notice'
-            defaultMessage='Mastodon is open source software. You can contribute or report issues on GitHub at {github}.'
-            values={{ github: <span><a href={source_url} rel='noopener noreferrer' target='_blank'>{repository}</a> (v{version})</span> }}
-          />
           <FormattedMessage
             id='getting_started.hometown_open_source_notice'
-            defaultMessage='Hometown is also open source, at {hometown}.'
+            defaultMessage='Hometown is open source software. You can contribute or report issues on Github at {hometown}.'
             values={{ hometown: <span><a href='https://github.com/hometown-fork/hometown' rel='noopener' target='_blank'>hometown-fork/hometown</a></span> }}
           />
         </p>
+        <p>
+          <FormattedMessage
+            id='getting_started.open_source_notice'
+            defaultMessage='Mastodon is also open source software, available at {github}.'
+            values={{ github: <span><a href={source_url} rel='noopener noreferrer' target='_blank'>{repository}</a> (v{version})</span> }}
+          />
+        </p>
       </div>
     );
   }
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index d39931dd4..3cbea9e48 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -212,9 +212,9 @@
   "getting_started.directory": "Profile directory",
   "getting_started.documentation": "Documentation",
   "getting_started.heading": "Getting started",
-  "getting_started.hometown_open_source_notice": "Hometown is also open source, at {hometown}.",
+  "getting_started.hometown_open_source_notice": "Hometown is open source software. You can contribute or report issues on GitHub at {hometown}.",
   "getting_started.invite": "Invite people",
-  "getting_started.open_source_notice": "Mastodon is open source software. You can contribute or report issues on GitHub at {github}.",
+  "getting_started.open_source_notice": "Mastodon is also open source, and is available at {github}.",
   "getting_started.security": "Account settings",
   "getting_started.terms": "Terms of service",
   "hashtag.column_header.tag_mode.all": "and {additional}",