diff --git a/app/soapbox/actions/notifications.ts b/app/soapbox/actions/notifications.ts index 0e396b89a..adeb46bf9 100644 --- a/app/soapbox/actions/notifications.ts +++ b/app/soapbox/actions/notifications.ts @@ -89,6 +89,7 @@ const updateNotifications = (notification: APIEntity) => const updateNotificationsQueue = (notification: APIEntity, intlMessages: Record, intlLocale: string, curPath: string) => (dispatch: AppDispatch, getState: () => RootState) => { + if (!notification.type) return; // drop invalid notifications if (notification.type === 'pleroma:chat_mention') return; // Drop chat notifications, handle them per-chat const showAlert = getSettings(getState()).getIn(['notifications', 'alerts', notification.type]); diff --git a/app/soapbox/features/notifications/components/filter_bar.js b/app/soapbox/features/notifications/components/filter_bar.js index 81e370a3a..a656ce290 100644 --- a/app/soapbox/features/notifications/components/filter_bar.js +++ b/app/soapbox/features/notifications/components/filter_bar.js @@ -57,7 +57,7 @@ class NotificationFilterBar extends React.PureComponent { name: 'mention', }); items.push({ - text: , + text: , title: intl.formatMessage(messages.favourites), action: this.onClick('favourite'), name: 'favourite', @@ -81,7 +81,7 @@ class NotificationFilterBar extends React.PureComponent { name: 'poll', }); items.push({ - text: , + text: , title: intl.formatMessage(messages.statuses), action: this.onClick('status'), name: 'status', diff --git a/app/soapbox/features/notifications/components/notification.tsx b/app/soapbox/features/notifications/components/notification.tsx index 1073ff3aa..9f2c02778 100644 --- a/app/soapbox/features/notifications/components/notification.tsx +++ b/app/soapbox/features/notifications/components/notification.tsx @@ -9,12 +9,12 @@ import { HStack, Text, Emoji } from 'soapbox/components/ui'; import AccountContainer from 'soapbox/containers/account_container'; import StatusContainer from 'soapbox/containers/status_container'; import { useAppSelector } from 'soapbox/hooks'; +import { NotificationType, validType } from 'soapbox/utils/notification'; import type { ScrollPosition } from 'soapbox/components/status'; -import type { NotificationType } from 'soapbox/normalizers/notification'; import type { Account, Status, Notification as NotificationEntity } from 'soapbox/types/entities'; -const notificationForScreenReader = (intl: ReturnType, message: string, timestamp: Date) => { +const notificationForScreenReader = (intl: IntlShape, message: string, timestamp: Date) => { const output = [message]; output.push(intl.formatDate(timestamp, { hour: '2-digit', minute: '2-digit', month: 'short', day: 'numeric' })); @@ -48,7 +48,7 @@ const icons: Record = { user_approved: require('@tabler/icons/user-plus.svg'), }; -const messages: Record = defineMessages({ +const messages: Record = defineMessages({ follow: { id: 'notification.follow', defaultMessage: '{name} followed you', @@ -82,7 +82,7 @@ const messages: Record = defineMess defaultMessage: '{name} moved to {targetName}', }, 'pleroma:chat_mention': { - id: 'notification.chat_mention', + id: 'notification.pleroma:chat_mention', defaultMessage: '{name} sent you a message', }, 'pleroma:emoji_reaction': { @@ -221,7 +221,7 @@ const Notification: React.FC = (props) => { className='w-4 h-4 flex-none' /> ); - } else if (type) { + } else if (validType(type)) { return ( = (props) => { const targetName = notification.target && typeof notification.target === 'object' ? notification.target.acct : ''; - const message: React.ReactNode = type && account && typeof account === 'object' ? buildMessage(intl, type, account, notification.total_count, targetName, instance.title) : null; + const message: React.ReactNode = validType(type) && account && typeof account === 'object' ? buildMessage(intl, type, account, notification.total_count, targetName, instance.title) : null; + + const ariaLabel = validType(type) ? ( + notificationForScreenReader( + intl, + intl.formatMessage(messages[type], { + name: account && typeof account === 'object' ? account.acct : '', + targetName, + }), + notification.created_at, + ) + ) : ''; return (
diff --git a/app/soapbox/locales/ar.json b/app/soapbox/locales/ar.json index d1e705697..a508846d9 100644 --- a/app/soapbox/locales/ar.json +++ b/app/soapbox/locales/ar.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "أُعجِب {name} بمنشورك", "notification.follow": "{name} يتابعك", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/ast.json b/app/soapbox/locales/ast.json index ef5c65bd9..8ddb7bcaa 100644 --- a/app/soapbox/locales/ast.json +++ b/app/soapbox/locales/ast.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} favorited your post", "notification.follow": "{name} siguióte", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/bg.json b/app/soapbox/locales/bg.json index 4e937e97c..296e6b6b3 100644 --- a/app/soapbox/locales/bg.json +++ b/app/soapbox/locales/bg.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} хареса твоята публикация", "notification.follow": "{name} те последва", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/bn.json b/app/soapbox/locales/bn.json index c030722fa..adc441285 100644 --- a/app/soapbox/locales/bn.json +++ b/app/soapbox/locales/bn.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} আপনার কার্যক্রম পছন্দ করেছেন", "notification.follow": "{name} আপনাকে অনুসরণ করেছেন", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/br.json b/app/soapbox/locales/br.json index 9bec55d5b..4ee233e15 100644 --- a/app/soapbox/locales/br.json +++ b/app/soapbox/locales/br.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} favorited your post", "notification.follow": "{name} followed you", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/ca.json b/app/soapbox/locales/ca.json index e36ad89bc..3007d4446 100644 --- a/app/soapbox/locales/ca.json +++ b/app/soapbox/locales/ca.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} t'ha enviat un missatge", + "notification.pleroma:chat_mention": "{name} t'ha enviat un missatge", "notification.favourite": "{name} ha afavorit el teu estat", "notification.follow": "{name} t'ha seguit", "notification.follow_request": "{name} ha sol·licitat seguir-te", diff --git a/app/soapbox/locales/co.json b/app/soapbox/locales/co.json index 79214836a..d57318943 100644 --- a/app/soapbox/locales/co.json +++ b/app/soapbox/locales/co.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} hà aghjuntu u vostru statutu à i so favuriti", "notification.follow": "{name} v'hà seguitatu", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/cs.json b/app/soapbox/locales/cs.json index 155e1fa95..3e5e5c77a 100644 --- a/app/soapbox/locales/cs.json +++ b/app/soapbox/locales/cs.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} Vám poslal/a zprávu", + "notification.pleroma:chat_mention": "{name} Vám poslal/a zprávu", "notification.favourite": "{name} si oblíbil/a váš příspěvek", "notification.follow": "{name} vás začal/a sledovat", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/cy.json b/app/soapbox/locales/cy.json index bfc9c701b..b27bbc575 100644 --- a/app/soapbox/locales/cy.json +++ b/app/soapbox/locales/cy.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "hoffodd {name} eich tŵt", "notification.follow": "dilynodd {name} chi", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/da.json b/app/soapbox/locales/da.json index a935d51cf..16ac072a2 100644 --- a/app/soapbox/locales/da.json +++ b/app/soapbox/locales/da.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} favoriserede din status", "notification.follow": "{name} fulgte dig", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/de.json b/app/soapbox/locales/de.json index 366373390..2fcb8e5f0 100644 --- a/app/soapbox/locales/de.json +++ b/app/soapbox/locales/de.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} hat dir eine Nachricht gesendet", + "notification.pleroma:chat_mention": "{name} hat dir eine Nachricht gesendet", "notification.favourite": "{name} hat deinen Beitrag favorisiert", "notification.follow": "{name} folgt dir", "notification.follow_request": "{name} möchte dir folgen", diff --git a/app/soapbox/locales/defaultMessages.json b/app/soapbox/locales/defaultMessages.json index e9c48411f..c5730c2e8 100644 --- a/app/soapbox/locales/defaultMessages.json +++ b/app/soapbox/locales/defaultMessages.json @@ -4318,7 +4318,7 @@ }, { "defaultMessage": "{name} sent you a message", - "id": "notification.chat_mention" + "id": "notification.pleroma:chat_mention" }, { "defaultMessage": "{name} reacted to your post", diff --git a/app/soapbox/locales/el.json b/app/soapbox/locales/el.json index b601e68e8..9ee73f0df 100644 --- a/app/soapbox/locales/el.json +++ b/app/soapbox/locales/el.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "Ο/Η {name} σημείωσε ως αγαπημένη την κατάστασή σου", "notification.follow": "Ο/Η {name} σε ακολούθησε", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/en-Shaw.json b/app/soapbox/locales/en-Shaw.json index 027855309..bf0663c44 100644 --- a/app/soapbox/locales/en-Shaw.json +++ b/app/soapbox/locales/en-Shaw.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} 𐑕𐑧𐑯𐑑 𐑿 𐑩 𐑥𐑧𐑕𐑦𐑡", + "notification.pleroma:chat_mention": "{name} 𐑕𐑧𐑯𐑑 𐑿 𐑩 𐑥𐑧𐑕𐑦𐑡", "notification.favourite": "{name} 𐑤𐑲𐑒𐑑 𐑘𐑹 𐑐𐑴𐑕𐑑", "notification.follow": "{name} 𐑓𐑪𐑤𐑴𐑛 𐑿", "notification.follow_request": "{name} 𐑣𐑨𐑟 𐑮𐑦𐑒𐑢𐑧𐑕𐑑𐑩𐑛 𐑑 𐑓𐑪𐑤𐑴 𐑿", diff --git a/app/soapbox/locales/en.json b/app/soapbox/locales/en.json index 9a1af5b43..2d226e81d 100644 --- a/app/soapbox/locales/en.json +++ b/app/soapbox/locales/en.json @@ -712,7 +712,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} liked your post", "notification.follow": "{name} followed you", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/eo.json b/app/soapbox/locales/eo.json index 4c3bd6166..7b4b89c5f 100644 --- a/app/soapbox/locales/eo.json +++ b/app/soapbox/locales/eo.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} stelumis vian mesaĝon", "notification.follow": "{name} eksekvis vin", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/es-AR.json b/app/soapbox/locales/es-AR.json index eb56879a0..8590459b6 100644 --- a/app/soapbox/locales/es-AR.json +++ b/app/soapbox/locales/es-AR.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} marcó tu estado como favorito", "notification.follow": "{name} te empezó a seguir", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/es.json b/app/soapbox/locales/es.json index c4a3e99cb..9c8e6432a 100644 --- a/app/soapbox/locales/es.json +++ b/app/soapbox/locales/es.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} marcó tu estado como favorito", "notification.follow": "{name} te empezó a seguir", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/et.json b/app/soapbox/locales/et.json index 636be30e0..954dbb96c 100644 --- a/app/soapbox/locales/et.json +++ b/app/soapbox/locales/et.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} märkis su staatuse lemmikuks", "notification.follow": "{name} jälgib sind", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/eu.json b/app/soapbox/locales/eu.json index a16e4332b..3041d4be7 100644 --- a/app/soapbox/locales/eu.json +++ b/app/soapbox/locales/eu.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name}(e)k zure mezua gogoko du", "notification.follow": "{name}(e)k jarraitzen zaitu", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/fa.json b/app/soapbox/locales/fa.json index b9e9da44d..2b65e24c7 100644 --- a/app/soapbox/locales/fa.json +++ b/app/soapbox/locales/fa.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "‫{name}‬ نوشتهٔ شما را پسندید", "notification.follow": "‫{name}‬ پیگیر شما شد", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/fi.json b/app/soapbox/locales/fi.json index d806c2fc6..b8896b3f9 100644 --- a/app/soapbox/locales/fi.json +++ b/app/soapbox/locales/fi.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} tykkäsi tilastasi", "notification.follow": "{name} seurasi sinua", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/fr.json b/app/soapbox/locales/fr.json index 373c89021..3c7d73308 100644 --- a/app/soapbox/locales/fr.json +++ b/app/soapbox/locales/fr.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} a ajouté à ses favoris :", "notification.follow": "{name} vous suit", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/ga.json b/app/soapbox/locales/ga.json index eb21a107f..0cf874018 100644 --- a/app/soapbox/locales/ga.json +++ b/app/soapbox/locales/ga.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} favorited your post", "notification.follow": "{name} followed you", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/gl.json b/app/soapbox/locales/gl.json index 3ea35cb9f..95ee2cbbc 100644 --- a/app/soapbox/locales/gl.json +++ b/app/soapbox/locales/gl.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} marcou como favorito o seu estado", "notification.follow": "{name} está a seguila", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/he.json b/app/soapbox/locales/he.json index 66d636c1d..7b20f137a 100644 --- a/app/soapbox/locales/he.json +++ b/app/soapbox/locales/he.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} שלח לך הודעה", + "notification.pleroma:chat_mention": "{name} שלח לך הודעה", "notification.favourite": "הפוסט שלך חובב על ידי {name}", "notification.follow": "{name} במעקב אחרייך", "notification.follow_request": "{name} ביקש לעקוב אחריך", diff --git a/app/soapbox/locales/hi.json b/app/soapbox/locales/hi.json index cbc84692c..26deafba5 100644 --- a/app/soapbox/locales/hi.json +++ b/app/soapbox/locales/hi.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} favorited your post", "notification.follow": "{name} followed you", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/hr.json b/app/soapbox/locales/hr.json index ca5451121..68e3fe114 100644 --- a/app/soapbox/locales/hr.json +++ b/app/soapbox/locales/hr.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} je lajkao tvoj status", "notification.follow": "{name} te sada slijedi", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/hu.json b/app/soapbox/locales/hu.json index 0d5b56411..032c16b8d 100644 --- a/app/soapbox/locales/hu.json +++ b/app/soapbox/locales/hu.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} kedvencnek jelölte egy tülködet", "notification.follow": "{name} követ téged", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/hy.json b/app/soapbox/locales/hy.json index c2638e2d4..cabc205ad 100644 --- a/app/soapbox/locales/hy.json +++ b/app/soapbox/locales/hy.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} հավանեց թութդ", "notification.follow": "{name} սկսեց հետեւել քեզ", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/id.json b/app/soapbox/locales/id.json index 904f73cc5..6d86cbb8c 100644 --- a/app/soapbox/locales/id.json +++ b/app/soapbox/locales/id.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} menyukai status anda", "notification.follow": "{name} mengikuti anda", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/io.json b/app/soapbox/locales/io.json index f85f36a5a..5c351dc99 100644 --- a/app/soapbox/locales/io.json +++ b/app/soapbox/locales/io.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} favorizis tua mesajo", "notification.follow": "{name} sequeskis tu", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/it.json b/app/soapbox/locales/it.json index 6972de6c1..8f03e6a7d 100644 --- a/app/soapbox/locales/it.json +++ b/app/soapbox/locales/it.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} oggi festeggia il compleanno", "notification.birthday.more": "{count} e {count, plural, un {friend} più {friends}}", "notification.birthday_plural": "{name} e {more} oggi festeggiano il compleanno", - "notification.chat_mention": "{name} ti ha spedito un messaggio", + "notification.pleroma:chat_mention": "{name} ti ha spedito un messaggio", "notification.favourite": "{name} ha apprezzato il contenuto", "notification.follow": "{name} adesso ti segue", "notification.follow_request": "{name} ha chiesto di seguirti", diff --git a/app/soapbox/locales/ja.json b/app/soapbox/locales/ja.json index 931c89326..c40c65de3 100644 --- a/app/soapbox/locales/ja.json +++ b/app/soapbox/locales/ja.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name}さんがあなたにメッセージを送りました", + "notification.pleroma:chat_mention": "{name}さんがあなたにメッセージを送りました", "notification.favourite": "{name}さんがあなたの投稿をお気に入りに登録しました", "notification.follow": "{name}さんにフォローされました", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/ka.json b/app/soapbox/locales/ka.json index 950b4e69c..d0146522d 100644 --- a/app/soapbox/locales/ka.json +++ b/app/soapbox/locales/ka.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name}-მა თქვენი სტატუსი აქცია ფავორიტად", "notification.follow": "{name} გამოგყვათ", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/kk.json b/app/soapbox/locales/kk.json index 40f4f25ac..8620007e2 100644 --- a/app/soapbox/locales/kk.json +++ b/app/soapbox/locales/kk.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} жазбаңызды таңдаулыға қосты", "notification.follow": "{name} сізге жазылды", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/ko.json b/app/soapbox/locales/ko.json index 55bc1e1bb..25b771202 100644 --- a/app/soapbox/locales/ko.json +++ b/app/soapbox/locales/ko.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name}님이 즐겨찾기 했습니다", "notification.follow": "{name}님이 나를 팔로우 했습니다", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/lt.json b/app/soapbox/locales/lt.json index ff62cbf65..27c086ab8 100644 --- a/app/soapbox/locales/lt.json +++ b/app/soapbox/locales/lt.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} favorited your post", "notification.follow": "{name} followed you", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/lv.json b/app/soapbox/locales/lv.json index c97bca375..51352659c 100644 --- a/app/soapbox/locales/lv.json +++ b/app/soapbox/locales/lv.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} favorited your post", "notification.follow": "{name} followed you", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/mk.json b/app/soapbox/locales/mk.json index 8d017fb27..c8919a214 100644 --- a/app/soapbox/locales/mk.json +++ b/app/soapbox/locales/mk.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} favorited your post", "notification.follow": "{name} followed you", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/ms.json b/app/soapbox/locales/ms.json index dc75e0a32..b6e701fcd 100644 --- a/app/soapbox/locales/ms.json +++ b/app/soapbox/locales/ms.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} favorited your post", "notification.follow": "{name} followed you", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/nl.json b/app/soapbox/locales/nl.json index 47795ef3d..0e3ea550c 100644 --- a/app/soapbox/locales/nl.json +++ b/app/soapbox/locales/nl.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} voegde jouw toot als favoriet toe", "notification.follow": "{name} volgt jou nu", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/nn.json b/app/soapbox/locales/nn.json index 26e4c3134..62adfaba4 100644 --- a/app/soapbox/locales/nn.json +++ b/app/soapbox/locales/nn.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} likte din status", "notification.follow": "{name} fulgte deg", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/no.json b/app/soapbox/locales/no.json index fe86be051..827d16b33 100644 --- a/app/soapbox/locales/no.json +++ b/app/soapbox/locales/no.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} likte din status", "notification.follow": "{name} fulgte deg", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/oc.json b/app/soapbox/locales/oc.json index 64b471abc..6ba11c35d 100644 --- a/app/soapbox/locales/oc.json +++ b/app/soapbox/locales/oc.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} a ajustat a sos favorits", "notification.follow": "{name} vos sèc", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/pl.json b/app/soapbox/locales/pl.json index 1184a91f6..6e31746f7 100644 --- a/app/soapbox/locales/pl.json +++ b/app/soapbox/locales/pl.json @@ -749,7 +749,7 @@ "notification.birthday": "{name} ma dziś urodziny", "notification.birthday.more": "{count} {count, plural, one {znajomy} other {więcej znajomych}}", "notification.birthday_plural": "{name} i {more} mają dziś urodziny", - "notification.chat_mention": "{name} wysłał(a) Ci wiadomośść", + "notification.pleroma:chat_mention": "{name} wysłał(a) Ci wiadomośść", "notification.favourite": "{name} dodał(a) Twój wpis do ulubionych", "notification.follow": "{name} zaczął(-ęła) Cię śledzić", "notification.follow_request": "{name} poprosił(a) Cię o możliwość śledzenia", diff --git a/app/soapbox/locales/pt-BR.json b/app/soapbox/locales/pt-BR.json index f0b0a19df..76b2e4b84 100644 --- a/app/soapbox/locales/pt-BR.json +++ b/app/soapbox/locales/pt-BR.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} adicionou a sua postagem aos favoritos", "notification.follow": "{name} te seguiu", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/pt.json b/app/soapbox/locales/pt.json index 4cc86daad..5c8c51bb9 100644 --- a/app/soapbox/locales/pt.json +++ b/app/soapbox/locales/pt.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} enviou-te uma mensagem", + "notification.pleroma:chat_mention": "{name} enviou-te uma mensagem", "notification.favourite": "{name} gostou desta publicação", "notification.follow": "{name} começou a seguir-te", "notification.follow_request": "{name} pediu para te seguir", diff --git a/app/soapbox/locales/ro.json b/app/soapbox/locales/ro.json index 2f49f24ce..488ce486a 100644 --- a/app/soapbox/locales/ro.json +++ b/app/soapbox/locales/ro.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} a adăugat statusul tău la favorite", "notification.follow": "{name} te urmărește", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/ru.json b/app/soapbox/locales/ru.json index b4d0b3e2d..90b3827b0 100644 --- a/app/soapbox/locales/ru.json +++ b/app/soapbox/locales/ru.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} понравился Ваш статус", "notification.follow": "{name} подписался (-лась) на вас", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/sk.json b/app/soapbox/locales/sk.json index 7a81a02c4..023f86526 100644 --- a/app/soapbox/locales/sk.json +++ b/app/soapbox/locales/sk.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} si obľúbil/a tvoj príspevok", "notification.follow": "{name} ťa začal/a následovať", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/sl.json b/app/soapbox/locales/sl.json index d1710325d..30a90754b 100644 --- a/app/soapbox/locales/sl.json +++ b/app/soapbox/locales/sl.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} je vzljubil/a vaš status", "notification.follow": "{name} vam sledi", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/sq.json b/app/soapbox/locales/sq.json index 1c0a23d21..494b9ce8d 100644 --- a/app/soapbox/locales/sq.json +++ b/app/soapbox/locales/sq.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} parapëlqeu gjendjen tuaj", "notification.follow": "{name} zuri t’ju ndjekë", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/sr-Latn.json b/app/soapbox/locales/sr-Latn.json index ccf0c8ef1..952e0d360 100644 --- a/app/soapbox/locales/sr-Latn.json +++ b/app/soapbox/locales/sr-Latn.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} je stavio Vaš status kao omiljeni", "notification.follow": "{name} Vas je zapratio", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/sr.json b/app/soapbox/locales/sr.json index 140a2738c..b9e8d84ac 100644 --- a/app/soapbox/locales/sr.json +++ b/app/soapbox/locales/sr.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} је ставио/ла Ваш статус као омиљени", "notification.follow": "{name} Вас је запратио/ла", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/sv.json b/app/soapbox/locales/sv.json index a57d57e8f..dedaa4651 100644 --- a/app/soapbox/locales/sv.json +++ b/app/soapbox/locales/sv.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} favoriserade din status", "notification.follow": "{name} följer dig", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/ta.json b/app/soapbox/locales/ta.json index 69c44f84f..536bff964 100644 --- a/app/soapbox/locales/ta.json +++ b/app/soapbox/locales/ta.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} ஆர்வம் கொண்டவர், உங்கள் நிலை", "notification.follow": "{name} நீங்கள் தொடர்ந்து வந்தீர்கள்", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/te.json b/app/soapbox/locales/te.json index 6b34989f9..1e1311a4b 100644 --- a/app/soapbox/locales/te.json +++ b/app/soapbox/locales/te.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} మీ స్టేటస్ ను ఇష్టపడ్డారు", "notification.follow": "{name} మిమ్మల్ని అనుసరిస్తున్నారు", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/th.json b/app/soapbox/locales/th.json index c509dd4a3..cfc6d8396 100644 --- a/app/soapbox/locales/th.json +++ b/app/soapbox/locales/th.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} ได้ชื่นชอบสถานะของคุณ", "notification.follow": "{name} ได้ติดตามคุณ", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/tr.json b/app/soapbox/locales/tr.json index 45c7c02b0..2cb0e84dc 100644 --- a/app/soapbox/locales/tr.json +++ b/app/soapbox/locales/tr.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} senin durumunu favorilere ekledi", "notification.follow": "{name} seni takip ediyor", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/uk.json b/app/soapbox/locales/uk.json index bf601a95b..fb950161d 100644 --- a/app/soapbox/locales/uk.json +++ b/app/soapbox/locales/uk.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} вподобав(-ла) ваш допис", "notification.follow": "{name} підписався(-лась) на Вас", "notification.follow_request": "{name} відправив(-ла) запит на підписку", diff --git a/app/soapbox/locales/zh-CN.json b/app/soapbox/locales/zh-CN.json index 0ec6a2e0f..7a5aeb1f1 100644 --- a/app/soapbox/locales/zh-CN.json +++ b/app/soapbox/locales/zh-CN.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} 回复了你", + "notification.pleroma:chat_mention": "{name} 回复了你", "notification.favourite": "{name} 赞了你的帖文", "notification.follow": "{name} 开始关注你", "notification.follow_request": "{name} 请求关注你", diff --git a/app/soapbox/locales/zh-HK.json b/app/soapbox/locales/zh-HK.json index b163f6675..65462c72f 100644 --- a/app/soapbox/locales/zh-HK.json +++ b/app/soapbox/locales/zh-HK.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} 收藏了你的文章", "notification.follow": "{name} 開始關注你", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/zh-TW.json b/app/soapbox/locales/zh-TW.json index 5eade39d5..09ba5c840 100644 --- a/app/soapbox/locales/zh-TW.json +++ b/app/soapbox/locales/zh-TW.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} 把你的嘟文加入了最愛", "notification.follow": "{name} 關注了你", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/normalizers/notification.ts b/app/soapbox/normalizers/notification.ts index 2bac3f2b3..9b34278b6 100644 --- a/app/soapbox/normalizers/notification.ts +++ b/app/soapbox/normalizers/notification.ts @@ -11,19 +11,6 @@ import { import type { Account, Status, EmbeddedEntity } from 'soapbox/types/entities'; -export type NotificationType = - 'follow' - | 'follow_request' - | 'mention' - | 'reblog' - | 'favourite' - | 'poll' - | 'status' - | 'move' - | 'pleroma:chat_mention' - | 'pleroma:emoji_reaction' - | 'user_approved'; - // https://docs.joinmastodon.org/entities/notification/ export const NotificationRecord = ImmutableRecord({ account: null as EmbeddedEntity, @@ -33,7 +20,7 @@ export const NotificationRecord = ImmutableRecord({ id: '', status: null as EmbeddedEntity, target: null as EmbeddedEntity, // move - type: '' as NotificationType | '', + type: '', total_count: null as number | null, // grouped notifications }); diff --git a/app/soapbox/service_worker/web_push_locales.js b/app/soapbox/service_worker/web_push_locales.js index 1265f3cfa..172bbe4b5 100644 --- a/app/soapbox/service_worker/web_push_locales.js +++ b/app/soapbox/service_worker/web_push_locales.js @@ -20,6 +20,12 @@ filenames.forEach(filename => { 'notification.mention': full['notification.mention'] || '', 'notification.reblog': full['notification.reblog'] || '', 'notification.poll': full['notification.poll'] || '', + 'notification.status': full['notification.status'] || '', + 'notification.move': full['notification.move'] || '', + 'notification.user_approved': full['notification.user_approved'] || '', + + 'notification.pleroma:chat_mention': full['notification.pleroma:chat_mention'] || '', + 'notification.pleroma:emoji_reaction': full['notification.pleroma:emoji_reaction'] || '', 'status.show_more': full['status.show_more'] || '', 'status.reblog': full['status.reblog'] || '', diff --git a/app/soapbox/utils/notification.ts b/app/soapbox/utils/notification.ts new file mode 100644 index 000000000..635d16f29 --- /dev/null +++ b/app/soapbox/utils/notification.ts @@ -0,0 +1,25 @@ +/** Notification types known to Soapbox. */ +const NOTIFICATION_TYPES = [ + 'follow', + 'follow_request', + 'mention', + 'reblog', + 'favourite', + 'poll', + 'status', + 'move', + 'pleroma:chat_mention', + 'pleroma:emoji_reaction', + 'user_approved', +] as const; + +type NotificationType = typeof NOTIFICATION_TYPES[number]; + +/** Ensure the Notification is a valid, known type. */ +const validType = (type: string): type is NotificationType => NOTIFICATION_TYPES.includes(type as any); + +export { + NOTIFICATION_TYPES, + NotificationType, + validType, +};