commit: faefd8ec8f164e174fd887f06d01c7fe8ed05531
parent: 96715d9af5a95d75b244efc67c6870325c2b322d
Author: Koala Yeung <koalay@gmail.com>
Date: Thu, 13 Apr 2017 18:57:41 +0800
Update javascript English translation files and some defaultValue (#1676)
* Reorder javascript English locale file
* Reorder translation string in order of the locale key.
* Add javascript English locale missing language keys
* Search all javascript language keys by command:
`grep -REho '<FormattedMessage .*\/>' ./app/assets/javascripts/.`
* Add all the missing language keys and their values to `en.jsx`.
* Add javascript English locale missing language keys (2)
* Find all `defineMessages` calls with this command:
`grep -Rl 'defineMessages({.*' ./app/assets/javascripts/.`
* Open all these files. Find the language key (`id`) in these
statements.
* Add all the missing language keys and their values to `en.jsx`.
* Remove javascript English locale obsoleted language keys
* Find all language keys that no longer exists in the source code
and remove them. The removed keys include:
* "compose_form.private"
* "compose_form.unlisted"
* "getting_started.about_addressing"
* "getting_started.about_shortcuts"
* "notification.mention"
* "search.account"
* "search.hashtag"
* "tabs_bar.mentions"
* "tabs_bar.public"
* Javascript English locale file add note
* Add notes to contributors about the English translation files.
Hope that will make translation process smoother.
* Update javascript locale defaultValue in code
* Update the defaultValue in code according to the relevant
translation in English locale file.
Diffstat:
6 files changed, 111 insertions(+), 54 deletions(-)
diff --git a/app/assets/javascripts/components/features/community_timeline/index.jsx b/app/assets/javascripts/components/features/community_timeline/index.jsx
@@ -14,7 +14,7 @@ import ColumnBackButtonSlim from '../../components/column_back_button_slim';
import createStream from '../../stream';
const messages = defineMessages({
- title: { id: 'column.community', defaultMessage: 'Local' }
+ title: { id: 'column.community', defaultMessage: 'Local timeline' }
});
const mapStateToProps = state => ({
diff --git a/app/assets/javascripts/components/features/compose/components/compose_form.jsx b/app/assets/javascripts/components/features/compose/components/compose_form.jsx
@@ -19,7 +19,7 @@ import TextIconButton from './text_icon_button';
const messages = defineMessages({
placeholder: { id: 'compose_form.placeholder', defaultMessage: 'What is on your mind?' },
spoiler_placeholder: { id: 'compose_form.spoiler_placeholder', defaultMessage: 'Content warning' },
- publish: { id: 'compose_form.publish', defaultMessage: 'Publish' }
+ publish: { id: 'compose_form.publish', defaultMessage: 'Toot' }
});
const ComposeForm = React.createClass({
diff --git a/app/assets/javascripts/components/features/compose/index.jsx b/app/assets/javascripts/components/features/compose/index.jsx
@@ -12,7 +12,7 @@ import SearchResultsContainer from './containers/search_results_container';
const messages = defineMessages({
start: { id: 'getting_started.heading', defaultMessage: 'Getting started' },
- public: { id: 'navigation_bar.public_timeline', defaultMessage: 'Whole Known Network' },
+ public: { id: 'navigation_bar.public_timeline', defaultMessage: 'Federated timeline' },
community: { id: 'navigation_bar.community_timeline', defaultMessage: 'Local timeline' },
preferences: { id: 'navigation_bar.preferences', defaultMessage: 'Preferences' },
logout: { id: 'navigation_bar.logout', defaultMessage: 'Logout' }
diff --git a/app/assets/javascripts/components/features/getting_started/index.jsx b/app/assets/javascripts/components/features/getting_started/index.jsx
@@ -7,11 +7,11 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
const messages = defineMessages({
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: 'Federated timeline' },
community_timeline: { id: 'navigation_bar.community_timeline', defaultMessage: 'Local timeline' },
preferences: { id: 'navigation_bar.preferences', defaultMessage: 'Preferences' },
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: 'Logout' },
favourites: { id: 'navigation_bar.favourites', defaultMessage: 'Favourites' },
blocks: { id: 'navigation_bar.blocks', defaultMessage: 'Blocked users' },
info: { id: 'navigation_bar.info', defaultMessage: 'Extended information' }
diff --git a/app/assets/javascripts/components/features/public_timeline/index.jsx b/app/assets/javascripts/components/features/public_timeline/index.jsx
@@ -14,7 +14,7 @@ import ColumnBackButtonSlim from '../../components/column_back_button_slim';
import createStream from '../../stream';
const messages = defineMessages({
- title: { id: 'column.public', defaultMessage: 'Whole Known Network' }
+ title: { id: 'column.public', defaultMessage: 'Federated timeline' }
});
const mapStateToProps = state => ({
diff --git a/app/assets/javascripts/components/locales/en.jsx b/app/assets/javascripts/components/locales/en.jsx
@@ -1,72 +1,129 @@
+/**
+ * Note for Contributors:
+ * This file (en.jsx) serve as a template for other languages.
+ * To make other contributors' life easier, please REMEMBER:
+ * 1. to add your new string here; and
+ * 2. to remove old strings that are no longer needed; and
+ * 3. to sort the strings by the key.
+ * Thanks!
+ */
const en = {
- "column_back_button.label": "Back",
- "lightbox.close": "Close",
- "loading_indicator.label": "Loading...",
- "status.mention": "Mention @{name}",
- "status.delete": "Delete",
- "status.reply": "Reply",
- "status.reblog": "Boost",
- "status.favourite": "Favourite",
- "status.reblogged_by": "{name} boosted",
- "status.sensitive_warning": "Sensitive content",
- "status.sensitive_toggle": "Click to view",
- "status.show_more": "Show more",
- "status.show_less": "Show less",
- "status.open": "Expand this status",
- "status.report": "Report @{name}",
- "video_player.toggle_sound": "Toggle sound",
- "account.mention": "Mention @{name}",
- "account.edit_profile": "Edit profile",
- "account.unblock": "Unblock @{name}",
- "account.unfollow": "Unfollow",
"account.block": "Block @{name}",
+ "account.disclaimer": "This user is from another instance. This number may be larger.",
+ "account.edit_profile": "Edit profile",
"account.follow": "Follow",
- "account.posts": "Posts",
- "account.follows": "Follows",
"account.followers": "Followers",
"account.follows_you": "Follows you",
+ "account.follows": "Follows",
+ "account.mention": "Mention @{name}",
+ "account.mute": "Mute @{name}",
+ "account.posts": "Posts",
+ "account.report": "Report @{name}",
"account.requested": "Awaiting approval",
- "getting_started.heading": "Getting started",
- "getting_started.about_addressing": "You can follow people if you know their username and the domain they are on by entering an e-mail-esque address into the search form.",
- "getting_started.about_shortcuts": "If the target user is on the same domain as you, just the username will work. The same rule applies to mentioning people in statuses.",
- "getting_started.open_source_notice": "Mastodon is open source software. You can contribute or report issues on GitHub at {github}. {apps}.",
- "column.home": "Home",
+ "account.unblock": "Unblock @{name}",
+ "account.unfollow": "Unfollow",
+ "account.unmute": "Unmute @{name}",
+ "boost_modal.combo": "You can press {combo} to skip this next time",
+ "column_back_button.label": "Back",
+ "column.blocks": "Blocked users",
"column.community": "Local timeline",
- "column.public": "Federated timeline",
+ "column.favourites": "Favourites",
+ "column.follow_requests": "Follow requests",
+ "column.home": "Home",
"column.notifications": "Notifications",
- "tabs_bar.compose": "Compose",
- "tabs_bar.home": "Home",
- "tabs_bar.mentions": "Mentions",
- "tabs_bar.public": "Federated timeline",
- "tabs_bar.notifications": "Notifications",
+ "column.public": "Federated timeline",
"compose_form.placeholder": "What is on your mind?",
+ "compose_form.privacy_disclaimer": "Your private status will be delivered to mentioned users on {domains}. Do you trust {domainsCount, plural, one {that server} other {those servers}}? Post privacy only works on Mastodon instances. If {domains} {domainsCount, plural, one {is not a Mastodon instance} other {are not Mastodon instances}}, there will be no indication that your post is private, and it may be boosted or otherwise made visible to unintended recipients.",
"compose_form.publish": "Toot",
"compose_form.sensitive": "Mark media as sensitive",
+ "compose_form.spoiler_placeholder": "Content warning",
"compose_form.spoiler": "Hide text behind warning",
- "compose_form.private": "Mark as private",
- "compose_form.privacy_disclaimer": "Your private status will be delivered to mentioned users on {domains}. Do you trust {domainsCount, plural, one {that server} other {those servers}}? Post privacy only works on Mastodon instances. If {domains} {domainsCount, plural, one {is not a Mastodon instance} other {are not Mastodon instances}}, there will be no indication that your post is private, and it may be boosted or otherwise made visible to unintended recipients.",
- "compose_form.unlisted": "Do not display on public timelines",
+ "emoji_button.label": "Insert emoji",
+ "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
+ "empty_column.hashtag": "There is nothing in this hashtag yet.",
+ "empty_column.home.public_timeline": "the public timeline",
+ "empty_column.home": "You aren't following anyone yet. Visit {public} or use search to get started and meet other users.",
+ "empty_column.notifications": "You don't have any notifications yet. Interact with others to start the conversation.",
+ "empty_column.public": "There is nothing here! Write something publicly, or manually follow users from other instances to fill it up",
+ "follow_request.authorize": "Authorize",
+ "follow_request.reject": "Rejec",
+ "getting_started.apps": "Various apps are available",
+ "getting_started.heading": "Getting started",
+ "getting_started.open_source_notice": "Mastodon is open source software. You can contribute or report issues on GitHub at {github}. {apps}.",
+ "home.column_settings.advanced": "Advanced",
+ "home.column_settings.basic": "Basic",
+ "home.column_settings.filter_regex": "Filter out by regular expressions",
+ "home.column_settings.show_reblogs": "Show boosts",
+ "home.column_settings.show_replies": "Show replies",
+ "home.settings": "Column settings",
+ "lightbox.close": "Close",
+ "loading_indicator.label": "Loading...",
+ "media_gallery.toggle_visible": "Toggle visibility",
+ "missing_indicator.label": "Not found",
+ "navigation_bar.blocks": "Blocked users",
+ "navigation_bar.community_timeline": "Local timeline",
"navigation_bar.edit_profile": "Edit profile",
+ "navigation_bar.favourites": "Favourites",
+ "navigation_bar.follow_requests": "Follow requests",
+ "navigation_bar.info": "Extended information",
+ "navigation_bar.logout": "Logout",
"navigation_bar.preferences": "Preferences",
- "navigation_bar.community_timeline": "Local timeline",
"navigation_bar.public_timeline": "Federated timeline",
- "navigation_bar.logout": "Logout",
- "reply_indicator.cancel": "Cancel",
- "search.placeholder": "Search",
- "search.account": "Account",
- "search.hashtag": "Hashtag",
- "upload_button.label": "Add media",
- "upload_form.undo": "Undo",
- "notification.follow": "{name} followed you",
"notification.favourite": "{name} favourited your status",
+ "notification.follow": "{name} followed you",
"notification.reblog": "{name} boosted your status",
- "notification.mention": "{name} mentioned you",
+ "notifications.clear_confirmation": "Are you sure you want to clear all your notifications?",
+ "notifications.clear": "Clear notifications",
"notifications.column_settings.alert": "Desktop notifications",
- "notifications.column_settings.show": "Show in column",
- "notifications.column_settings.follow": "New followers:",
"notifications.column_settings.favourite": "Favourites:",
+ "notifications.column_settings.follow": "New followers:",
"notifications.column_settings.mention": "Mentions:",
"notifications.column_settings.reblog": "Boosts:",
+ "notifications.column_settings.show": "Show in column",
+ "notifications.column_settings.sound": "Play sound",
+ "notifications.settings": "Column settings",
+ "privacy.change": "Adjust status privacy",
+ "privacy.direct.long": "Post to mentioned users only",
+ "privacy.direct.short": "Direct",
+ "privacy.private.long": "Post to followers only",
+ "privacy.private.short": "Private",
+ "privacy.public.long": "Post to public timelines",
+ "privacy.public.short": "Public",
+ "privacy.unlisted.long": "Do not show in public timelines",
+ "privacy.unlisted.short": "Unlisted",
+ "reply_indicator.cancel": "Cancel",
+ "report.heading": "New report",
+ "report.placeholder": "Additional comments",
+ "report.submit": "Submit",
+ "report.target": "Reporting",
+ "search_results.total": "{count} {count, plural, one {result} other {results}}",
+ "search.placeholder": "Search",
+ "search.status_by": "Status by {name}",
+ "status.delete": "Delete",
+ "status.favourite": "Favourite",
+ "status.load_more": "Load more",
+ "status.media_hidden": "Media hidden",
+ "status.mention": "Mention @{name}",
+ "status.open": "Expand this status",
+ "status.reblog": "Boost",
+ "status.reblogged_by": "{name} boosted",
+ "status.reply": "Reply",
+ "status.report": "Report @{name}",
+ "status.sensitive_toggle": "Click to view",
+ "status.sensitive_warning": "Sensitive content",
+ "status.show_less": "Show less",
+ "status.show_more": "Show more",
+ "tabs_bar.compose": "Compose",
+ "tabs_bar.federated_timeline": "Federated",
+ "tabs_bar.home": "Home",
+ "tabs_bar.local_timeline": "Local",
+ "tabs_bar.notifications": "Notifications",
+ "upload_area.title": "Drag & drop to upload",
+ "upload_button.label": "Add media",
+ "upload_form.undo": "Undo",
+ "upload_progress.label": "Uploading...",
+ "video_player.toggle_sound": "Toggle sound",
+ "video_player.toggle_visible": "Toggle visibility",
};
export default en;
