CloudToys/puyopuyotetr.is
1
0
Fork 0
Code

Change “Toots with replies” to “Toots and replies” (#6875)

Browse Source 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
This commit is contained in:
Marcin Mikołajczak 2018-03-24 12:51:51 +01:00 committed by Eugen Rochko
parent b2a4ffd3a9
commit 1c15329cce
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/mastodon/features/account_timeline/components/header.js
View File

@ -99,7 +99,7 @@ export default class Header extends ImmutablePureComponent {
{!hideTabs && ( {!hideTabs && (
<div className='account__section-headline'> <div className='account__section-headline'>
<NavLink exact to={`/accounts/${account.get('id')}`}><FormattedMessage id='account.posts' defaultMessage='Toots' /></NavLink> <NavLink exact to={`/accounts/${account.get('id')}`}><FormattedMessage id='account.posts' defaultMessage='Toots' /></NavLink>
<NavLink exact to={`/accounts/${account.get('id')}/with_replies`}><FormattedMessage id='account.posts_with_replies' defaultMessage='Toots with replies' /></NavLink> <NavLink exact to={`/accounts/${account.get('id')}/with_replies`}><FormattedMessage id='account.posts_with_replies' defaultMessage='Toots and replies' /></NavLink>
<NavLink exact to={`/accounts/${account.get('id')}/media`}><FormattedMessage id='account.media' defaultMessage='Media' /></NavLink> <NavLink exact to={`/accounts/${account.get('id')}/media`}><FormattedMessage id='account.media' defaultMessage='Media' /></NavLink>
</div> </div>
)} )}

4
app/javascript/mastodon/locales/defaultMessages.json
View File

@ -326,7 +326,7 @@
"id": "account.posts" "id": "account.posts"
}, },
{ {
"defaultMessage": "Toots with replies", "defaultMessage": "Toots and replies",
"id": "account.posts_with_replies" "id": "account.posts_with_replies"
}, },
{ {
@ -1748,4 +1748,4 @@
], ],
"path": "app/javascript/mastodon/middleware/errors.json" "path": "app/javascript/mastodon/middleware/errors.json"
} }
] ]

2
app/javascript/mastodon/locales/en.json
View File

@ -17,7 +17,7 @@
"account.mute_notifications": "Mute notifications from @{name}", "account.mute_notifications": "Mute notifications from @{name}",
"account.muted": "Muted", "account.muted": "Muted",
"account.posts": "Toots", "account.posts": "Toots",
"account.posts_with_replies": "Toots with replies", "account.posts_with_replies": "Toots and replies",
"account.report": "Report @{name}", "account.report": "Report @{name}",
"account.requested": "Awaiting approval. Click to cancel follow request", "account.requested": "Awaiting approval. Click to cancel follow request",
"account.share": "Share @{name}'s profile", "account.share": "Share @{name}'s profile",