Change: #694 参照の名称をひかえめな引用に変更 (#695)

app/javascript/mastodon/components/status.jsx

@@ -616,7 +616,7 @@ class Status extends ImmutablePureComponent {
 
     const withLimited = status.get('visibility_ex') === 'limited' && status.get('limited_scope') ? <span className='status__visibility-icon'><Icon id='get-pocket' icon={LimitedIcon} title={intl.formatMessage(messages.limited_short)} /></span> : null;
     const withQuote = status.get('quote_id') ? <span className='status__visibility-icon'><Icon id='quote-right' icon={QuoteIcon} title='Quote' /></span> : null;
-    const withReference = (!withQuote && status.get('status_references_count') > 0) ? <span className='status__visibility-icon'><Icon id='link' icon={ReferenceIcon} title='Reference' /></span> : null;
+    const withReference = (!withQuote && status.get('status_references_count') > 0) ? <span className='status__visibility-icon'><Icon id='link' icon={ReferenceIcon} title='Quiet quote' /></span> : null;
     const withExpiration = status.get('expires_at') ? <span className='status__visibility-icon'><Icon id='clock-o' icon={TimerIcon} title='Expiration' /></span> : null;
 
     const quote = !muted && status.get('quote_id') && (['public', 'community'].includes(contextType) ? isShowItem('quote_in_public') : isShowItem('quote_in_home')) && <CompactedStatusContainer id={status.get('quote_id')} history={this.props.history} />;

app/javascript/mastodon/components/status_action_bar.jsx

@@ -68,8 +68,8 @@ const messages = defineMessages({
   admin_status: { id: 'status.admin_status', defaultMessage: 'Open this post in the moderation interface' },
   admin_domain: { id: 'status.admin_domain', defaultMessage: 'Open moderation interface for {domain}' },
   copy: { id: 'status.copy', defaultMessage: 'Copy link to post' },
-  reference: { id: 'status.reference', defaultMessage: 'Add reference' },
-  quote: { id: 'status.quote', defaultMessage: 'Add ref (quote in other servers)' },
+  reference: { id: 'status.reference', defaultMessage: 'Quiet quote' },
+  quote: { id: 'status.quote', defaultMessage: 'Quote' },
   hide: { id: 'status.hide', defaultMessage: 'Hide post' },
   blockDomain: { id: 'account.block_domain', defaultMessage: 'Block domain {domain}' },
   unblockDomain: { id: 'account.unblock_domain', defaultMessage: 'Unblock domain {domain}' },
@@ -350,11 +350,11 @@ class StatusActionBar extends ImmutablePureComponent {
       }
 
       if (publicStatus) {
-        menu.push({ text: intl.formatMessage(messages.reference), action: this.handleReference });
-
         if (allowQuote) {
           menu.push({ text: intl.formatMessage(messages.quote), action: this.handleQuote });
         }
+
+        menu.push({ text: intl.formatMessage(messages.reference), action: this.handleReference });
       }
 
       menu.push({ text: intl.formatMessage(status.get('bookmarked') ? messages.removeBookmark : messages.bookmark), action: this.handleBookmarkClickOriginal });

app/javascript/mastodon/features/notifications/components/column_settings.jsx

@@ -203,7 +203,7 @@ export default class ColumnSettings extends PureComponent {
 
         <section>
           <div role='group' aria-labelledby='notifications-status_reference'>
-            <h3 id='notifications-status_reference'><FormattedMessage id='notifications.column_settings.status_reference' defaultMessage='References:' /></h3>
+            <h3 id='notifications-status_reference'><FormattedMessage id='notifications.column_settings.status_reference' defaultMessage='Quotes:' /></h3>
 
             <div className='column-settings__row'>
               <SettingToggle disabled={browserPermission === 'denied'} prefix='notifications_desktop' settings={settings} settingPath={['alerts', 'status_reference']} onChange={onChange} label={alertStr} />

app/javascript/mastodon/features/status/components/action_bar.jsx

@@ -61,8 +61,8 @@ const messages = defineMessages({
   admin_status: { id: 'status.admin_status', defaultMessage: 'Open this post in the moderation interface' },
   admin_domain: { id: 'status.admin_domain', defaultMessage: 'Open moderation interface for {domain}' },
   copy: { id: 'status.copy', defaultMessage: 'Copy link to post' },
-  reference: { id: 'status.reference', defaultMessage: 'Add reference' },
-  quote: { id: 'status.quote', defaultMessage: 'Add ref (quote in other servers)' },
+  reference: { id: 'status.reference', defaultMessage: 'Quiet quote' },
+  quote: { id: 'status.quote', defaultMessage: 'Quote' },
   blockDomain: { id: 'account.block_domain', defaultMessage: 'Block domain {domain}' },
   unblockDomain: { id: 'account.unblock_domain', defaultMessage: 'Unblock domain {domain}' },
   unmute: { id: 'account.unmute', defaultMessage: 'Unmute @{name}' },
@@ -277,11 +277,11 @@ class ActionBar extends PureComponent {
       }
 
       if (publicStatus) {
-        menu.push({ text: intl.formatMessage(messages.reference), action: this.handleReference });
-
         if (allowQuote) {
           menu.push({ text: intl.formatMessage(messages.quote), action: this.handleQuote });
         }
+
+        menu.push({ text: intl.formatMessage(messages.reference), action: this.handleReference });
       }
       menu.push({ text: intl.formatMessage(messages.bookmark_category), action: this.handleBookmarkCategoryAdderClick });
 

app/javascript/mastodon/features/status/components/detailed_status.jsx

@@ -287,7 +287,7 @@ class DetailedStatus extends ImmutablePureComponent {
           <span className='detailed-status__favorites'>
             <AnimatedNumber value={status.get('emoji_reactions_count')} />
           </span>
-          <FormattedMessage id='status.emoji_reactions' defaultMessage='{count, plural, one {reaction} other {reactions}}' values={{ count: status.get('emoji_reactions_count') }} />
+          <FormattedMessage id='status.emoji_reactions' defaultMessage='{count, plural, one {emoji} other {emojis}}' values={{ count: status.get('emoji_reactions_count') }} />
         </Link>
       );
     } else {
@@ -296,7 +296,7 @@ class DetailedStatus extends ImmutablePureComponent {
           <span className='detailed-status__favorites'>
             <AnimatedNumber value={status.get('emoji_reactions_count')} />
           </span>
-          <FormattedMessage id='status.emoji_reactions' defaultMessage='{count, plural, one {reaction} other {reactions}}' values={{ count: status.get('emoji_reactions_count') }} />
+          <FormattedMessage id='status.emoji_reactions' defaultMessage='{count, plural, one {emoji} other {emojis}}' values={{ count: status.get('emoji_reactions_count') }} />
         </a>
       );
     }
@@ -307,7 +307,7 @@ class DetailedStatus extends ImmutablePureComponent {
           <span className='detailed-status__favorites'>
             <AnimatedNumber value={status.get('status_referred_by_count')} />
           </span>
-          <FormattedMessage id='status.status_references' defaultMessage='{count, plural, one {ref} other {refs}}' values={{ count: status.get('status_referred_by_count') }} />
+          <FormattedMessage id='status.status_references' defaultMessage='{count, plural, one {quote} other {quotes}}' values={{ count: status.get('status_referred_by_count') }} />
         </Link>
       );
     } else {
@@ -316,7 +316,7 @@ class DetailedStatus extends ImmutablePureComponent {
           <span className='detailed-status__favorites'>
             <AnimatedNumber value={status.get('status_referred_by_count')} />
           </span>
-          <FormattedMessage id='status.status_references' defaultMessage='{count, plural, one {ref} other {refs}}' values={{ count: status.get('status_referred_by_count') }} />
+          <FormattedMessage id='status.status_references' defaultMessage='{count, plural, one {quote} other {quotes}}' values={{ count: status.get('status_referred_by_count') }} />
         </a>
       );
     }

app/javascript/mastodon/locales/en.json

@@ -370,7 +370,7 @@
   "empty_column.notification_requests": "All clear! There is nothing here. When you receive new notifications, they will appear here according to your settings.",
   "empty_column.notifications": "You don't have any notifications yet. When other people interact with you, you will see it here.",
   "empty_column.public": "There is nothing here! Write something publicly, or manually follow users from other servers to fill it up",
-  "empty_column.status_references": "No one has referred this post yet. When someone does, they will show up here.",
+  "empty_column.status_references": "No one has quotes this post yet. When someone does, they will show up here.",
   "error.unexpected_crash.explanation": "Due to a bug in our code or a browser compatibility issue, this page could not be displayed correctly.",
   "error.unexpected_crash.explanation_addons": "This page could not be displayed correctly. This error is likely caused by a browser add-on or automatic translation tools.",
   "error.unexpected_crash.next_steps": "Try refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
@@ -598,7 +598,7 @@
   "notification_requests.notifications_from": "Notifications from {name}",
   "notification_requests.title": "Filtered notifications",
   "notification.status": "{name} just posted",
-  "notification.status_reference": "{name} refered your post",
+  "notification.status_reference": "{name} quoted your post",
   "notification.update": "{name} edited a post",
   "notification.warning": "You have been warned and did something. Check your mailbox",
   "notifications.clear": "Clear notifications",
@@ -620,7 +620,7 @@
   "notifications.column_settings.show": "Show in column",
   "notifications.column_settings.sound": "Play sound",
   "notifications.column_settings.status": "New posts:",
-  "notifications.column_settings.status_reference": "References:",
+  "notifications.column_settings.status_reference": "Quotes:",
   "notifications.column_settings.unread_notifications.category": "Unread notifications",
   "notifications.column_settings.unread_notifications.highlight": "Highlight unread notifications",
   "notifications.column_settings.update": "Edits:",
@@ -631,7 +631,7 @@
   "notifications.filter.follows": "Follows",
   "notifications.filter.mentions": "Mentions",
   "notifications.filter.polls": "Poll results",
-  "notifications.filter.status_references": "Status references",
+  "notifications.filter.status_references": "Quotes",
   "notifications.filter.statuses": "Updates from people you follow",
   "notifications.grant_permission": "Grant permission.",
   "notifications.group": "{count} notifications",
@@ -866,7 +866,7 @@
   "status.expiration.5_minutes": "Remove 5 minutes later",
   "status.expiration.7_days": "Remove 7 days later",
   "status.expiration.add": "Set status expired time",
-  "status.emoji_reactions": "{count, plural, one {reaction} other {reactions}}",
+  "status.emoji_reactions": "{count, plural, one {emoji} other {emojis}}",
   "status.favourite": "Favorite",
   "status.favourites": "{count, plural, one {favorite} other {favorites}}",
   "status.featured_tags.add": "Add your featured tag",
@@ -896,7 +896,7 @@
   "status.reblogs": "{count, plural, one {boost} other {boosts}}",
   "status.reblogs.empty": "No one has boosted this post yet. When someone does, they will show up here.",
   "status.redraft": "Delete & re-draft",
-  "status.reference": "Reference",
+  "status.reference": "Quiet quote",
   "status.remove_bookmark": "Remove bookmark",
   "status.replied_to": "Replied to {name}",
   "status.reply": "Reply",
@@ -910,7 +910,7 @@
   "status.show_more": "Show more",
   "status.show_more_all": "Show more for all",
   "status.show_original": "Show original",
-  "status.status_references": "{count, plural, one {ref} other {refs}}",
+  "status.status_references": "{count, plural, one {quote} other {quotes}}",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {{attachmentCount} attachments}}",
   "status.translate": "Translate",
   "status.translated_from_with": "Translated from {lang} using {provider}",

app/javascript/mastodon/locales/ja.json

@@ -362,7 +362,7 @@
   "empty_column.notification_requests": "ここに表示するものはありません。新しい通知を受け取ったとき、フィルタリング設定で通知がブロックされたアカウントがある場合はここに表示されます。",
   "empty_column.notifications": "まだ通知がありません。他の人とふれ合って会話を始めましょう。",
   "empty_column.public": "ここにはまだ何もありません！ 公開で何かを投稿したり、他のサーバーのユーザーをフォローしたりしていっぱいにしましょう",
-  "empty_column.status_references": "まだ誰も参照していません。参照されるとここに表示されます。",
+  "empty_column.status_references": "まだ誰も引用していません。引用されるとここに表示されます。",
   "error.unexpected_crash.explanation": "不具合かブラウザの互換性問題のため、このページを正しく表示できませんでした。",
   "error.unexpected_crash.explanation_addons": "このページは正しく表示できませんでした。このエラーはブラウザのアドオンや自動翻訳ツールによって引き起こされることがあります。",
   "error.unexpected_crash.next_steps": "ページの再読み込みをお試しください。それでも解決しない場合、別のブラウザかアプリを使えば使用できることがあります。",
@@ -577,7 +577,7 @@
   "notification.poll": "アンケートが終了しました",
   "notification.reblog": "{name}さんがあなたの投稿をブーストしました",
   "notification.status": "{name}さんが投稿しました",
-  "notification.status_reference": "{name}さんがあなたの投稿を参照しました",
+  "notification.status_reference": "{name}さんがあなたの投稿を引用しました",
   "notification.update": "{name}さんが投稿を編集しました",
   "notification.warning": "あなたは警告を出され、処分が実行されました。詳細はメールをご確認ください",
   "notification.warning.none": "あなたは警告を出されました。詳細はメールをご確認ください。",
@@ -608,7 +608,7 @@
   "notifications.column_settings.show": "カラムに表示",
   "notifications.column_settings.sound": "通知音を再生",
   "notifications.column_settings.status": "新しい投稿:",
-  "notifications.column_settings.status_reference": "参照または引用",
+  "notifications.column_settings.status_reference": "引用",
   "notifications.column_settings.unread_notifications.category": "未読の通知:",
   "notifications.column_settings.unread_notifications.highlight": "未読の通知を強調表示",
   "notifications.column_settings.update": "編集:",
@@ -620,7 +620,7 @@
   "notifications.filter.mentions": "返信",
   "notifications.filter.polls": "アンケート結果",
   "notifications.filter.statuses": "フォローしている人の新着情報",
-  "notifications.filter.status_references": "参照",
+  "notifications.filter.status_references": "引用",
   "notifications.grant_permission": "権限の付与",
   "notifications.group": "{count}件の通知",
   "notifications.mark_as_read": "すべて既読にする",
@@ -878,7 +878,7 @@
   "status.reblogged_by": "{name}さんがブースト",
   "status.reblogs.empty": "まだ誰もブーストしていません。ブーストされるとここに表示されます。",
   "status.redraft": "削除して下書きに戻す",
-  "status.reference": "参照",
+  "status.reference": "ひかえめな引用",
   "status.remove_bookmark": "ブックマークを削除",
   "status.replied_to": "{name}さんへの返信",
   "status.reply": "返信",

app/views/settings/privacy_extra/show.html.haml

@@ -19,7 +19,7 @@
       = ff.input :translatable_private, wrapper: :with_label, kmyblue: true, label: I18n.t('simple_form.labels.defaults.setting_translatable_private')
 
     .fields-group
-      = ff.input :allow_quote, wrapper: :with_label, kmyblue: true, label: I18n.t('simple_form.labels.defaults.setting_allow_quote'), hint: false
+      = ff.input :allow_quote, wrapper: :with_label, kmyblue: true, label: I18n.t('simple_form.labels.defaults.setting_allow_quote'), hint: I18n.t('simple_form.hints.defaults.setting_allow_quote')
 
   %h4= t 'privacy_extra.stop_deliver'