Merge branch 'bugfix/links-to-pleromafe' into rebase/glitch-soc

app/javascript/flavours/glitch/features/getting_started_misc/index.js

@@ -59,7 +59,6 @@ class gettingStartedMisc extends ImmutablePureComponent {
           <ColumnLink key='{i++}' icon='ban' text={intl.formatMessage(messages.blocks)} to='/blocks' />
           <ColumnLink key='{i++}' icon='minus-circle' text={intl.formatMessage(messages.domain_blocks)} to='/domain_blocks' />
           <ColumnLink key='{i++}' icon='question' text={intl.formatMessage(messages.keyboard_shortcuts)} to='/keyboard-shortcuts' />
-          <ColumnLink key='{i++}' icon='book' text={intl.formatMessage(messages.info)} href='/about/more' />
           <ColumnLink key='{i++}' icon='hand-o-right' text={intl.formatMessage(messages.show_me_around)} onClick={this.openOnboardingModal} />
         </div>
       </Column>

app/javascript/flavours/glitch/features/ui/components/onboarding_modal.js

@@ -29,8 +29,8 @@ const PageOne = ({ acct, domain }) => (
 
     <div>
       <h1><FormattedMessage id='onboarding.page_one.welcome' defaultMessage='Welcome to {domain}!' values={{ domain }} /></h1>
-      <p><FormattedMessage id='onboarding.page_one.federation' defaultMessage='{domain} is an "instance" of Mastodon. Mastodon is a network of independent servers joining up to make one larger social network. We call these servers instances.' values={{ domain }} /></p>
       <p><FormattedMessage id='onboarding.page_one.handle' defaultMessage='You are on {domain}, so your full handle is {handle}' values={{ domain, handle: <strong>@{acct}@{domain}</strong> }} /></p>
+      <p><FormattedMessage id='onboarding.page_one.fediverse' defaultMessage='{domain} is a Fediverse node, running Pleroma. The Fediverse is decentralized federated network made of many independent nodes, like email.' values={{ domain, handle: <strong>{acct}@{domain}</strong> }} /></p>
     </div>
   </div>
 );
@@ -131,8 +131,6 @@ const PageSix = ({ admin, domain }) => {
     adminSection = (
       <p>
         <FormattedMessage id='onboarding.page_six.admin' defaultMessage="Your instance's admin is {admin}." values={{ admin: <Permalink href={admin.get('url')} to={`/accounts/${admin.get('id')}`}>@{admin.get('acct')}</Permalink> }} />
-        <br />
-        <FormattedMessage id='onboarding.page_six.read_guidelines' defaultMessage="Please read {domain}'s {guidelines}!" values={{ domain, guidelines: <a href='/about/more' target='_blank'><FormattedMessage id='onboarding.page_six.guidelines' defaultMessage='community guidelines' /></a> }} />
       </p>
     );
   }
@@ -141,9 +139,8 @@ const PageSix = ({ admin, domain }) => {
     <div className='onboarding-modal__page onboarding-modal__page-six'>
       <h1><FormattedMessage id='onboarding.page_six.almost_done' defaultMessage='Almost done...' /></h1>
       {adminSection}
-      <p><FormattedMessage id='onboarding.page_six.github' defaultMessage='{domain} runs on Glitchsoc. Glitchsoc is a friendly {fork} of {Mastodon}. Glitchsoc is fully compatible with all Mastodon apps and instances. Glitchsoc is free open-source software. You can report bugs, request features, or contribute to the code on {github}.' values={{ domain, fork: <a href='https://en.wikipedia.org/wiki/Fork_(software_development)' target='_blank' rel='noopener'>fork</a>, Mastodon: <a href='https://github.com/tootsuite/mastodon' target='_blank' rel='noopener'>Mastodon</a>, github: <a href='https://github.com/glitch-soc/mastodon' target='_blank' rel='noopener'>GitHub</a> }} /></p>
-      <p><FormattedMessage id='onboarding.page_six.apps_available' defaultMessage='There are {apps} available for iOS, Android and other platforms.' values={{ domain, apps: <a href='https://joinmastodon.org/apps' target='_blank' rel='noopener'><FormattedMessage id='onboarding.page_six.various_app' defaultMessage='mobile apps' /></a> }} /></p>
-      <p><em><FormattedMessage id='onboarding.page_six.appetoot' defaultMessage='Bon Appetoot!' /></em></p>
+      <p><FormattedMessage id='onboarding.page_six.github' defaultMessage='{domain} runs on Pleroma. Pleroma is a free, federated social networking server built on open protocols. It is compatible with GNU Social, Mastodon, and many other ActivityPub implementations. You can report bugs, request features, or contribute to the code on {gitlab}.' values={{ domain, gitlab: <a href='https://git.pleroma.social/pleroma/' target='_blank' rel='noopener'>Pleroma's Gitlab</a> }} /></p>
+      <p><FormattedMessage id='onboarding.page_six.apps_available' defaultMessage='There are {apps} available for iOS, Android, SailfishOS and other platforms.' values={{ domain, apps: <a href='https://docs.pleroma.social/backend/clients/' target='_blank' rel='noopener'><FormattedMessage id='onboarding.page_six.various_app' defaultMessage='mobile apps' /></a> }} /></p>
     </div>
   );
 };

app/javascript/flavours/glitch/util/backend_links.js

-export const preferencesLink = '/settings';
-export const profileLink = '/user-settings';
-export const signOutLink = '/auth/sign_out';
-export const termsLink = '/terms';
+export const preferencesLink = undefined; // '/settings/preferences';
+export const profileLink = undefined; // '/settings/profile';
+export const signOutLink = undefined; // '/auth/sign_out';
+export const termsLink = undefined; // '/terms';
 export const accountAdminLink = (id) => `/pleroma/admin/#/users/${id}/`;
 export const statusAdminLink = (account_id, status_id) => `/pleroma/admin/#/users/${account_id}/`;
 export const filterEditLink = undefined; // (id) => `/filters/${id}/edit`;