Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Japanese translation (and English translation file) for JavaScript #2538

Merged
merged 2 commits into from
Apr 27, 2017

Conversation

unarist
Copy link
Contributor

@unarist unarist commented Apr 27, 2017

en.jsx:

ja.jsx:

  • Add missing translation
    • I translated "locked (account)" to "非公開(アカウント)" according to existent translation now, but I think this translation is not correct. Twitter's Protected account hides user timeline, but Mastodon's locked account does not. It only means 1) following restriction 2) "follower-only" default IIRC, so it shouldn't be called "非公開" I think.
    • I left "Bon Appetoot!" as it is because I don't know good translation for it (and it isn't English).

@@ -25,7 +25,6 @@ const en = {
"account.unfollow": "Unfollow",
"account.unmute": "Unmute @{name}",
"boost_modal.combo": "You can press {combo} to skip this next time",
"column_back_button.label": "Back",
Copy link
Sponsor Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why delete?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is duplicate of L37.

Copy link
Sponsor Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok. Duplicate with line 37

@@ -94,7 +94,6 @@ const en = {
"navigation_bar.public_timeline": "Federated timeline",
"notification.favourite": "{name} favourited your status",
"notification.follow": "{name} followed you",
"notification.mention": "{name} mentioned you",
Copy link
Sponsor Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why delete?

Copy link
Sponsor Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you do not use it anymore, if you do not need it, delete it in other languages.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Other notification.* strings are used in app/assets/javascripts/components/features/notifications/components/notification.jsx, but notification.mention is not used. Also I can't found use case in app/assets/javascripts/**.jsx.

However, I also cannot found use case in the tree at the time this line introduced (#1867), so it may be used in other places. How do you think @Gargron?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

notification.mention is used in actions/notifications.jsx for desktop notifications

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

new IntlMessageFormat(intlMessages[`notification.${notification.type}`], intlLocale)

Ah, I see. I will revert this line. Thanks!

@@ -109,6 +114,7 @@ const ja = {
"onboarding.page_six.github": "MastodonはOSSです。バグ報告や機能要望あるいは貢献を{github}から行なえます。",
"onboarding.page_six.apps_available": "iOS、Androidあるいは他のプラットフォームで使える{apps}があります。",
"onboarding.page_six.various_app": "様々なモバイルアプリ",
"onboarding.page_six.appetoot": "Bon Appetoot!",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This can be translated as "good luck!" or "enjoy!"

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, I wanted to keep essence of "toot", but...hmm.

Copy link
Sponsor Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that "ボナペトゥート!" is good.

@Gargron Gargron merged commit ebbbcfe into mastodon:master Apr 27, 2017
seefood pushed a commit to Toootim/mastodon that referenced this pull request Apr 28, 2017
…ript (mastodon#2538)

* Update English translation file for JavaScript

* Update Japanese translation for JavaScript
@unarist unarist deleted the fix-ja branch May 27, 2017 05:16
ClearlyClaire added a commit to ClearlyClaire/mastodon that referenced this pull request Dec 22, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants