mirrors/catstodon
1
0
Fork 0
mirror of https://git.kescher.at/CatCatNya/catstodon.git synced 2024-11-27 10:31:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adjust naming of public timeline -> "local timeline" vs "whole known network"

Browse source
This commit is contained in:
Eugen Rochko 2017-02-19 21:49:14 +01:00
parent c50256d25c
commit 6b4ef92c6f
5 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/components/containers/mastodon.jsx
View file

@ -117,7 +117,7 @@ const Mastodon = React.createClass({
<Route path='getting-started' component={GettingStarted} /> <Route path='getting-started' component={GettingStarted} />
<Route path='timelines/home' component={HomeTimeline} /> <Route path='timelines/home' component={HomeTimeline} />
<Route path='timelines/public' component={PublicTimeline} /> <Route path='timelines/public' component={PublicTimeline} />
<Route path='timelines/community' component={CommunityTimeline} /> <Route path='timelines/public/local' component={CommunityTimeline} />
<Route path='timelines/tag/:id' component={HashtagTimeline} /> <Route path='timelines/tag/:id' component={HashtagTimeline} />
<Route path='notifications' component={Notifications} /> <Route path='notifications' component={Notifications} />

4
app/assets/javascripts/components/features/community_timeline/index.jsx
View file

@ -12,7 +12,7 @@ import ColumnBackButtonSlim from '../../components/column_back_button_slim';
import createStream from '../../stream'; import createStream from '../../stream';
const messages = defineMessages({ const messages = defineMessages({
title: { id: 'column.community', defaultMessage: 'Public' } title: { id: 'column.community', defaultMessage: 'Local' }
}); });
const mapStateToProps = state => ({ const mapStateToProps = state => ({
@ -63,7 +63,7 @@ const CommunityTimeline = React.createClass({
return ( return (
<Column icon='users' heading={intl.formatMessage(messages.title)}> <Column icon='users' heading={intl.formatMessage(messages.title)}>
<ColumnBackButtonSlim /> <ColumnBackButtonSlim />
<StatusListContainer type='community' emptyMessage={<FormattedMessage id='empty_column.community' defaultMessage='The community timeline is empty. Write something publicly to get the ball rolling!' />} /> <StatusListContainer type='community' emptyMessage={<FormattedMessage id='empty_column.community' defaultMessage='The local timeline is empty. Write something publicly to get the ball rolling!' />} />
</Column> </Column>
); );
}, },

4
app/assets/javascripts/components/features/compose/components/drawer.jsx
View file

@ -3,8 +3,8 @@ import { injectIntl, defineMessages } from 'react-intl';
const messages = defineMessages({ const messages = defineMessages({
start: { id: 'getting_started.heading', defaultMessage: 'Getting started' }, start: { id: 'getting_started.heading', defaultMessage: 'Getting started' },
public: { id: 'navigation_bar.public_timeline', defaultMessage: 'Public timeline' }, public: { id: 'navigation_bar.public_timeline', defaultMessage: 'Whole Known Network' },
community: { id: 'navigation_bar.community_timeline', defaultMessage: 'Community timeline' }, community: { id: 'navigation_bar.community_timeline', defaultMessage: 'Local timeline' },
preferences: { id: 'navigation_bar.preferences', defaultMessage: 'Preferences' }, preferences: { id: 'navigation_bar.preferences', defaultMessage: 'Preferences' },
logout: { id: 'navigation_bar.logout', defaultMessage: 'Logout' } logout: { id: 'navigation_bar.logout', defaultMessage: 'Logout' }
}); });

2
app/assets/javascripts/components/features/getting_started/index.jsx
View file

@ -8,7 +8,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
const messages = defineMessages({ const messages = defineMessages({
heading: { id: 'getting_started.heading', defaultMessage: 'Getting started' }, heading: { id: 'getting_started.heading', defaultMessage: 'Getting started' },
public_timeline: { id: 'navigation_bar.public_timeline', defaultMessage: 'Whole Known Network' }, public_timeline: { id: 'navigation_bar.public_timeline', defaultMessage: 'Whole Known Network' },
community_timeline: { id: 'navigation_bar.community_timeline', defaultMessage: 'Public timeline' }, community_timeline: { id: 'navigation_bar.community_timeline', defaultMessage: 'Local timeline' },
preferences: { id: 'navigation_bar.preferences', defaultMessage: 'Preferences' }, preferences: { id: 'navigation_bar.preferences', defaultMessage: 'Preferences' },
follow_requests: { id: 'navigation_bar.follow_requests', defaultMessage: 'Follow requests' }, follow_requests: { id: 'navigation_bar.follow_requests', defaultMessage: 'Follow requests' },
sign_out: { id: 'navigation_bar.logout', defaultMessage: 'Sign out' }, sign_out: { id: 'navigation_bar.logout', defaultMessage: 'Sign out' },

6
app/assets/javascripts/components/locales/en.jsx
View file

@ -28,13 +28,13 @@ const en = {
"getting_started.about_developer": "The developer of this project can be followed as Gargron@mastodon.social", "getting_started.about_developer": "The developer of this project can be followed as Gargron@mastodon.social",
"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 open source software. You can contribute or report issues on github at {github}.",
"column.home": "Home", "column.home": "Home",
"column.community": "Public", "column.community": "Local",
"column.public": "Whole Known Network", "column.public": "Whole Known Network",
"column.notifications": "Notifications", "column.notifications": "Notifications",
"tabs_bar.compose": "Compose", "tabs_bar.compose": "Compose",
"tabs_bar.home": "Home", "tabs_bar.home": "Home",
"tabs_bar.mentions": "Mentions", "tabs_bar.mentions": "Mentions",
"tabs_bar.public": "Public", "tabs_bar.public": "Whole Known Network",
"tabs_bar.notifications": "Notifications", "tabs_bar.notifications": "Notifications",
"compose_form.placeholder": "What is on your mind?", "compose_form.placeholder": "What is on your mind?",
"compose_form.publish": "Toot", "compose_form.publish": "Toot",
@ -45,7 +45,7 @@ const en = {
"compose_form.unlisted": "Do not display in public timeline", "compose_form.unlisted": "Do not display in public timeline",
"navigation_bar.edit_profile": "Edit profile", "navigation_bar.edit_profile": "Edit profile",
"navigation_bar.preferences": "Preferences", "navigation_bar.preferences": "Preferences",
"navigation_bar.community_timeline": "Public timeline", "navigation_bar.community_timeline": "Local timeline",
"navigation_bar.public_timeline": "Whole Known Network", "navigation_bar.public_timeline": "Whole Known Network",
"navigation_bar.logout": "Logout", "navigation_bar.logout": "Logout",
"reply_indicator.cancel": "Cancel", "reply_indicator.cancel": "Cancel",