diff --git a/CHANGELOG.md b/CHANGELOG.md index baaf46aa9..a0c531d23 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,8 +10,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Hashtags: let users follow hashtags (Mastodon, Akkoma). - Posts: Support posts filtering on recent Mastodon versions - Reactions: Support custom emoji reactions -- Compatbility: Support Mastodon v2 timeline filters. -- Compatbility: Preliminary support for Ditto backend. +- Compatibility: Support Mastodon v2 timeline filters. +- Compatibility: Preliminary support for Ditto backend. - Compatibility: Support Firefish. - Posts: Support dislikes on Friendica. - UI: added a character counter to some textareas. diff --git a/installation/mastodon.conf b/installation/mastodon.conf index 535a3b5ee..906401763 100644 --- a/installation/mastodon.conf +++ b/installation/mastodon.conf @@ -1,7 +1,7 @@ # Nginx configuration for Soapbox atop Mastodon. # Adapted from: https://github.com/mastodon/mastodon/blob/b4d373a3df2752d9f8bdc0d7f02350528f3789b2/dist/nginx.conf # -# Edit this file to change occurences of "example.com" to your own domain. +# Edit this file to change occurrences of "example.com" to your own domain. # Note: if this line causes an error, move it to nginx.conf # https://github.com/nginx-proxy/nginx-proxy/issues/1365#issuecomment-668421898 diff --git a/src/components/icon.tsx b/src/components/icon.tsx index 8ab8fe309..1f1536ef9 100644 --- a/src/components/icon.tsx +++ b/src/components/icon.tsx @@ -1,5 +1,5 @@ /** - * Icon: abstact component to render SVG icons. + * Icon: abstract component to render SVG icons. * @module soapbox/components/icon */ diff --git a/src/components/ui/icon-button/icon-button.tsx b/src/components/ui/icon-button/icon-button.tsx index e71e06e02..001a3ee0e 100644 --- a/src/components/ui/icon-button/icon-button.tsx +++ b/src/components/ui/icon-button/icon-button.tsx @@ -9,7 +9,7 @@ interface IIconButton extends React.ButtonHTMLAttributes { iconClassName?: string; /** URL to the svg icon. */ src: string; - /** Text to display next ot the button. */ + /** Text to display next to the button. */ text?: string; /** Predefined styles to display for the button. */ theme?: 'seamless' | 'outlined' | 'secondary' | 'transparent' | 'dark'; diff --git a/src/features/about/index.tsx b/src/features/about/index.tsx index d2aa40aaf..7031dfaf0 100644 --- a/src/features/about/index.tsx +++ b/src/features/about/index.tsx @@ -9,7 +9,7 @@ import { useSoapboxConfig, useSettings, useAppDispatch } from 'soapbox/hooks'; import { languages } from '../preferences'; -/** Displays arbitary user-uploaded HTML on a page at `/about/:slug` */ +/** Displays arbitrary user-uploaded HTML on a page at `/about/:slug` */ const AboutPage: React.FC = () => { const dispatch = useAppDispatch(); const { slug } = useParams<{ slug?: string }>(); diff --git a/src/features/filters/edit-filter.tsx b/src/features/filters/edit-filter.tsx index 6cbdc3e91..3501542ac 100644 --- a/src/features/filters/edit-filter.tsx +++ b/src/features/filters/edit-filter.tsx @@ -43,13 +43,13 @@ const messages = defineMessages({ add_new: { id: 'column.filters.add_new', defaultMessage: 'Add New Filter' }, edit: { id: 'column.filters.edit', defaultMessage: 'Edit Filter' }, create_error: { id: 'column.filters.create_error', defaultMessage: 'Error adding filter' }, - expiration_never: { id: 'colum.filters.expiration.never', defaultMessage: 'Never' }, - expiration_1800: { id: 'colum.filters.expiration.1800', defaultMessage: '30 minutes' }, - expiration_3600: { id: 'colum.filters.expiration.3600', defaultMessage: '1 hour' }, - expiration_21600: { id: 'colum.filters.expiration.21600', defaultMessage: '6 hours' }, - expiration_43200: { id: 'colum.filters.expiration.43200', defaultMessage: '12 hours' }, - expiration_86400: { id: 'colum.filters.expiration.86400', defaultMessage: '1 day' }, - expiration_604800: { id: 'colum.filters.expiration.604800', defaultMessage: '1 week' }, + expiration_never: { id: 'column.filters.expiration.never', defaultMessage: 'Never' }, + expiration_1800: { id: 'column.filters.expiration.1800', defaultMessage: '30 minutes' }, + expiration_3600: { id: 'column.filters.expiration.3600', defaultMessage: '1 hour' }, + expiration_21600: { id: 'column.filters.expiration.21600', defaultMessage: '6 hours' }, + expiration_43200: { id: 'column.filters.expiration.43200', defaultMessage: '12 hours' }, + expiration_86400: { id: 'column.filters.expiration.86400', defaultMessage: '1 day' }, + expiration_604800: { id: 'column.filters.expiration.604800', defaultMessage: '1 week' }, }); const FilterField: StreamfieldComponent = ({ value, onChange }) => { diff --git a/src/features/notifications/components/notification.tsx b/src/features/notifications/components/notification.tsx index f027cddda..fbefbf44f 100644 --- a/src/features/notifications/components/notification.tsx +++ b/src/features/notifications/components/notification.tsx @@ -163,7 +163,7 @@ const buildMessage = ( const avatarSize = 48; -interface INotificaton { +interface INotification { hidden?: boolean; notification: NotificationEntity; onMoveUp?: (notificationId: string) => void; @@ -173,7 +173,7 @@ interface INotificaton { updateScrollBottom?: (bottom: number) => void; } -const Notification: React.FC = (props) => { +const Notification: React.FC = (props) => { const { hidden = false, onMoveUp, onMoveDown } = props; const dispatch = useAppDispatch(); diff --git a/src/features/ui/components/modals/report-modal/steps/other-actions-step.tsx b/src/features/ui/components/modals/report-modal/steps/other-actions-step.tsx index 31b7f4879..bb51b712a 100644 --- a/src/features/ui/components/modals/report-modal/steps/other-actions-step.tsx +++ b/src/features/ui/components/modals/report-modal/steps/other-actions-step.tsx @@ -15,7 +15,7 @@ const messages = defineMessages({ addAdditionalStatuses: { id: 'report.otherActions.addAdditional', defaultMessage: 'Would you like to add additional statuses to this report?' }, addMore: { id: 'report.otherActions.addMore', defaultMessage: 'Add more' }, furtherActions: { id: 'report.otherActions.furtherActions', defaultMessage: 'Further actions:' }, - hideAdditonalStatuses: { id: 'report.otherActions.hideAdditional', defaultMessage: 'Hide additional statuses' }, + hideAdditionalStatuses: { id: 'report.otherActions.hideAdditional', defaultMessage: 'Hide additional statuses' }, otherStatuses: { id: 'report.otherActions.otherStatuses', defaultMessage: 'Include other statuses?' }, }); @@ -70,7 +70,7 @@ const OtherActionsStep = ({ account }: IOtherActionsStep) => { size='sm' onClick={() => setShowAdditionalStatuses(false)} > - {intl.formatMessage(messages.hideAdditonalStatuses)} + {intl.formatMessage(messages.hideAdditionalStatuses)} diff --git a/src/locales/ar.json b/src/locales/ar.json index db87c7c2d..b8b100a23 100644 --- a/src/locales/ar.json +++ b/src/locales/ar.json @@ -279,13 +279,13 @@ "chats.main.blankslate_with_chats.subtitle": "اختر من إحدى الدردشات المفتوحة أو أنشئ رسالة جديدة.", "chats.main.blankslate_with_chats.title": "اختيار دردشة", "chats.search_placeholder": "بَدْء دردشة مع…", - "colum.filters.expiration.1800": "30 دقيقة", - "colum.filters.expiration.21600": "6 ساعات", - "colum.filters.expiration.3600": "ساعة", - "colum.filters.expiration.43200": "12 ساعة", - "colum.filters.expiration.604800": "أسبوع", - "colum.filters.expiration.86400": "يوم واحد", - "colum.filters.expiration.never": "أبداً", + "column.filters.expiration.1800": "30 دقيقة", + "column.filters.expiration.21600": "6 ساعات", + "column.filters.expiration.3600": "ساعة", + "column.filters.expiration.43200": "12 ساعة", + "column.filters.expiration.604800": "أسبوع", + "column.filters.expiration.86400": "يوم واحد", + "column.filters.expiration.never": "أبداً", "column.admin.announcements": "الإعلانات", "column.admin.awaiting_approval": "في انتظار الموافقة", "column.admin.create_announcement": "إنشاء إعلان", diff --git a/src/locales/bg.json b/src/locales/bg.json index f0059b832..0cb7a54f5 100644 --- a/src/locales/bg.json +++ b/src/locales/bg.json @@ -50,7 +50,7 @@ "chats.actions.delete": "Delete message", "chats.actions.report": "Report user", "chats.search_placeholder": "Start a chat with…", - "colum.filters.expiration.never": "Никога", + "column.filters.expiration.never": "Никога", "column.admin.dashboard": "Dashboard", "column.admin.reports": "Reports", "column.aliases": "Account aliases", diff --git a/src/locales/en.json b/src/locales/en.json index 3299df485..c0669f953 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -279,13 +279,6 @@ "chats.main.blankslate_with_chats.subtitle": "Select from one of your open chats or create a new message.", "chats.main.blankslate_with_chats.title": "Select a chat", "chats.search_placeholder": "Start a chat with…", - "colum.filters.expiration.1800": "30 minutes", - "colum.filters.expiration.21600": "6 hours", - "colum.filters.expiration.3600": "1 hour", - "colum.filters.expiration.43200": "12 hours", - "colum.filters.expiration.604800": "1 week", - "colum.filters.expiration.86400": "1 day", - "colum.filters.expiration.never": "Never", "column.admin.announcements": "Announcements", "column.admin.awaiting_approval": "Awaiting Approval", "column.admin.create_announcement": "Create announcement", @@ -334,6 +327,13 @@ "column.filters.drop_header": "Drop instead of hide", "column.filters.drop_hint": "Filtered posts will disappear irreversibly, even if filter is later removed", "column.filters.edit": "Edit Filter", + "column.filters.expiration.1800": "30 minutes", + "column.filters.expiration.21600": "6 hours", + "column.filters.expiration.3600": "1 hour", + "column.filters.expiration.43200": "12 hours", + "column.filters.expiration.604800": "1 week", + "column.filters.expiration.86400": "1 day", + "column.filters.expiration.never": "Never", "column.filters.expires": "Expire after", "column.filters.hide_header": "Hide completely", "column.filters.hide_hint": "Completely hide the filtered content, instead of showing a warning", diff --git a/src/locales/es.json b/src/locales/es.json index 4ae50d382..e6e4863fb 100644 --- a/src/locales/es.json +++ b/src/locales/es.json @@ -268,13 +268,13 @@ "chats.main.blankslate_with_chats.subtitle": "Selecciona uno de tus chats abiertos o escribe un mensaje nuevo.", "chats.main.blankslate_with_chats.title": "Seleccionar un chat", "chats.search_placeholder": "Start a chat with…", - "colum.filters.expiration.1800": "30 minutos", - "colum.filters.expiration.21600": "6 horas", - "colum.filters.expiration.3600": "1 hora", - "colum.filters.expiration.43200": "12 horas", - "colum.filters.expiration.604800": "1 semana", - "colum.filters.expiration.86400": "1 día", - "colum.filters.expiration.never": "Nunca", + "column.filters.expiration.1800": "30 minutos", + "column.filters.expiration.21600": "6 horas", + "column.filters.expiration.3600": "1 hora", + "column.filters.expiration.43200": "12 horas", + "column.filters.expiration.604800": "1 semana", + "column.filters.expiration.86400": "1 día", + "column.filters.expiration.never": "Nunca", "column.admin.announcements": "Anuncios", "column.admin.awaiting_approval": "En espera de aprobación", "column.admin.create_announcement": "Crear un anuncio", diff --git a/src/locales/fr.json b/src/locales/fr.json index 8984b35a5..829e86051 100644 --- a/src/locales/fr.json +++ b/src/locales/fr.json @@ -269,13 +269,13 @@ "chats.main.blankslate_with_chats.subtitle": "Sélectionner depuis l'une de vos conversations ou créer un nouveau message.", "chats.main.blankslate_with_chats.title": "Sélectionner une discussion", "chats.search_placeholder": "Start a chat with…", - "colum.filters.expiration.1800": "30 minutes", - "colum.filters.expiration.21600": "6 heures", - "colum.filters.expiration.3600": "1 heure", - "colum.filters.expiration.43200": "12 heures", - "colum.filters.expiration.604800": "1 semaine", - "colum.filters.expiration.86400": "1 jour", - "colum.filters.expiration.never": "Jamais", + "column.filters.expiration.1800": "30 minutes", + "column.filters.expiration.21600": "6 heures", + "column.filters.expiration.3600": "1 heure", + "column.filters.expiration.43200": "12 heures", + "column.filters.expiration.604800": "1 semaine", + "column.filters.expiration.86400": "1 jour", + "column.filters.expiration.never": "Jamais", "column.admin.announcements": "Annonces", "column.admin.awaiting_approval": "En attente d'approbation", "column.admin.create_announcement": "Créer une annonce", diff --git a/src/locales/he.json b/src/locales/he.json index 015f2c42f..a46ca8e70 100644 --- a/src/locales/he.json +++ b/src/locales/he.json @@ -259,13 +259,13 @@ "chats.dividers.today": "היום", "chats.main.blankslate.title": "עדיין אין הודעות", "chats.search_placeholder": "התחל שיחה עם…", - "colum.filters.expiration.1800": "30 דקות", - "colum.filters.expiration.21600": "6 שעות", - "colum.filters.expiration.3600": "שעה", - "colum.filters.expiration.43200": "12 שעות", - "colum.filters.expiration.604800": "שבוע", - "colum.filters.expiration.86400": "יום", - "colum.filters.expiration.never": "אף פעם", + "column.filters.expiration.1800": "30 דקות", + "column.filters.expiration.21600": "6 שעות", + "column.filters.expiration.3600": "שעה", + "column.filters.expiration.43200": "12 שעות", + "column.filters.expiration.604800": "שבוע", + "column.filters.expiration.86400": "יום", + "column.filters.expiration.never": "אף פעם", "column.admin.awaiting_approval": "מחכה לאישור", "column.admin.create_announcement": "צור הודעה", "column.admin.dashboard": "לוח מחוונים", diff --git a/src/locales/id.json b/src/locales/id.json index e17eb2caa..7412ee81f 100644 --- a/src/locales/id.json +++ b/src/locales/id.json @@ -279,13 +279,13 @@ "chats.main.blankslate_with_chats.subtitle": "Pilih dari salah satu obrolan terbuka Anda atau buat pesan baru.", "chats.main.blankslate_with_chats.title": "Pilih obrolan", "chats.search_placeholder": "Start a chat with…", - "colum.filters.expiration.1800": "30 menit", - "colum.filters.expiration.21600": "6 jam", - "colum.filters.expiration.3600": "1 jam", - "colum.filters.expiration.43200": "12 jam", - "colum.filters.expiration.604800": "1 minggu", - "colum.filters.expiration.86400": "1 hari", - "colum.filters.expiration.never": "Tidak pernah", + "column.filters.expiration.1800": "30 menit", + "column.filters.expiration.21600": "6 jam", + "column.filters.expiration.3600": "1 jam", + "column.filters.expiration.43200": "12 jam", + "column.filters.expiration.604800": "1 minggu", + "column.filters.expiration.86400": "1 hari", + "column.filters.expiration.never": "Tidak pernah", "column.admin.announcements": "Pengumuman", "column.admin.awaiting_approval": "Menunggu persetujuan", "column.admin.create_announcement": "Membuat pengumuman", diff --git a/src/locales/it.json b/src/locales/it.json index 113b008ce..a77a5fae2 100644 --- a/src/locales/it.json +++ b/src/locales/it.json @@ -271,13 +271,13 @@ "chats.main.blankslate_with_chats.subtitle": "Seleziona da una delle chat aperte, oppure crea un nuovo messaggio.", "chats.main.blankslate_with_chats.title": "Seleziona chat", "chats.search_placeholder": "Inizia a chattare con…", - "colum.filters.expiration.1800": "30 minuti", - "colum.filters.expiration.21600": "6 ore", - "colum.filters.expiration.3600": "1 ora", - "colum.filters.expiration.43200": "12 ore", - "colum.filters.expiration.604800": "1 settimana", - "colum.filters.expiration.86400": "1 giorno", - "colum.filters.expiration.never": "Mai", + "column.filters.expiration.1800": "30 minuti", + "column.filters.expiration.21600": "6 ore", + "column.filters.expiration.3600": "1 ora", + "column.filters.expiration.43200": "12 ore", + "column.filters.expiration.604800": "1 settimana", + "column.filters.expiration.86400": "1 giorno", + "column.filters.expiration.never": "Mai", "column.admin.announcements": "Annunci", "column.admin.awaiting_approval": "Attesa approvazione", "column.admin.create_announcement": "Creazione annunci", diff --git a/src/locales/no.json b/src/locales/no.json index 9d6f26ca7..88489fdb7 100644 --- a/src/locales/no.json +++ b/src/locales/no.json @@ -268,13 +268,13 @@ "chats.main.blankslate_with_chats.subtitle": "Velg fra en av de åpne samtalene dine, eller opprett en ny melding.", "chats.main.blankslate_with_chats.title": "Velg en samtale", "chats.search_placeholder": "Start a chat with…", - "colum.filters.expiration.1800": "30 minutter", - "colum.filters.expiration.21600": "6 timer", - "colum.filters.expiration.3600": "1 time", - "colum.filters.expiration.43200": "12 timer", - "colum.filters.expiration.604800": "1 uke", - "colum.filters.expiration.86400": "1 dag", - "colum.filters.expiration.never": "Aldri", + "column.filters.expiration.1800": "30 minutter", + "column.filters.expiration.21600": "6 timer", + "column.filters.expiration.3600": "1 time", + "column.filters.expiration.43200": "12 timer", + "column.filters.expiration.604800": "1 uke", + "column.filters.expiration.86400": "1 dag", + "column.filters.expiration.never": "Aldri", "column.admin.announcements": "Kunngjøring", "column.admin.awaiting_approval": "Avventer godkjenning", "column.admin.create_announcement": "Opprett kunngjøring", diff --git a/src/locales/pl.json b/src/locales/pl.json index 9eda9262a..a2af7e814 100644 --- a/src/locales/pl.json +++ b/src/locales/pl.json @@ -279,13 +279,13 @@ "chats.main.blankslate_with_chats.subtitle": "Wybierz jeden z czatów lub utwórz nową wiadomość.", "chats.main.blankslate_with_chats.title": "Wybierz czat", "chats.search_placeholder": "Rozpocznij rozmowę z…", - "colum.filters.expiration.1800": "30 minut", - "colum.filters.expiration.21600": "6 godzin", - "colum.filters.expiration.3600": "1 godzinę", - "colum.filters.expiration.43200": "12 godzin", - "colum.filters.expiration.604800": "1 tydzień", - "colum.filters.expiration.86400": "1 dzień", - "colum.filters.expiration.never": "Nigdy", + "column.filters.expiration.1800": "30 minut", + "column.filters.expiration.21600": "6 godzin", + "column.filters.expiration.3600": "1 godzinę", + "column.filters.expiration.43200": "12 godzin", + "column.filters.expiration.604800": "1 tydzień", + "column.filters.expiration.86400": "1 dzień", + "column.filters.expiration.never": "Nigdy", "column.admin.announcements": "Ogłoszenia", "column.admin.awaiting_approval": "Oczekujące na przyjęcie", "column.admin.create_announcement": "Utwórz ogłoszenie", diff --git a/src/locales/ru.json b/src/locales/ru.json index e414e17e7..fac96685f 100644 --- a/src/locales/ru.json +++ b/src/locales/ru.json @@ -271,13 +271,13 @@ "chats.main.blankslate_with_chats.subtitle": "Выберите один из открытых чатов или создайте новое сообщение.", "chats.main.blankslate_with_chats.title": "Выберите чат", "chats.search_placeholder": "Start a chat with…", - "colum.filters.expiration.1800": "30 минут", - "colum.filters.expiration.21600": "6 часов", - "colum.filters.expiration.3600": "1 час", - "colum.filters.expiration.43200": "12 часов", - "colum.filters.expiration.604800": "1 неделя", - "colum.filters.expiration.86400": "1 день", - "colum.filters.expiration.never": "Никогда", + "column.filters.expiration.1800": "30 минут", + "column.filters.expiration.21600": "6 часов", + "column.filters.expiration.3600": "1 час", + "column.filters.expiration.43200": "12 часов", + "column.filters.expiration.604800": "1 неделя", + "column.filters.expiration.86400": "1 день", + "column.filters.expiration.never": "Никогда", "column.admin.announcements": "Объявления", "column.admin.awaiting_approval": "Ожидает Одобрения", "column.admin.create_announcement": "Создать объявление", diff --git a/src/locales/tr.json b/src/locales/tr.json index 1d5f09954..a4ea3e8bf 100644 --- a/src/locales/tr.json +++ b/src/locales/tr.json @@ -269,13 +269,13 @@ "chats.main.blankslate_with_chats.subtitle": "Açık sohbetlerinizden birini seçin veya yeni bir mesaj oluşturun.", "chats.main.blankslate_with_chats.title": "Sohbet seçiniz", "chats.search_placeholder": "Şununla sohbet başlat…", - "colum.filters.expiration.1800": "30 dakika", - "colum.filters.expiration.21600": "6 saat", - "colum.filters.expiration.3600": "1 saat", - "colum.filters.expiration.43200": "12 saat", - "colum.filters.expiration.604800": "1 hafta", - "colum.filters.expiration.86400": "1 gün", - "colum.filters.expiration.never": "Asla", + "column.filters.expiration.1800": "30 dakika", + "column.filters.expiration.21600": "6 saat", + "column.filters.expiration.3600": "1 saat", + "column.filters.expiration.43200": "12 saat", + "column.filters.expiration.604800": "1 hafta", + "column.filters.expiration.86400": "1 gün", + "column.filters.expiration.never": "Asla", "column.admin.announcements": "Duyurular", "column.admin.awaiting_approval": "Onay Bekleniyor", "column.admin.create_announcement": "Duyuru oluşturun", diff --git a/src/locales/zh-CN.json b/src/locales/zh-CN.json index e2c5d648a..bf8380284 100644 --- a/src/locales/zh-CN.json +++ b/src/locales/zh-CN.json @@ -279,13 +279,13 @@ "chats.main.blankslate_with_chats.subtitle": "从打开的聊天中选择一项或创建新消息。", "chats.main.blankslate_with_chats.title": "选择聊天", "chats.search_placeholder": "开始聊天……", - "colum.filters.expiration.1800": "30分钟", - "colum.filters.expiration.21600": "6小时", - "colum.filters.expiration.3600": "1小时", - "colum.filters.expiration.43200": "12小时", - "colum.filters.expiration.604800": "1周", - "colum.filters.expiration.86400": "1天", - "colum.filters.expiration.never": "从不", + "column.filters.expiration.1800": "30分钟", + "column.filters.expiration.21600": "6小时", + "column.filters.expiration.3600": "1小时", + "column.filters.expiration.43200": "12小时", + "column.filters.expiration.604800": "1周", + "column.filters.expiration.86400": "1天", + "column.filters.expiration.never": "从不", "column.admin.announcements": "公告", "column.admin.awaiting_approval": "等待批准", "column.admin.create_announcement": "创建公告", diff --git a/src/locales/zh-TW.json b/src/locales/zh-TW.json index e46a0d9a0..da555fb12 100644 --- a/src/locales/zh-TW.json +++ b/src/locales/zh-TW.json @@ -279,13 +279,13 @@ "chats.main.blankslate_with_chats.subtitle": "從您開啟的聊天室中選擇一個或建立新訊息。", "chats.main.blankslate_with_chats.title": "選擇聊天室", "chats.search_placeholder": "開始聊天…", - "colum.filters.expiration.1800": "30分鐘", - "colum.filters.expiration.21600": "6小時", - "colum.filters.expiration.3600": "1小時", - "colum.filters.expiration.43200": "12小時", - "colum.filters.expiration.604800": "1週", - "colum.filters.expiration.86400": "1天", - "colum.filters.expiration.never": "永不過期", + "column.filters.expiration.1800": "30分鐘", + "column.filters.expiration.21600": "6小時", + "column.filters.expiration.3600": "1小時", + "column.filters.expiration.43200": "12小時", + "column.filters.expiration.604800": "1週", + "column.filters.expiration.86400": "1天", + "column.filters.expiration.never": "永不過期", "column.admin.announcements": "公告", "column.admin.awaiting_approval": "等待核准", "column.admin.create_announcement": "新增公告", diff --git a/src/reducers/chat-messages.ts b/src/reducers/chat-messages.ts index 4c2c52d10..cba666be0 100644 --- a/src/reducers/chat-messages.ts +++ b/src/reducers/chat-messages.ts @@ -41,7 +41,7 @@ export default function chatMessages(state = initialState, action: AnyAction) { switch (action.type) { case CHAT_MESSAGE_SEND_REQUEST: return importMessage(state, fromJS({ - id: action.uuid, // Make fake message to get overriden later + id: action.uuid, // Make fake message to get overridden later chat_id: action.chatId, account_id: action.me, content: action.params.content, diff --git a/src/service-worker/sw.ts b/src/service-worker/sw.ts index 7f6ccd292..fd28f3bc8 100644 --- a/src/service-worker/sw.ts +++ b/src/service-worker/sw.ts @@ -46,7 +46,7 @@ interface ClonedNotification { title: string; } -/** Status entitiy from the API (kind of). */ +/** Status entity from the API (kind of). */ // HACK interface APIStatus extends Omit { media_attachments: { preview_url: string }[]; diff --git a/src/utils/nostr.ts b/src/utils/nostr.ts index 461677636..eafa93c23 100644 --- a/src/utils/nostr.ts +++ b/src/utils/nostr.ts @@ -1,4 +1,4 @@ -/** Check whether the given input is a valid Nostr hexidecimal pubkey. */ +/** Check whether the given input is a valid Nostr hexadecimal pubkey. */ const isPubkey = (value: string) => /^[0-9a-f]{64}$/i.test(value); export {