diff --git a/app/soapbox/components/status_reply_mentions.js b/app/soapbox/components/status_reply_mentions.js
index 76a48d5df..0809d6085 100644
--- a/app/soapbox/components/status_reply_mentions.js
+++ b/app/soapbox/components/status_reply_mentions.js
@@ -1,8 +1,9 @@
+import { List as ImmutableList } from 'immutable';
import PropTypes from 'prop-types';
import React from 'react';
import ImmutablePropTypes from 'react-immutable-proptypes';
import ImmutablePureComponent from 'react-immutable-pure-component';
-import { FormattedMessage, injectIntl } from 'react-intl';
+import { FormattedList, FormattedMessage, injectIntl } from 'react-intl';
import { connect } from 'react-redux';
import { Link } from 'react-router-dom';
@@ -42,7 +43,7 @@ class StatusReplyMentions extends ImmutablePureComponent {
return null;
}
- const to = status.get('mentions', []);
+ const to = status.get('mentions', ImmutableList());
// The post is a reply, but it has no mentions.
// Rare, but it can happen.
@@ -58,23 +59,27 @@ class StatusReplyMentions extends ImmutablePureComponent {
}
// The typical case with a reply-to and a list of mentions.
+ const accounts = to.slice(0, 2).map(account => (
+
+ @{account.get('username')}
+
+ )).toArray();
+
+ if (to.size > 2) {
+ accounts.push(
+
+
+ ,
+ );
+ }
+
return (
(<>
-
- @{account.get('username')}
-
- {' '}
- >)),
- more: to.size > 2 && (
-
-
-
- ),
+ accounts: ,
}}
/>
diff --git a/app/soapbox/features/compose/components/reply_mentions.tsx b/app/soapbox/features/compose/components/reply_mentions.tsx
index 2d09134e0..c25c2f3df 100644
--- a/app/soapbox/features/compose/components/reply_mentions.tsx
+++ b/app/soapbox/features/compose/components/reply_mentions.tsx
@@ -1,5 +1,5 @@
import React from 'react';
-import { FormattedMessage } from 'react-intl';
+import { FormattedList, FormattedMessage } from 'react-intl';
import { useDispatch } from 'react-redux';
import { openModal } from 'soapbox/actions/modals';
@@ -47,14 +47,23 @@ const ReplyMentions: React.FC = () => {
);
}
+ const accounts = to.slice(0, 2).map((acct: string) => (
+ @{acct.split('@')[0]}
+ )).toArray();
+
+ if (to.size > 2) {
+ accounts.push(
+ ,
+ );
+ }
+
return (
<>@{acct.split('@')[0]} {' '}>),
- more: to.size > 2 && ,
+ accounts: ,
}}
/>
diff --git a/app/soapbox/features/status/components/quoted_status.tsx b/app/soapbox/features/status/components/quoted_status.tsx
index aff5940be..c91dd616d 100644
--- a/app/soapbox/features/status/components/quoted_status.tsx
+++ b/app/soapbox/features/status/components/quoted_status.tsx
@@ -2,7 +2,7 @@ import classNames from 'classnames';
import { History } from 'history';
import React from 'react';
import ImmutablePureComponent from 'react-immutable-pure-component';
-import { defineMessages, injectIntl, FormattedMessage, IntlShape } from 'react-intl';
+import { defineMessages, injectIntl, FormattedMessage, IntlShape, FormattedList } from 'react-intl';
import { withRouter } from 'react-router-dom';
import AttachmentThumbs from 'soapbox/components/attachment_thumbs';
@@ -67,10 +67,9 @@ class QuotedStatus extends ImmutablePureComponent {
@@ -84,14 +83,21 @@ class QuotedStatus extends ImmutablePureComponent {
}
}
+ const accounts = to.slice(0, 2).map(account => <>@{account.username}>).toArray();
+
+ if (to.size > 2) {
+ accounts.push(
+ ,
+ );
+ }
+
return (
`@${account.username} `),
- more: to.size > 2 && ,
+ accounts: ,
}}
/>
diff --git a/app/soapbox/locales/ar.json b/app/soapbox/locales/ar.json
index 5031eb79d..d1e705697 100644
--- a/app/soapbox/locales/ar.json
+++ b/app/soapbox/locales/ar.json
@@ -859,8 +859,6 @@
"reply_indicator.cancel": "إلغاء",
"reply_mentions.account.add": "Add to mentions",
"reply_mentions.account.remove": "Remove from mentions",
- "reply_mentions.more": "and {count} more",
- "reply_mentions.reply": "Replying to {accounts}{more}",
"reply_mentions.reply_empty": "Replying to post",
"report.block": "Block {target}",
"report.block_hint": "Do you also want to block this account?",
diff --git a/app/soapbox/locales/ast.json b/app/soapbox/locales/ast.json
index 18f0c07df..ef5c65bd9 100644
--- a/app/soapbox/locales/ast.json
+++ b/app/soapbox/locales/ast.json
@@ -859,8 +859,6 @@
"reply_indicator.cancel": "Encaboxar",
"reply_mentions.account.add": "Add to mentions",
"reply_mentions.account.remove": "Remove from mentions",
- "reply_mentions.more": "and {count} more",
- "reply_mentions.reply": "Replying to {accounts}{more}",
"reply_mentions.reply_empty": "Replying to post",
"report.block": "Block {target}",
"report.block_hint": "Do you also want to block this account?",
diff --git a/app/soapbox/locales/bg.json b/app/soapbox/locales/bg.json
index b9f8ae1e1..7a62a52f0 100644
--- a/app/soapbox/locales/bg.json
+++ b/app/soapbox/locales/bg.json
@@ -859,8 +859,6 @@
"reply_indicator.cancel": "Отказ",
"reply_mentions.account.add": "Add to mentions",
"reply_mentions.account.remove": "Remove from mentions",
- "reply_mentions.more": "and {count} more",
- "reply_mentions.reply": "Replying to {accounts}{more}",
"reply_mentions.reply_empty": "Replying to post",
"report.block": "Block {target}",
"report.block_hint": "Do you also want to block this account?",
diff --git a/app/soapbox/locales/bn.json b/app/soapbox/locales/bn.json
index 54b6a65eb..c030722fa 100644
--- a/app/soapbox/locales/bn.json
+++ b/app/soapbox/locales/bn.json
@@ -859,8 +859,6 @@
"reply_indicator.cancel": "বাতিল করতে",
"reply_mentions.account.add": "Add to mentions",
"reply_mentions.account.remove": "Remove from mentions",
- "reply_mentions.more": "and {count} more",
- "reply_mentions.reply": "Replying to {accounts}{more}",
"reply_mentions.reply_empty": "Replying to post",
"report.block": "Block {target}",
"report.block_hint": "Do you also want to block this account?",
diff --git a/app/soapbox/locales/br.json b/app/soapbox/locales/br.json
index af5a58c8d..1a0d58e9a 100644
--- a/app/soapbox/locales/br.json
+++ b/app/soapbox/locales/br.json
@@ -859,8 +859,6 @@
"reply_indicator.cancel": "Cancel",
"reply_mentions.account.add": "Add to mentions",
"reply_mentions.account.remove": "Remove from mentions",
- "reply_mentions.more": "and {count} more",
- "reply_mentions.reply": "Replying to {accounts}{more}",
"reply_mentions.reply_empty": "Replying to post",
"report.block": "Block {target}",
"report.block_hint": "Do you also want to block this account?",
diff --git a/app/soapbox/locales/ca.json b/app/soapbox/locales/ca.json
index 0a3b7fa54..e36ad89bc 100644
--- a/app/soapbox/locales/ca.json
+++ b/app/soapbox/locales/ca.json
@@ -859,8 +859,6 @@
"reply_indicator.cancel": "Cancel·lar",
"reply_mentions.account.add": "Add to mentions",
"reply_mentions.account.remove": "Remove from mentions",
- "reply_mentions.more": "and {count} more",
- "reply_mentions.reply": "Replying to {accounts}{more}",
"reply_mentions.reply_empty": "Replying to post",
"report.block": "Bloquejar {target}",
"report.block_hint": "També vols bloquejar aquest compte?",
diff --git a/app/soapbox/locales/co.json b/app/soapbox/locales/co.json
index 390ef9764..79214836a 100644
--- a/app/soapbox/locales/co.json
+++ b/app/soapbox/locales/co.json
@@ -859,8 +859,6 @@
"reply_indicator.cancel": "Annullà",
"reply_mentions.account.add": "Add to mentions",
"reply_mentions.account.remove": "Remove from mentions",
- "reply_mentions.more": "and {count} more",
- "reply_mentions.reply": "Replying to {accounts}{more}",
"reply_mentions.reply_empty": "Replying to post",
"report.block": "Block {target}",
"report.block_hint": "Do you also want to block this account?",
diff --git a/app/soapbox/locales/cs.json b/app/soapbox/locales/cs.json
index 96d275865..155e1fa95 100644
--- a/app/soapbox/locales/cs.json
+++ b/app/soapbox/locales/cs.json
@@ -859,8 +859,6 @@
"reply_indicator.cancel": "Zrušit",
"reply_mentions.account.add": "Add to mentions",
"reply_mentions.account.remove": "Remove from mentions",
- "reply_mentions.more": "and {count} more",
- "reply_mentions.reply": "Replying to {accounts}{more}",
"reply_mentions.reply_empty": "Replying to post",
"report.block": "Zablokovat {target}",
"report.block_hint": "Chcete zablokovat tento účet?",
diff --git a/app/soapbox/locales/cy.json b/app/soapbox/locales/cy.json
index a087fd35c..bfc9c701b 100644
--- a/app/soapbox/locales/cy.json
+++ b/app/soapbox/locales/cy.json
@@ -859,8 +859,6 @@
"reply_indicator.cancel": "Canslo",
"reply_mentions.account.add": "Add to mentions",
"reply_mentions.account.remove": "Remove from mentions",
- "reply_mentions.more": "and {count} more",
- "reply_mentions.reply": "Replying to {accounts}{more}",
"reply_mentions.reply_empty": "Replying to post",
"report.block": "Block {target}",
"report.block_hint": "Do you also want to block this account?",
diff --git a/app/soapbox/locales/da.json b/app/soapbox/locales/da.json
index b879b4a51..a935d51cf 100644
--- a/app/soapbox/locales/da.json
+++ b/app/soapbox/locales/da.json
@@ -859,8 +859,6 @@
"reply_indicator.cancel": "Annuller",
"reply_mentions.account.add": "Add to mentions",
"reply_mentions.account.remove": "Remove from mentions",
- "reply_mentions.more": "and {count} more",
- "reply_mentions.reply": "Replying to {accounts}{more}",
"reply_mentions.reply_empty": "Replying to post",
"report.block": "Block {target}",
"report.block_hint": "Do you also want to block this account?",
diff --git a/app/soapbox/locales/de.json b/app/soapbox/locales/de.json
index 95bce86fc..67067f2bf 100644
--- a/app/soapbox/locales/de.json
+++ b/app/soapbox/locales/de.json
@@ -859,8 +859,8 @@
"reply_indicator.cancel": "Abbrechen",
"reply_mentions.account.add": "Add to mentions",
"reply_mentions.account.remove": "Remove from mentions",
- "reply_mentions.more": "und {count, plural, one {einen weiteren Nutzer} other {# weitere Nutzer}}",
- "reply_mentions.reply": "Antwort an {accounts}{more}",
+ "reply_mentions.more": "{count, plural, one {einen weiteren Nutzer} other {# weitere Nutzer}}",
+ "reply_mentions.reply": "Antwort an {accounts}",
"reply_mentions.reply_empty": "Antwort auf einen Beitrag",
"report.block": "{target} blockieren.",
"report.block_hint": "Soll dieses Konto zusammen mit der Meldung auch gleich blockiert werden?",
diff --git a/app/soapbox/locales/el.json b/app/soapbox/locales/el.json
index 4aba909aa..b601e68e8 100644
--- a/app/soapbox/locales/el.json
+++ b/app/soapbox/locales/el.json
@@ -859,8 +859,6 @@
"reply_indicator.cancel": "Άκυρο",
"reply_mentions.account.add": "Add to mentions",
"reply_mentions.account.remove": "Remove from mentions",
- "reply_mentions.more": "and {count} more",
- "reply_mentions.reply": "Replying to {accounts}{more}",
"reply_mentions.reply_empty": "Replying to post",
"report.block": "Block {target}",
"report.block_hint": "Do you also want to block this account?",
diff --git a/app/soapbox/locales/en-Shaw.json b/app/soapbox/locales/en-Shaw.json
index 50f8c36ae..a0c457f11 100644
--- a/app/soapbox/locales/en-Shaw.json
+++ b/app/soapbox/locales/en-Shaw.json
@@ -859,8 +859,8 @@
"reply_indicator.cancel": "𐑒𐑨𐑯𐑕𐑩𐑤",
"reply_mentions.account.add": "𐑨𐑛 𐑑 𐑥𐑧𐑯𐑖𐑩𐑯𐑟",
"reply_mentions.account.remove": "𐑮𐑦𐑥𐑵𐑝 𐑓𐑮𐑪𐑥 𐑥𐑧𐑯𐑖𐑩𐑯𐑟",
- "reply_mentions.more": "𐑯 {count} 𐑥𐑹",
- "reply_mentions.reply": "𐑮𐑦𐑐𐑤𐑲𐑦𐑙 𐑑 {accounts}{more}",
+ "reply_mentions.more": "{count} 𐑥𐑹",
+ "reply_mentions.reply": "𐑮𐑦𐑐𐑤𐑲𐑦𐑙 𐑑 {accounts}",
"reply_mentions.reply_empty": "𐑮𐑦𐑐𐑤𐑲𐑦𐑙 𐑑 𐑐𐑴𐑕𐑑",
"report.block": "𐑚𐑤𐑪𐑒 {target}",
"report.block_hint": "𐑛𐑵 𐑿 𐑷𐑤𐑕𐑴 𐑢𐑪𐑯𐑑 𐑑 𐑚𐑤𐑪𐑒 𐑞𐑦𐑕 𐑩𐑒𐑬𐑯𐑑?",
diff --git a/app/soapbox/locales/en.json b/app/soapbox/locales/en.json
index a7c1d1ce1..e6267ac94 100644
--- a/app/soapbox/locales/en.json
+++ b/app/soapbox/locales/en.json
@@ -859,8 +859,6 @@
"reply_indicator.cancel": "Cancel",
"reply_mentions.account.add": "Add to mentions",
"reply_mentions.account.remove": "Remove from mentions",
- "reply_mentions.more": "and {count} more",
- "reply_mentions.reply": "Replying to {accounts}{more}",
"reply_mentions.reply_empty": "Replying to post",
"report.block": "Block {target}",
"report.block_hint": "Do you also want to block this account?",
diff --git a/app/soapbox/locales/eo.json b/app/soapbox/locales/eo.json
index 879fdde3b..4c3bd6166 100644
--- a/app/soapbox/locales/eo.json
+++ b/app/soapbox/locales/eo.json
@@ -859,8 +859,6 @@
"reply_indicator.cancel": "Nuligi",
"reply_mentions.account.add": "Add to mentions",
"reply_mentions.account.remove": "Remove from mentions",
- "reply_mentions.more": "and {count} more",
- "reply_mentions.reply": "Replying to {accounts}{more}",
"reply_mentions.reply_empty": "Replying to post",
"report.block": "Block {target}",
"report.block_hint": "Do you also want to block this account?",
diff --git a/app/soapbox/locales/es-AR.json b/app/soapbox/locales/es-AR.json
index e1fa60e68..eb56879a0 100644
--- a/app/soapbox/locales/es-AR.json
+++ b/app/soapbox/locales/es-AR.json
@@ -859,8 +859,6 @@
"reply_indicator.cancel": "Cancelar",
"reply_mentions.account.add": "Add to mentions",
"reply_mentions.account.remove": "Remove from mentions",
- "reply_mentions.more": "and {count} more",
- "reply_mentions.reply": "Replying to {accounts}{more}",
"reply_mentions.reply_empty": "Replying to post",
"report.block": "Block {target}",
"report.block_hint": "Do you also want to block this account?",
diff --git a/app/soapbox/locales/es.json b/app/soapbox/locales/es.json
index 2e0ab4ec9..c4a3e99cb 100644
--- a/app/soapbox/locales/es.json
+++ b/app/soapbox/locales/es.json
@@ -859,8 +859,6 @@
"reply_indicator.cancel": "Cancelar",
"reply_mentions.account.add": "Add to mentions",
"reply_mentions.account.remove": "Remove from mentions",
- "reply_mentions.more": "and {count} more",
- "reply_mentions.reply": "Replying to {accounts}{more}",
"reply_mentions.reply_empty": "Replying to post",
"report.block": "Block {target}",
"report.block_hint": "Do you also want to block this account?",
diff --git a/app/soapbox/locales/et.json b/app/soapbox/locales/et.json
index 5a4eb43c6..636be30e0 100644
--- a/app/soapbox/locales/et.json
+++ b/app/soapbox/locales/et.json
@@ -859,8 +859,6 @@
"reply_indicator.cancel": "Tühista",
"reply_mentions.account.add": "Add to mentions",
"reply_mentions.account.remove": "Remove from mentions",
- "reply_mentions.more": "and {count} more",
- "reply_mentions.reply": "Replying to {accounts}{more}",
"reply_mentions.reply_empty": "Replying to post",
"report.block": "Block {target}",
"report.block_hint": "Do you also want to block this account?",
diff --git a/app/soapbox/locales/eu.json b/app/soapbox/locales/eu.json
index 3a3881aca..a16e4332b 100644
--- a/app/soapbox/locales/eu.json
+++ b/app/soapbox/locales/eu.json
@@ -859,8 +859,6 @@
"reply_indicator.cancel": "Utzi",
"reply_mentions.account.add": "Add to mentions",
"reply_mentions.account.remove": "Remove from mentions",
- "reply_mentions.more": "and {count} more",
- "reply_mentions.reply": "Replying to {accounts}{more}",
"reply_mentions.reply_empty": "Replying to post",
"report.block": "Block {target}",
"report.block_hint": "Do you also want to block this account?",
diff --git a/app/soapbox/locales/fa.json b/app/soapbox/locales/fa.json
index 863046301..b9e9da44d 100644
--- a/app/soapbox/locales/fa.json
+++ b/app/soapbox/locales/fa.json
@@ -859,8 +859,6 @@
"reply_indicator.cancel": "لغو",
"reply_mentions.account.add": "Add to mentions",
"reply_mentions.account.remove": "Remove from mentions",
- "reply_mentions.more": "and {count} more",
- "reply_mentions.reply": "Replying to {accounts}{more}",
"reply_mentions.reply_empty": "Replying to post",
"report.block": "Block {target}",
"report.block_hint": "Do you also want to block this account?",
diff --git a/app/soapbox/locales/fi.json b/app/soapbox/locales/fi.json
index 2a29e6c20..d806c2fc6 100644
--- a/app/soapbox/locales/fi.json
+++ b/app/soapbox/locales/fi.json
@@ -859,8 +859,6 @@
"reply_indicator.cancel": "Peruuta",
"reply_mentions.account.add": "Add to mentions",
"reply_mentions.account.remove": "Remove from mentions",
- "reply_mentions.more": "and {count} more",
- "reply_mentions.reply": "Replying to {accounts}{more}",
"reply_mentions.reply_empty": "Replying to post",
"report.block": "Block {target}",
"report.block_hint": "Do you also want to block this account?",
diff --git a/app/soapbox/locales/fr.json b/app/soapbox/locales/fr.json
index 743341596..373c89021 100644
--- a/app/soapbox/locales/fr.json
+++ b/app/soapbox/locales/fr.json
@@ -859,8 +859,6 @@
"reply_indicator.cancel": "Annuler",
"reply_mentions.account.add": "Add to mentions",
"reply_mentions.account.remove": "Remove from mentions",
- "reply_mentions.more": "and {count} more",
- "reply_mentions.reply": "Replying to {accounts}{more}",
"reply_mentions.reply_empty": "Replying to post",
"report.block": "Block {target}",
"report.block_hint": "Do you also want to block this account?",
diff --git a/app/soapbox/locales/ga.json b/app/soapbox/locales/ga.json
index 5e6cb3a8b..eec9f2971 100644
--- a/app/soapbox/locales/ga.json
+++ b/app/soapbox/locales/ga.json
@@ -859,8 +859,6 @@
"reply_indicator.cancel": "Cancel",
"reply_mentions.account.add": "Add to mentions",
"reply_mentions.account.remove": "Remove from mentions",
- "reply_mentions.more": "and {count} more",
- "reply_mentions.reply": "Replying to {accounts}{more}",
"reply_mentions.reply_empty": "Replying to post",
"report.block": "Block {target}",
"report.block_hint": "Do you also want to block this account?",
diff --git a/app/soapbox/locales/gl.json b/app/soapbox/locales/gl.json
index a5a04c57c..3ea35cb9f 100644
--- a/app/soapbox/locales/gl.json
+++ b/app/soapbox/locales/gl.json
@@ -859,8 +859,6 @@
"reply_indicator.cancel": "Cancelar",
"reply_mentions.account.add": "Add to mentions",
"reply_mentions.account.remove": "Remove from mentions",
- "reply_mentions.more": "and {count} more",
- "reply_mentions.reply": "Replying to {accounts}{more}",
"reply_mentions.reply_empty": "Replying to post",
"report.block": "Block {target}",
"report.block_hint": "Do you also want to block this account?",
diff --git a/app/soapbox/locales/he.json b/app/soapbox/locales/he.json
index 69ae4d20a..21717e89f 100644
--- a/app/soapbox/locales/he.json
+++ b/app/soapbox/locales/he.json
@@ -859,8 +859,8 @@
"reply_indicator.cancel": "ביטול",
"reply_mentions.account.add": "הוסף לאזכורים",
"reply_mentions.account.remove": "הסר מהאזכורים",
- "reply_mentions.more": "ו-{count} עוד",
- "reply_mentions.reply": "משיב ל-{accounts}{more}",
+ "reply_mentions.more": "{count} עוד",
+ "reply_mentions.reply": "משיב ל-{accounts}",
"reply_mentions.reply_empty": "משיב לפוסט",
"report.block": "חסום {target}",
"report.block_hint": "האם גם אתה רוצה לחסום את החשבון הזה?",
diff --git a/app/soapbox/locales/hi.json b/app/soapbox/locales/hi.json
index 2080a931a..292d6a033 100644
--- a/app/soapbox/locales/hi.json
+++ b/app/soapbox/locales/hi.json
@@ -859,8 +859,6 @@
"reply_indicator.cancel": "Cancel",
"reply_mentions.account.add": "Add to mentions",
"reply_mentions.account.remove": "Remove from mentions",
- "reply_mentions.more": "and {count} more",
- "reply_mentions.reply": "Replying to {accounts}{more}",
"reply_mentions.reply_empty": "Replying to post",
"report.block": "Block {target}",
"report.block_hint": "Do you also want to block this account?",
diff --git a/app/soapbox/locales/hr.json b/app/soapbox/locales/hr.json
index e78476954..ca5451121 100644
--- a/app/soapbox/locales/hr.json
+++ b/app/soapbox/locales/hr.json
@@ -859,8 +859,6 @@
"reply_indicator.cancel": "Otkaži",
"reply_mentions.account.add": "Add to mentions",
"reply_mentions.account.remove": "Remove from mentions",
- "reply_mentions.more": "and {count} more",
- "reply_mentions.reply": "Replying to {accounts}{more}",
"reply_mentions.reply_empty": "Replying to post",
"report.block": "Block {target}",
"report.block_hint": "Do you also want to block this account?",
diff --git a/app/soapbox/locales/hu.json b/app/soapbox/locales/hu.json
index 031c6c0a7..0d5b56411 100644
--- a/app/soapbox/locales/hu.json
+++ b/app/soapbox/locales/hu.json
@@ -859,8 +859,6 @@
"reply_indicator.cancel": "Mégsem",
"reply_mentions.account.add": "Add to mentions",
"reply_mentions.account.remove": "Remove from mentions",
- "reply_mentions.more": "and {count} more",
- "reply_mentions.reply": "Replying to {accounts}{more}",
"reply_mentions.reply_empty": "Replying to post",
"report.block": "Block {target}",
"report.block_hint": "Do you also want to block this account?",
diff --git a/app/soapbox/locales/hy.json b/app/soapbox/locales/hy.json
index e023bb148..c2638e2d4 100644
--- a/app/soapbox/locales/hy.json
+++ b/app/soapbox/locales/hy.json
@@ -859,8 +859,6 @@
"reply_indicator.cancel": "Չեղարկել",
"reply_mentions.account.add": "Add to mentions",
"reply_mentions.account.remove": "Remove from mentions",
- "reply_mentions.more": "and {count} more",
- "reply_mentions.reply": "Replying to {accounts}{more}",
"reply_mentions.reply_empty": "Replying to post",
"report.block": "Block {target}",
"report.block_hint": "Do you also want to block this account?",
diff --git a/app/soapbox/locales/id.json b/app/soapbox/locales/id.json
index 92bd85bdd..904f73cc5 100644
--- a/app/soapbox/locales/id.json
+++ b/app/soapbox/locales/id.json
@@ -859,8 +859,6 @@
"reply_indicator.cancel": "Batal",
"reply_mentions.account.add": "Add to mentions",
"reply_mentions.account.remove": "Remove from mentions",
- "reply_mentions.more": "and {count} more",
- "reply_mentions.reply": "Replying to {accounts}{more}",
"reply_mentions.reply_empty": "Replying to post",
"report.block": "Block {target}",
"report.block_hint": "Do you also want to block this account?",
diff --git a/app/soapbox/locales/io.json b/app/soapbox/locales/io.json
index 0a5bffb3c..f85f36a5a 100644
--- a/app/soapbox/locales/io.json
+++ b/app/soapbox/locales/io.json
@@ -859,8 +859,6 @@
"reply_indicator.cancel": "Nihiligar",
"reply_mentions.account.add": "Add to mentions",
"reply_mentions.account.remove": "Remove from mentions",
- "reply_mentions.more": "and {count} more",
- "reply_mentions.reply": "Replying to {accounts}{more}",
"reply_mentions.reply_empty": "Replying to post",
"report.block": "Block {target}",
"report.block_hint": "Do you also want to block this account?",
diff --git a/app/soapbox/locales/is.json b/app/soapbox/locales/is.json
index e3eea2422..49e906eb5 100644
--- a/app/soapbox/locales/is.json
+++ b/app/soapbox/locales/is.json
@@ -788,8 +788,8 @@
"reply_indicator.cancel": "Hætta við",
"reply_mentions.account.add": "Bæta við í tilvísanirnar",
"reply_mentions.account.remove": "Fjarlægja úr tilvísunum",
- "reply_mentions.more": "og {count} fleirum",
- "reply_mentions.reply": "Að svara {accounts}{more}",
+ "reply_mentions.more": "{count} fleirum",
+ "reply_mentions.reply": "Að svara {accounts}",
"reply_mentions.reply_empty": "Að svara færslu",
"report.block": "Loka á {target}",
"report.block_hint": "Viltu líka loka á þennan reikning?",
diff --git a/app/soapbox/locales/it.json b/app/soapbox/locales/it.json
index 57e54f718..e565fb5d6 100644
--- a/app/soapbox/locales/it.json
+++ b/app/soapbox/locales/it.json
@@ -859,8 +859,8 @@
"reply_indicator.cancel": "Annulla",
"reply_mentions.account.add": "Add to mentions",
"reply_mentions.account.remove": "Remove from mentions",
- "reply_mentions.more": "e ancora {count}",
- "reply_mentions.reply": "Risponde a {accounts}{more}",
+ "reply_mentions.more": "ancora {count}",
+ "reply_mentions.reply": "Risponde a {accounts}",
"reply_mentions.reply_empty": "Rispondendo al contenuto",
"report.block": "Blocca {target}",
"report.block_hint": "Vuoi anche bloccare questa persona?",
diff --git a/app/soapbox/locales/ja.json b/app/soapbox/locales/ja.json
index ea90e3e07..931c89326 100644
--- a/app/soapbox/locales/ja.json
+++ b/app/soapbox/locales/ja.json
@@ -859,8 +859,6 @@
"reply_indicator.cancel": "キャンセル",
"reply_mentions.account.add": "Add to mentions",
"reply_mentions.account.remove": "Remove from mentions",
- "reply_mentions.more": "and {count} more",
- "reply_mentions.reply": "Replying to {accounts}{more}",
"reply_mentions.reply_empty": "Replying to post",
"report.block": "{target}さんをブロック",
"report.block_hint": "このアカウントをブロックしますか?",
diff --git a/app/soapbox/locales/ka.json b/app/soapbox/locales/ka.json
index 05f781c9b..950b4e69c 100644
--- a/app/soapbox/locales/ka.json
+++ b/app/soapbox/locales/ka.json
@@ -859,8 +859,6 @@
"reply_indicator.cancel": "უარყოფა",
"reply_mentions.account.add": "Add to mentions",
"reply_mentions.account.remove": "Remove from mentions",
- "reply_mentions.more": "and {count} more",
- "reply_mentions.reply": "Replying to {accounts}{more}",
"reply_mentions.reply_empty": "Replying to post",
"report.block": "Block {target}",
"report.block_hint": "Do you also want to block this account?",
diff --git a/app/soapbox/locales/kk.json b/app/soapbox/locales/kk.json
index 0bf4c7faf..40f4f25ac 100644
--- a/app/soapbox/locales/kk.json
+++ b/app/soapbox/locales/kk.json
@@ -859,8 +859,6 @@
"reply_indicator.cancel": "Қайтып алу",
"reply_mentions.account.add": "Add to mentions",
"reply_mentions.account.remove": "Remove from mentions",
- "reply_mentions.more": "and {count} more",
- "reply_mentions.reply": "Replying to {accounts}{more}",
"reply_mentions.reply_empty": "Replying to post",
"report.block": "Block {target}",
"report.block_hint": "Do you also want to block this account?",
diff --git a/app/soapbox/locales/ko.json b/app/soapbox/locales/ko.json
index 6e56a125d..55bc1e1bb 100644
--- a/app/soapbox/locales/ko.json
+++ b/app/soapbox/locales/ko.json
@@ -859,8 +859,6 @@
"reply_indicator.cancel": "취소",
"reply_mentions.account.add": "Add to mentions",
"reply_mentions.account.remove": "Remove from mentions",
- "reply_mentions.more": "and {count} more",
- "reply_mentions.reply": "Replying to {accounts}{more}",
"reply_mentions.reply_empty": "Replying to post",
"report.block": "Block {target}",
"report.block_hint": "Do you also want to block this account?",
diff --git a/app/soapbox/locales/lt.json b/app/soapbox/locales/lt.json
index a369a6ec5..44b913afb 100644
--- a/app/soapbox/locales/lt.json
+++ b/app/soapbox/locales/lt.json
@@ -859,8 +859,6 @@
"reply_indicator.cancel": "Cancel",
"reply_mentions.account.add": "Add to mentions",
"reply_mentions.account.remove": "Remove from mentions",
- "reply_mentions.more": "and {count} more",
- "reply_mentions.reply": "Replying to {accounts}{more}",
"reply_mentions.reply_empty": "Replying to post",
"report.block": "Block {target}",
"report.block_hint": "Do you also want to block this account?",
diff --git a/app/soapbox/locales/lv.json b/app/soapbox/locales/lv.json
index a8fb3a793..c97bca375 100644
--- a/app/soapbox/locales/lv.json
+++ b/app/soapbox/locales/lv.json
@@ -859,8 +859,6 @@
"reply_indicator.cancel": "Cancel",
"reply_mentions.account.add": "Add to mentions",
"reply_mentions.account.remove": "Remove from mentions",
- "reply_mentions.more": "and {count} more",
- "reply_mentions.reply": "Replying to {accounts}{more}",
"reply_mentions.reply_empty": "Replying to post",
"report.block": "Block {target}",
"report.block_hint": "Do you also want to block this account?",
diff --git a/app/soapbox/locales/mk.json b/app/soapbox/locales/mk.json
index 501a56cd9..c760d08e0 100644
--- a/app/soapbox/locales/mk.json
+++ b/app/soapbox/locales/mk.json
@@ -859,8 +859,6 @@
"reply_indicator.cancel": "Cancel",
"reply_mentions.account.add": "Add to mentions",
"reply_mentions.account.remove": "Remove from mentions",
- "reply_mentions.more": "and {count} more",
- "reply_mentions.reply": "Replying to {accounts}{more}",
"reply_mentions.reply_empty": "Replying to post",
"report.block": "Block {target}",
"report.block_hint": "Do you also want to block this account?",
diff --git a/app/soapbox/locales/ms.json b/app/soapbox/locales/ms.json
index 880fd2938..eaafcd52f 100644
--- a/app/soapbox/locales/ms.json
+++ b/app/soapbox/locales/ms.json
@@ -859,8 +859,6 @@
"reply_indicator.cancel": "Cancel",
"reply_mentions.account.add": "Add to mentions",
"reply_mentions.account.remove": "Remove from mentions",
- "reply_mentions.more": "and {count} more",
- "reply_mentions.reply": "Replying to {accounts}{more}",
"reply_mentions.reply_empty": "Replying to post",
"report.block": "Block {target}",
"report.block_hint": "Do you also want to block this account?",
diff --git a/app/soapbox/locales/nl.json b/app/soapbox/locales/nl.json
index 1c1c00c3f..47795ef3d 100644
--- a/app/soapbox/locales/nl.json
+++ b/app/soapbox/locales/nl.json
@@ -859,8 +859,6 @@
"reply_indicator.cancel": "Annuleren",
"reply_mentions.account.add": "Add to mentions",
"reply_mentions.account.remove": "Remove from mentions",
- "reply_mentions.more": "and {count} more",
- "reply_mentions.reply": "Replying to {accounts}{more}",
"reply_mentions.reply_empty": "Replying to post",
"report.block": "Block {target}",
"report.block_hint": "Do you also want to block this account?",
diff --git a/app/soapbox/locales/nn.json b/app/soapbox/locales/nn.json
index 41a2b7f85..26e4c3134 100644
--- a/app/soapbox/locales/nn.json
+++ b/app/soapbox/locales/nn.json
@@ -859,8 +859,6 @@
"reply_indicator.cancel": "Cancel",
"reply_mentions.account.add": "Add to mentions",
"reply_mentions.account.remove": "Remove from mentions",
- "reply_mentions.more": "and {count} more",
- "reply_mentions.reply": "Replying to {accounts}{more}",
"reply_mentions.reply_empty": "Replying to post",
"report.block": "Block {target}",
"report.block_hint": "Do you also want to block this account?",
diff --git a/app/soapbox/locales/no.json b/app/soapbox/locales/no.json
index 77ac02363..fe86be051 100644
--- a/app/soapbox/locales/no.json
+++ b/app/soapbox/locales/no.json
@@ -859,8 +859,6 @@
"reply_indicator.cancel": "Avbryt",
"reply_mentions.account.add": "Add to mentions",
"reply_mentions.account.remove": "Remove from mentions",
- "reply_mentions.more": "and {count} more",
- "reply_mentions.reply": "Replying to {accounts}{more}",
"reply_mentions.reply_empty": "Replying to post",
"report.block": "Block {target}",
"report.block_hint": "Do you also want to block this account?",
diff --git a/app/soapbox/locales/oc.json b/app/soapbox/locales/oc.json
index c952d6eea..64b471abc 100644
--- a/app/soapbox/locales/oc.json
+++ b/app/soapbox/locales/oc.json
@@ -859,8 +859,6 @@
"reply_indicator.cancel": "Anullar",
"reply_mentions.account.add": "Add to mentions",
"reply_mentions.account.remove": "Remove from mentions",
- "reply_mentions.more": "and {count} more",
- "reply_mentions.reply": "Replying to {accounts}{more}",
"reply_mentions.reply_empty": "Replying to post",
"report.block": "Block {target}",
"report.block_hint": "Do you also want to block this account?",
diff --git a/app/soapbox/locales/pl.json b/app/soapbox/locales/pl.json
index e9a38c69c..d5c8b15e5 100644
--- a/app/soapbox/locales/pl.json
+++ b/app/soapbox/locales/pl.json
@@ -876,8 +876,8 @@
"reply_indicator.cancel": "Anuluj",
"reply_mentions.account.add": "Dodaj do wspomnianych",
"reply_mentions.account.remove": "Usuń z wspomnianych",
- "reply_mentions.more": "i {count} więcej",
- "reply_mentions.reply": "W odpowiedzi do {accounts}{more}",
+ "reply_mentions.more": "{count} więcej",
+ "reply_mentions.reply": "W odpowiedzi do {accounts}",
"reply_mentions.reply_empty": "W odpowiedzi na wpis",
"report.block": "Zablokuj {target}",
"report.block_hint": "Czy chcesz też zablokować to konto?",
diff --git a/app/soapbox/locales/pt-BR.json b/app/soapbox/locales/pt-BR.json
index 79701f4e8..f0b0a19df 100644
--- a/app/soapbox/locales/pt-BR.json
+++ b/app/soapbox/locales/pt-BR.json
@@ -859,8 +859,6 @@
"reply_indicator.cancel": "Cancelar",
"reply_mentions.account.add": "Add to mentions",
"reply_mentions.account.remove": "Remove from mentions",
- "reply_mentions.more": "and {count} more",
- "reply_mentions.reply": "Replying to {accounts}{more}",
"reply_mentions.reply_empty": "Replying to post",
"report.block": "Block {target}",
"report.block_hint": "Do you also want to block this account?",
diff --git a/app/soapbox/locales/pt.json b/app/soapbox/locales/pt.json
index 6eadee36d..4cc86daad 100644
--- a/app/soapbox/locales/pt.json
+++ b/app/soapbox/locales/pt.json
@@ -859,8 +859,6 @@
"reply_indicator.cancel": "Cancelar",
"reply_mentions.account.add": "Add to mentions",
"reply_mentions.account.remove": "Remove from mentions",
- "reply_mentions.more": "and {count} more",
- "reply_mentions.reply": "Replying to {accounts}{more}",
"reply_mentions.reply_empty": "Replying to post",
"report.block": "Bloquear {target}",
"report.block_hint": "Desejas também bloquear esta conta?",
diff --git a/app/soapbox/locales/ro.json b/app/soapbox/locales/ro.json
index 46c068630..2f49f24ce 100644
--- a/app/soapbox/locales/ro.json
+++ b/app/soapbox/locales/ro.json
@@ -859,8 +859,6 @@
"reply_indicator.cancel": "Anulează",
"reply_mentions.account.add": "Add to mentions",
"reply_mentions.account.remove": "Remove from mentions",
- "reply_mentions.more": "and {count} more",
- "reply_mentions.reply": "Replying to {accounts}{more}",
"reply_mentions.reply_empty": "Replying to post",
"report.block": "Block {target}",
"report.block_hint": "Do you also want to block this account?",
diff --git a/app/soapbox/locales/ru.json b/app/soapbox/locales/ru.json
index 76e4c0eb2..b4d0b3e2d 100644
--- a/app/soapbox/locales/ru.json
+++ b/app/soapbox/locales/ru.json
@@ -859,8 +859,6 @@
"reply_indicator.cancel": "Отмена",
"reply_mentions.account.add": "Add to mentions",
"reply_mentions.account.remove": "Remove from mentions",
- "reply_mentions.more": "and {count} more",
- "reply_mentions.reply": "Replying to {accounts}{more}",
"reply_mentions.reply_empty": "Replying to post",
"report.block": "Block {target}",
"report.block_hint": "Do you also want to block this account?",
diff --git a/app/soapbox/locales/sk.json b/app/soapbox/locales/sk.json
index 368c8d9b4..7a81a02c4 100644
--- a/app/soapbox/locales/sk.json
+++ b/app/soapbox/locales/sk.json
@@ -859,8 +859,6 @@
"reply_indicator.cancel": "Zrušiť",
"reply_mentions.account.add": "Add to mentions",
"reply_mentions.account.remove": "Remove from mentions",
- "reply_mentions.more": "and {count} more",
- "reply_mentions.reply": "Replying to {accounts}{more}",
"reply_mentions.reply_empty": "Replying to post",
"report.block": "Block {target}",
"report.block_hint": "Do you also want to block this account?",
diff --git a/app/soapbox/locales/sl.json b/app/soapbox/locales/sl.json
index 5a5e08eaf..d1710325d 100644
--- a/app/soapbox/locales/sl.json
+++ b/app/soapbox/locales/sl.json
@@ -859,8 +859,6 @@
"reply_indicator.cancel": "Prekliči",
"reply_mentions.account.add": "Add to mentions",
"reply_mentions.account.remove": "Remove from mentions",
- "reply_mentions.more": "and {count} more",
- "reply_mentions.reply": "Replying to {accounts}{more}",
"reply_mentions.reply_empty": "Replying to post",
"report.block": "Block {target}",
"report.block_hint": "Do you also want to block this account?",
diff --git a/app/soapbox/locales/sq.json b/app/soapbox/locales/sq.json
index ca6dc72cb..1c0a23d21 100644
--- a/app/soapbox/locales/sq.json
+++ b/app/soapbox/locales/sq.json
@@ -859,8 +859,6 @@
"reply_indicator.cancel": "Anuloje",
"reply_mentions.account.add": "Add to mentions",
"reply_mentions.account.remove": "Remove from mentions",
- "reply_mentions.more": "and {count} more",
- "reply_mentions.reply": "Replying to {accounts}{more}",
"reply_mentions.reply_empty": "Replying to post",
"report.block": "Block {target}",
"report.block_hint": "Do you also want to block this account?",
diff --git a/app/soapbox/locales/sr-Latn.json b/app/soapbox/locales/sr-Latn.json
index f04b9bef5..ccf0c8ef1 100644
--- a/app/soapbox/locales/sr-Latn.json
+++ b/app/soapbox/locales/sr-Latn.json
@@ -859,8 +859,6 @@
"reply_indicator.cancel": "Poništi",
"reply_mentions.account.add": "Add to mentions",
"reply_mentions.account.remove": "Remove from mentions",
- "reply_mentions.more": "and {count} more",
- "reply_mentions.reply": "Replying to {accounts}{more}",
"reply_mentions.reply_empty": "Replying to post",
"report.block": "Block {target}",
"report.block_hint": "Do you also want to block this account?",
diff --git a/app/soapbox/locales/sr.json b/app/soapbox/locales/sr.json
index efe2c4aa6..140a2738c 100644
--- a/app/soapbox/locales/sr.json
+++ b/app/soapbox/locales/sr.json
@@ -859,8 +859,6 @@
"reply_indicator.cancel": "Поништи",
"reply_mentions.account.add": "Add to mentions",
"reply_mentions.account.remove": "Remove from mentions",
- "reply_mentions.more": "and {count} more",
- "reply_mentions.reply": "Replying to {accounts}{more}",
"reply_mentions.reply_empty": "Replying to post",
"report.block": "Block {target}",
"report.block_hint": "Do you also want to block this account?",
diff --git a/app/soapbox/locales/sv.json b/app/soapbox/locales/sv.json
index dd56ef574..a57d57e8f 100644
--- a/app/soapbox/locales/sv.json
+++ b/app/soapbox/locales/sv.json
@@ -859,8 +859,6 @@
"reply_indicator.cancel": "Ångra",
"reply_mentions.account.add": "Add to mentions",
"reply_mentions.account.remove": "Remove from mentions",
- "reply_mentions.more": "and {count} more",
- "reply_mentions.reply": "Replying to {accounts}{more}",
"reply_mentions.reply_empty": "Replying to post",
"report.block": "Block {target}",
"report.block_hint": "Do you also want to block this account?",
diff --git a/app/soapbox/locales/ta.json b/app/soapbox/locales/ta.json
index 189eda2bb..69c44f84f 100644
--- a/app/soapbox/locales/ta.json
+++ b/app/soapbox/locales/ta.json
@@ -859,8 +859,6 @@
"reply_indicator.cancel": "எதிராணை",
"reply_mentions.account.add": "Add to mentions",
"reply_mentions.account.remove": "Remove from mentions",
- "reply_mentions.more": "and {count} more",
- "reply_mentions.reply": "Replying to {accounts}{more}",
"reply_mentions.reply_empty": "Replying to post",
"report.block": "Block {target}",
"report.block_hint": "Do you also want to block this account?",
diff --git a/app/soapbox/locales/te.json b/app/soapbox/locales/te.json
index 04f5c1931..6b34989f9 100644
--- a/app/soapbox/locales/te.json
+++ b/app/soapbox/locales/te.json
@@ -859,8 +859,6 @@
"reply_indicator.cancel": "రద్దు చెయ్యి",
"reply_mentions.account.add": "Add to mentions",
"reply_mentions.account.remove": "Remove from mentions",
- "reply_mentions.more": "and {count} more",
- "reply_mentions.reply": "Replying to {accounts}{more}",
"reply_mentions.reply_empty": "Replying to post",
"report.block": "Block {target}",
"report.block_hint": "Do you also want to block this account?",
diff --git a/app/soapbox/locales/th.json b/app/soapbox/locales/th.json
index 72d984068..c509dd4a3 100644
--- a/app/soapbox/locales/th.json
+++ b/app/soapbox/locales/th.json
@@ -859,8 +859,6 @@
"reply_indicator.cancel": "ยกเลิก",
"reply_mentions.account.add": "Add to mentions",
"reply_mentions.account.remove": "Remove from mentions",
- "reply_mentions.more": "and {count} more",
- "reply_mentions.reply": "Replying to {accounts}{more}",
"reply_mentions.reply_empty": "Replying to post",
"report.block": "Block {target}",
"report.block_hint": "Do you also want to block this account?",
diff --git a/app/soapbox/locales/tr.json b/app/soapbox/locales/tr.json
index 133b7c649..45c7c02b0 100644
--- a/app/soapbox/locales/tr.json
+++ b/app/soapbox/locales/tr.json
@@ -859,8 +859,6 @@
"reply_indicator.cancel": "İptal",
"reply_mentions.account.add": "Add to mentions",
"reply_mentions.account.remove": "Remove from mentions",
- "reply_mentions.more": "and {count} more",
- "reply_mentions.reply": "Replying to {accounts}{more}",
"reply_mentions.reply_empty": "Replying to post",
"report.block": "Block {target}",
"report.block_hint": "Do you also want to block this account?",
diff --git a/app/soapbox/locales/uk.json b/app/soapbox/locales/uk.json
index f88236624..bf601a95b 100644
--- a/app/soapbox/locales/uk.json
+++ b/app/soapbox/locales/uk.json
@@ -859,8 +859,6 @@
"reply_indicator.cancel": "Відмінити",
"reply_mentions.account.add": "Add to mentions",
"reply_mentions.account.remove": "Remove from mentions",
- "reply_mentions.more": "and {count} more",
- "reply_mentions.reply": "Replying to {accounts}{more}",
"reply_mentions.reply_empty": "Replying to post",
"report.block": "Block {target}",
"report.block_hint": "Do you also want to block this account?",
diff --git a/app/soapbox/locales/zh-CN.json b/app/soapbox/locales/zh-CN.json
index 25d9a28f7..0ec6a2e0f 100644
--- a/app/soapbox/locales/zh-CN.json
+++ b/app/soapbox/locales/zh-CN.json
@@ -859,8 +859,6 @@
"reply_indicator.cancel": "取消",
"reply_mentions.account.add": "Add to mentions",
"reply_mentions.account.remove": "Remove from mentions",
- "reply_mentions.more": "and {count} more",
- "reply_mentions.reply": "Replying to {accounts}{more}",
"reply_mentions.reply_empty": "Replying to post",
"report.block": "屏蔽帐号 {target}",
"report.block_hint": "你是否也要屏蔽这个帐号呢?",
diff --git a/app/soapbox/locales/zh-HK.json b/app/soapbox/locales/zh-HK.json
index b4143a647..b163f6675 100644
--- a/app/soapbox/locales/zh-HK.json
+++ b/app/soapbox/locales/zh-HK.json
@@ -859,8 +859,6 @@
"reply_indicator.cancel": "取消",
"reply_mentions.account.add": "Add to mentions",
"reply_mentions.account.remove": "Remove from mentions",
- "reply_mentions.more": "and {count} more",
- "reply_mentions.reply": "Replying to {accounts}{more}",
"reply_mentions.reply_empty": "Replying to post",
"report.block": "Block {target}",
"report.block_hint": "Do you also want to block this account?",
diff --git a/app/soapbox/locales/zh-TW.json b/app/soapbox/locales/zh-TW.json
index 44db7da27..5eade39d5 100644
--- a/app/soapbox/locales/zh-TW.json
+++ b/app/soapbox/locales/zh-TW.json
@@ -859,8 +859,6 @@
"reply_indicator.cancel": "取消",
"reply_mentions.account.add": "Add to mentions",
"reply_mentions.account.remove": "Remove from mentions",
- "reply_mentions.more": "and {count} more",
- "reply_mentions.reply": "Replying to {accounts}{more}",
"reply_mentions.reply_empty": "Replying to post",
"report.block": "Block {target}",
"report.block_hint": "Do you also want to block this account?",