Addo domein block extra supports

app/javascript/mastodon/features/about/index.jsx

@@ -17,6 +17,8 @@ const messages = defineMessages({
   title: { id: 'column.about', defaultMessage: 'About' },
   rules: { id: 'about.rules', defaultMessage: 'Server rules' },
   blocks: { id: 'about.blocks', defaultMessage: 'Moderated servers' },
+  noop: { id: 'about.domain_blocks.noop.title', defaultMessage: 'Soft limited' },
+  noopExplanation: { id: 'about.domain_blocks.noop.explanation', defaultMessage: 'This server is limited partically.' },
   silenced: { id: 'about.domain_blocks.silenced.title', defaultMessage: 'Limited' },
   silencedExplanation: { id: 'about.domain_blocks.silenced.explanation', defaultMessage: 'You will generally not see profiles and content from this server, unless you explicitly look it up or opt into it by following.' },
   suspended: { id: 'about.domain_blocks.suspended.title', defaultMessage: 'Suspended' },
@@ -33,6 +35,11 @@ const severityMessages = {
     title: messages.suspended,
     explanation: messages.suspendedExplanation,
   },
+
+  noop: {
+    title: messages.noop,
+    explanation: messages.noopExplanation,
+  },
 };
 
 const mapStateToProps = state => ({
@@ -188,7 +195,7 @@ class About extends React.PureComponent {
                     <div className='about__domain-blocks__domain' key={block.get('domain')}>
                       <div className='about__domain-blocks__domain__header'>
                         <h6><span title={`SHA-256: ${block.get('digest')}`}>{block.get('domain')}</span></h6>
-                        <span className='about__domain-blocks__domain__type' title={intl.formatMessage(severityMessages[block.get('severity')].explanation)}>{intl.formatMessage(severityMessages[block.get('severity')].title)}</span>
+                        <span className='about__domain-blocks__domain__type' title={intl.formatMessage(severityMessages[block.get('severity')].explanation)}>{intl.formatMessage(severityMessages[block.get('severity_ex') || block.get('severity')].title)}</span>
                       </div>
 
                       <p>{(block.get('comment') || '').length > 0 ? block.get('comment') : <FormattedMessage id='about.domain_blocks.no_reason_available' defaultMessage='Reason not available' />}</p>

app/javascript/mastodon/locales/en.json

@@ -4,6 +4,8 @@
   "about.disclaimer": "Mastodon is free, open-source software, and a trademark of Mastodon gGmbH.",
   "about.domain_blocks.no_reason_available": "Reason not available",
   "about.domain_blocks.preamble": "Mastodon generally allows you to view content from and interact with users from any other server in the fediverse. These are the exceptions that have been made on this particular server.",
+  "about.domain_blocks.noop.title": "Soft limited",
+  "about.domain_blocks.noop.explanation": "This server is limited partically.",
   "about.domain_blocks.silenced.explanation": "You will generally not see profiles and content from this server, unless you explicitly look it up or opt into it by following.",
   "about.domain_blocks.silenced.title": "Limited",
   "about.domain_blocks.suspended.explanation": "No data from this server will be processed, stored or exchanged, making any interaction or communication with users from this server impossible.",

app/javascript/mastodon/locales/ja.json

@@ -5,6 +5,8 @@
   "about.domain_blocks.no_reason_available": "制限理由",
   "about.domain_blocks.preamble": "Mastodonでは連合先のどのようなサーバーのユーザーとも交流できます。ただし次のサーバーには例外が設定されています。",
   "about.domain_blocks.silenced.explanation": "このサーバーのプロフィールやコンテンツは、明示的に検索したり、フォローでオプトインしない限り、通常は表示されません。",
+  "about.domain_blocks.noop.title": "一部制限",
+  "about.domain_blocks.noop.explanation": "このサーバーは部分的に制限されています。",
   "about.domain_blocks.silenced.title": "制限",
   "about.domain_blocks.suspended.explanation": "これらのサーバーからのデータは処理されず、保存や変換もされません。該当するユーザーとの交流もできません。",
   "about.domain_blocks.suspended.title": "停止済み",

app/javascript/styles/mastodon/components.scss

@@ -8811,12 +8811,6 @@ noscript {
         overflow: hidden;
         text-overflow: ellipsis;
       }
-
-      p {
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
-      }
     }
   }
 }