diff options
| author | mayaeh <mayaeh@marimo-net.org> | 2018-12-01 03:36:09 +0900 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2018-11-30 19:36:09 +0100 |
| commit | bfec030a4e3be37e4986d7ec5cb1bda968ba549a (patch) | |
| tree | d01358efbbf803da6262383f76e22d3e771a14a4 /app | |
| parent | 3948b6fa523dc5ebc8cde32b4b8d6a055788f8fb (diff) | |
Fix that translation is not applied to "joining hashtags" (#9397)
Diffstat (limited to 'app')
| -rw-r--r-- | app/javascript/mastodon/features/hashtag_timeline/index.js | 6 | ||||
| -rw-r--r-- | app/javascript/mastodon/locales/en.json | 6 | ||||
| -rw-r--r-- | app/javascript/mastodon/locales/ja.json | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/app/javascript/mastodon/features/hashtag_timeline/index.js b/app/javascript/mastodon/features/hashtag_timeline/index.js index d7722dcce..c2e026d13 100644 --- a/app/javascript/mastodon/features/hashtag_timeline/index.js +++ b/app/javascript/mastodon/features/hashtag_timeline/index.js @@ -42,13 +42,13 @@ class HashtagTimeline extends React.PureComponent { title = () => { let title = [this.props.params.id]; if (this.additionalFor('any')) { - title.push(<FormattedMessage id='hashtag.column_header.tag_mode.any' values={{ additional: this.additionalFor('any') }} defaultMessage=' or {additional}' />); + title.push(' ', <FormattedMessage id='hashtag.column_header.tag_mode.any' values={{ additional: this.additionalFor('any') }} defaultMessage='or {additional}' />); } if (this.additionalFor('all')) { - title.push(<FormattedMessage id='hashtag.column_header.tag_mode.all' values={{ additional: this.additionalFor('all') }} defaultMessage=' and {additional}' />); + title.push(' ', <FormattedMessage id='hashtag.column_header.tag_mode.all' values={{ additional: this.additionalFor('all') }} defaultMessage='and {additional}' />); } if (this.additionalFor('none')) { - title.push(<FormattedMessage id='hashtag.column_header.tag_mode.none' values={{ additional: this.additionalFor('none') }} defaultMessage=' without {additional}' />); + title.push(' ', <FormattedMessage id='hashtag.column_header.tag_mode.none' values={{ additional: this.additionalFor('none') }} defaultMessage='without {additional}' />); } return title; } diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json index a85d03455..b39e321f2 100644 --- a/app/javascript/mastodon/locales/en.json +++ b/app/javascript/mastodon/locales/en.json @@ -138,9 +138,9 @@ "getting_started.open_source_notice": "Mastodon is open source software. You can contribute or report issues on GitHub at {github}.", "getting_started.security": "Security", "getting_started.terms": "Terms of service", - "hashtag.column_header.tag_mode.all": "{tag} and {additional}", - "hashtag.column_header.tag_mode.any": "{tag} or {additional}", - "hashtag.column_header.tag_mode.none": "{tag} without {additional}", + "hashtag.column_header.tag_mode.all": "and {additional}", + "hashtag.column_header.tag_mode.any": "or {additional}", + "hashtag.column_header.tag_mode.none": "without {additional}", "hashtag.column_settings.tag_mode.all": "All of these", "hashtag.column_settings.tag_mode.any": "Any of these", "hashtag.column_settings.tag_mode.none": "None of these", diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json index c830000a1..dd8e4a54e 100644 --- a/app/javascript/mastodon/locales/ja.json +++ b/app/javascript/mastodon/locales/ja.json @@ -138,9 +138,9 @@ "getting_started.open_source_notice": "Mastodonはオープンソースソフトウェアです。誰でもGitHub（{github}）から開発に参加したり、問題を報告したりできます。", "getting_started.security": "セキュリティ", "getting_started.terms": "プライバシーポリシー", - "hashtag.column_header.tag_mode.all": " と {additional}", - "hashtag.column_header.tag_mode.any": " か {additional}", - "hashtag.column_header.tag_mode.none": " ({additional} を除く)", + "hashtag.column_header.tag_mode.all": "と {additional}", + "hashtag.column_header.tag_mode.any": "か {additional}", + "hashtag.column_header.tag_mode.none": "({additional} を除く)", "hashtag.column_settings.tag_mode.all": "すべてを含む", "hashtag.column_settings.tag_mode.any": "いずれかを含む", "hashtag.column_settings.tag_mode.none": "これらを除く", |