Generalize some language

This commit is contained in:
Alex Gleason 2022-03-21 13:33:10 -05:00
parent 5cd894ab02
commit 83137498d9
No known key found for this signature in database
GPG key ID: 7211D1F99744FBB7
7 changed files with 14 additions and 9 deletions

View file

@ -47,7 +47,7 @@ export const makeDefaultConfig = features => {
}),
extensions: ImmutableMap(),
defaultSettings: ImmutableMap(),
copyright: `©${year} TRUTH Social`,
copyright: `${year}. Copying is an act of love. Please copy and share.`,
navlinks: ImmutableMap({
homeFooter: ImmutableList(),
}),

View file

@ -14,6 +14,7 @@ const mapStateToProps = (state) => {
const soapboxConfig = getSoapboxConfig(state);
return {
siteTitle: state.instance.title,
helpLink: soapboxConfig.getIn(['links', 'help']),
supportLink: soapboxConfig.getIn(['links', 'support']),
statusLink: soapboxConfig.getIn(['links', 'status']),
@ -25,6 +26,7 @@ class ErrorBoundary extends React.PureComponent {
static propTypes = {
children: PropTypes.node,
siteTitle: PropTypes.string,
supportLink: PropTypes.string,
helpLink: PropTypes.string,
statusLink: PropTypes.string,
@ -78,7 +80,7 @@ class ErrorBoundary extends React.PureComponent {
render() {
const { browser, hasError } = this.state;
const { children, helpLink, statusLink, supportLink } = this.props;
const { children, siteTitle, helpLink, statusLink, supportLink } = this.props;
if (!hasError) {
return children;
@ -93,7 +95,7 @@ class ErrorBoundary extends React.PureComponent {
<main className='flex-grow flex flex-col justify-center max-w-7xl w-full mx-auto px-4 sm:px-6 lg:px-8'>
<div className='flex-shrink-0 flex justify-center'>
<a href='/' className='inline-flex'>
<img className='h-12 w-12' src='/instance/images/app-icon.png' alt='Truth Social' />
<img className='h-12 w-12' src='/instance/images/app-icon.png' alt={siteTitle} />
</a>
</div>

View file

@ -22,7 +22,7 @@ const mapStateToProps = state => {
const settings = getSettings(state);
return {
siteTitle: state.getIn(['instance', 'title'], 'Truth Social'),
siteTitle: state.getIn(['instance', 'title']),
unreadCount: getNotifTotals(state),
demetricator: settings.get('demetricator'),
};

View file

@ -20,7 +20,7 @@ export default class FollowRecommendationsContainer extends React.Component {
return (
<div className='scrollable follow-recommendations-container'>
<div className='column-title'>
<h3><FormattedMessage id='follow_recommendations.heading' defaultMessage='Welcome to TRUTH Social' />&nbsp;<span className='follow_heading'>(Beta)</span></h3>
<h3><FormattedMessage id='follow_recommendations.heading' defaultMessage="Follow people you'd like to see posts from! Here are some suggestions." /></h3>
<h2 className='follow_subhead'><FormattedMessage id='follow_recommendation.subhead' defaultMessage='Let&#39;s get started!' /></h2>
<p><FormattedMessage id='follow_recommendations.lead' defaultMessage='Don&#39;t be afraid to make mistakes; you can unfollow people at any time.' /></p>
</div>

View file

@ -3,6 +3,7 @@ import { defineMessages, useIntl } from 'react-intl';
import { Link } from 'react-router-dom';
import { IconButton } from 'soapbox/components/ui';
import { useAppSelector } from 'soapbox/hooks';
const messages = defineMessages({
close: { id: 'pre_header.close', defaultMessage: 'Close' },
@ -12,6 +13,7 @@ export default () => {
const intl = useIntl();
const [hidden, setHidden] = React.useState(false);
const siteTitle = useAppSelector((state) => state.instance.title);
const handleClose = () => {
localStorage.setItem('soapbox:welcome-banner', '0');
@ -33,7 +35,7 @@ export default () => {
<div className='max-w-7xl flex justify-between mx-auto px-2 sm:px-6 lg:px-8'>
<div className='h-14 flex items-center space-x-3'>
<p className='text-white font-semibold'>
<span>Welcome to TRUTH Social</span>
<span>Welcome to {siteTitle}</span>
</p>
<Link className='text-sea-blue text-sm lowercase hover:underline' to='/beta'>

View file

@ -21,6 +21,7 @@ const Registration = () => {
const intl = useIntl();
const isLoading = useSelector((state) => state.getIn(['verification', 'isLoading']));
const siteTitle = useSelector((state) => state.instance.title);
const [state, setState] = React.useState(initialState);
const [shouldRedirect, setShouldRedirect] = React.useState(false);
@ -41,8 +42,8 @@ const Registration = () => {
snackbar.success(
intl.formatMessage({
id: 'registrations.success',
defaultMessage: 'Welcome to Truth Social!',
}),
defaultMessage: 'Welcome to {siteTitle}!',
}, { siteTitle }),
),
);
})

View file

@ -440,7 +440,7 @@
"filters.removed": "Filter deleted.",
"follow_recommendations.done": "Done",
"follow_recommendations.heading": "Follow people you'd like to see posts from! Here are some suggestions.",
"follow_recommendations.lead": "Posts from people you follow will show up in chronological order on your home feed. Don't be afraid to make mistakes, you can unfollow people just as easily any time!",
"follow_recommendations.lead": "Dont be afraid to make mistakes; you can unfollow people at any time.",
"follow_request.authorize": "Authorize",
"follow_request.reject": "Reject",
"follow_recommendations.heading": "Who To Follow",