logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: e3cc42e42fb52c90ace190c4ea7713d6c36020ea
parent: c863cd3dee3b567317e6058e51495f240e251076
Author: Morgan Bazalgette <the@howl.moe>
Date:   Fri, 30 Mar 2018 00:41:42 +0200

Change mastodon info

Diffstat:

Mapp/javascript/mastodon/features/getting_started/index.js9+--------
Mapp/javascript/mastodon/locales/defaultMessages.json2+-
Mapp/javascript/mastodon/locales/en.json2+-
Mapp/javascript/mastodon/locales/th.json1-
4 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/app/javascript/mastodon/features/getting_started/index.js b/app/javascript/mastodon/features/getting_started/index.js @@ -127,14 +127,7 @@ export default class GettingStarted extends ImmutablePureComponent { <div className='static-content getting-started'> <p> - <a href='https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/FAQ.md' rel='noopener' target='_blank'><FormattedMessage id='getting_started.faq' defaultMessage='FAQ' /></a> • <a href='https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/User-guide.md' rel='noopener' target='_blank'><FormattedMessage id='getting_started.userguide' defaultMessage='User Guide' /></a> • <a href='https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/Apps.md' rel='noopener' target='_blank'><FormattedMessage id='getting_started.appsshort' defaultMessage='Apps' /></a> - </p> - <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: <a href='https://github.com/tootsuite/mastodon' rel='noopener' target='_blank'>tootsuite/mastodon</a> }} - /> + <a href='https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/FAQ.md' rel='noopener' target='_blank'><FormattedMessage id='getting_started.faq' defaultMessage='FAQ' /></a> • <a href='https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/User-guide.md' rel='noopener' target='_blank'><FormattedMessage id='getting_started.userguide' defaultMessage='User Guide' /></a> • <a href='https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/Apps.md' rel='noopener' target='_blank'><FormattedMessage id='getting_started.appsshort' defaultMessage='Apps' /></a> • <a href='https://git.pleroma.social/pleroma/pleroma'><FormattedMessage id='getting_started.pleroma' defaultMessage='Pleroma' /></a> </p> </div> </Column> diff --git a/app/javascript/mastodon/locales/defaultMessages.json b/app/javascript/mastodon/locales/defaultMessages.json @@ -963,7 +963,7 @@ "id": "getting_started.appsshort" }, { - "defaultMessage": "Mastodon is open source software. You can contribute or report issues on GitHub at {github}.", + "defaultMessage": "Pleroma is free and open source software. You can find out more on GitLab: {github}.", "id": "getting_started.open_source_notice" } ], diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json @@ -110,7 +110,7 @@ "getting_started.appsshort": "Apps", "getting_started.faq": "FAQ", "getting_started.heading": "Getting started", - "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": "Pleroma is free and open source software. You can find out more on GitLab: {github}.", "getting_started.userguide": "User Guide", "home.column_settings.advanced": "Advanced", "home.column_settings.basic": "Basic", diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json @@ -110,7 +110,6 @@ "getting_started.appsshort": "Apps", "getting_started.faq": "FAQ", "getting_started.heading": "Getting started", - "getting_started.open_source_notice": "Mastodon is open source software. You can contribute or report issues on GitHub at {github}.", "getting_started.userguide": "User Guide", "home.column_settings.advanced": "Advanced", "home.column_settings.basic": "Basic",