Browse Source

Links updated

master
Tuan 1 month ago
parent
commit
61382d8fc0
7 changed files with 15 additions and 14 deletions
  1. +7
    -6
      app/javascript/flavours/glitch/features/ui/components/link_footer.js
  2. +2
    -2
      app/javascript/flavours/glitch/features/ui/components/onboarding_modal.js
  3. +1
    -1
      app/javascript/mastodon/features/ui/components/link_footer.js
  4. +1
    -1
      app/views/about/show.html.haml
  5. +1
    -1
      app/views/home/index.html.haml
  6. +1
    -1
      app/views/layouts/public.html.haml
  7. +2
    -2
      lib/mastodon/version.rb

+ 7
- 6
app/javascript/flavours/glitch/features/ui/components/link_footer.js View File

@@ -48,20 +48,21 @@ class LinkFooter extends React.PureComponent {
{invitesEnabled && <li><a href='/invites' target='_blank'><FormattedMessage id='getting_started.invite' defaultMessage='Invite people' /></a> · </li>}
{!!securityLink && <li><a href='/auth/edit'><FormattedMessage id='getting_started.security' defaultMessage='Security' /></a> · </li>}
<li><a href='/about/more' target='_blank'><FormattedMessage id='navigation_bar.info' defaultMessage='About this server' /></a> · </li>
<li><a href='https://joinmastodon.org/apps' target='_blank'><FormattedMessage id='navigation_bar.apps' defaultMessage='Mobile apps' /></a> · </li>
<li><a href='/apps/index.html' 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='/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={signOutLink} onClick={this.handleLogoutClick}><FormattedMessage id='navigation_bar.logout' defaultMessage='Logout' /></a></li>
</ul>

<p>
<FormattedMessage
id='getting_started.open_source_notice'
defaultMessage='Metu.Life is open source software forked from {Mastodon}. You can contribute or report issues on GitHub at {github}.'
defaultMessage='Metu.Life is a free as in freedom software forked from {Mastodon}. View our {github}. You can donate at {patreon} to support us.'
values={{
github: <span><a href='https://github.com/glitch-soc/mastodon' rel='noopener noreferrer' target='_blank'>glitch-soc/mastodon</a> (v{version})</span>,
Mastodon: <a href='https://github.com/tootsuite/mastodon' rel='noopener noreferrer' target='_blank'>Mastodon</a> }}
github: <span><a href='https://git.oyd.org.tr/MetuFSS/metu.life' rel='noopener noreferrer' target='_blank'>source code</a> (v{version})</span>,
Mastodon: <a href='https://github.com/glitch-soc/mastodon' rel='noopener noreferrer' target='_blank'>glitch-soc/mastodon</a>,
patreon: <a href='https://patreon.com/MetuLife' rel='noopener noreferrer' target='_blank'>Patreon</a> }}
/>
</p>
</div>


+ 2
- 2
app/javascript/flavours/glitch/features/ui/components/onboarding_modal.js View File

@@ -141,8 +141,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><FormattedMessage id='onboarding.page_six.github' defaultMessage='{domain} is a free as in freedom software, running {fork} of {Mastodon}. View our {github}. You can donate at {patreon} to support us.' 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/glitch-soc/mastodon' target='_blank' rel='noopener'>glitch-soc/mastodon</a>, github: <a href='https://git.oyd.org.tr/MetuFSS/metu.life' target='_blank' rel='noopener'>source code</a>, patreon: <a href='https://patreon.com/MetuLife' target='_blank' rel='noopener'>Patreon</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='/apps/index.html' 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>
</div>
);


+ 1
- 1
app/javascript/mastodon/features/ui/components/link_footer.js View File

@@ -51,7 +51,7 @@ class LinkFooter extends React.PureComponent {
{withHotkeys && <li><Link to='/keyboard-shortcuts'><FormattedMessage id='navigation_bar.keyboard_shortcuts' defaultMessage='Hotkeys' /></Link> · </li>}
<li><a href='/auth/edit'><FormattedMessage id='getting_started.security' defaultMessage='Security' /></a> · </li>
<li><a href='/about/more' target='_blank'><FormattedMessage id='navigation_bar.info' defaultMessage='About this server' /></a> · </li>
<li><a href='https://joinmastodon.org/apps' target='_blank'><FormattedMessage id='navigation_bar.apps' defaultMessage='Mobile apps' /></a> · </li>
<li><a href='/apps/index.html' 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>


+ 1
- 1
app/views/about/show.html.haml View File

@@ -38,7 +38,7 @@
%small= t('about.browse_public_posts')

.directory__tag
= link_to 'https://joinmastodon.org/apps', target: '_blank', rel: 'noopener noreferrer' do
= link_to '/apps/index.html', target: '_blank', rel: 'noopener noreferrer' do
%h4
= fa_icon 'tablet fw'
= t('about.get_apps')


+ 1
- 1
app/views/home/index.html.haml View File

@@ -12,4 +12,4 @@
= image_pack_tag 'logo.svg', alt: 'Mastodon'

%div
= t('errors.noscript_html', apps_path: 'https://joinmastodon.org/apps')
= t('errors.noscript_html', apps_path: '/apps/index.html')

+ 1
- 1
app/views/layouts/public.html.haml View File

@@ -51,6 +51,6 @@
%h4= t 'footer.more'
%ul
%li= link_to t('about.source_code'), Mastodon::Version.source_url
%li= link_to t('about.apps'), 'https://joinmastodon.org/apps'
%li= link_to t('about.apps'), 'https://metu.life/apps/index.html'

= render template: 'layouts/application'

+ 2
- 2
lib/mastodon/version.rb View File

@@ -33,11 +33,11 @@ module Mastodon
end

def repository
ENV.fetch('GITHUB_REPOSITORY', 'glitch-soc/mastodon')
ENV.fetch('GITHUB_REPOSITORY', 'source code')
end

def source_base_url
ENV.fetch('SOURCE_BASE_URL', "https://github.com/#{repository}")
ENV.fetch('SOURCE_BASE_URL', "https://git.oyd.org.tr/MetuFSS/metu.life")
end

# specify git tag or commit hash here


Loading…
Cancel
Save