Fix some typos

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>

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.
+- Compatibility: Support Mastodon v2 timeline filters.
-- Compatbility: Preliminary support for Ditto backend.
+- Compatibility: Preliminary support for Ditto backend.
 - Compatibility: Support Firefish.
 - Posts: Support dislikes on Friendica.
 - UI: added a character counter to some textareas.

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

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
  */
 

src/components/ui/icon-button/icon-button.tsx

@@ -9,7 +9,7 @@ interface IIconButton extends React.ButtonHTMLAttributes<HTMLButtonElement> {
   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';

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 }>();

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_never: { id: 'column.filters.expiration.never', defaultMessage: 'Never' },
-  expiration_1800: { id: 'colum.filters.expiration.1800', defaultMessage: '30 minutes' },
+  expiration_1800: { id: 'column.filters.expiration.1800', defaultMessage: '30 minutes' },
-  expiration_3600: { id: 'colum.filters.expiration.3600', defaultMessage: '1 hour' },
+  expiration_3600: { id: 'column.filters.expiration.3600', defaultMessage: '1 hour' },
-  expiration_21600: { id: 'colum.filters.expiration.21600', defaultMessage: '6 hours' },
+  expiration_21600: { id: 'column.filters.expiration.21600', defaultMessage: '6 hours' },
-  expiration_43200: { id: 'colum.filters.expiration.43200', defaultMessage: '12 hours' },
+  expiration_43200: { id: 'column.filters.expiration.43200', defaultMessage: '12 hours' },
-  expiration_86400: { id: 'colum.filters.expiration.86400', defaultMessage: '1 day' },
+  expiration_86400: { id: 'column.filters.expiration.86400', defaultMessage: '1 day' },
-  expiration_604800: { id: 'colum.filters.expiration.604800', defaultMessage: '1 week' },
+  expiration_604800: { id: 'column.filters.expiration.604800', defaultMessage: '1 week' },
 });
 
 const FilterField: StreamfieldComponent<IFilterField> = ({ value, onChange }) => {

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<INotificaton> = (props) => {
+const Notification: React.FC<INotification> = (props) => {
   const { hidden = false, onMoveUp, onMoveDown } = props;
 
   const dispatch = useAppDispatch();

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)}
                   </Button>
                 </div>
               </Stack>

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 دقيقة",
+  "column.filters.expiration.1800": "30 دقيقة",
-  "colum.filters.expiration.21600": "6 ساعات",
+  "column.filters.expiration.21600": "6 ساعات",
-  "colum.filters.expiration.3600": "ساعة",
+  "column.filters.expiration.3600": "ساعة",
-  "colum.filters.expiration.43200": "12 ساعة",
+  "column.filters.expiration.43200": "12 ساعة",
-  "colum.filters.expiration.604800": "أسبوع",
+  "column.filters.expiration.604800": "أسبوع",
-  "colum.filters.expiration.86400": "يوم واحد",
+  "column.filters.expiration.86400": "يوم واحد",
-  "colum.filters.expiration.never": "أبداً",
+  "column.filters.expiration.never": "أبداً",
   "column.admin.announcements": "الإعلانات",
   "column.admin.awaiting_approval": "في انتظار الموافقة",
   "column.admin.create_announcement": "إنشاء إعلان",

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",

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",

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",
+  "column.filters.expiration.1800": "30 minutos",
-  "colum.filters.expiration.21600": "6 horas",
+  "column.filters.expiration.21600": "6 horas",
-  "colum.filters.expiration.3600": "1 hora",
+  "column.filters.expiration.3600": "1 hora",
-  "colum.filters.expiration.43200": "12 horas",
+  "column.filters.expiration.43200": "12 horas",
-  "colum.filters.expiration.604800": "1 semana",
+  "column.filters.expiration.604800": "1 semana",
-  "colum.filters.expiration.86400": "1 día",
+  "column.filters.expiration.86400": "1 día",
-  "colum.filters.expiration.never": "Nunca",
+  "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",

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",
+  "column.filters.expiration.1800": "30 minutes",
-  "colum.filters.expiration.21600": "6 heures",
+  "column.filters.expiration.21600": "6 heures",
-  "colum.filters.expiration.3600": "1 heure",
+  "column.filters.expiration.3600": "1 heure",
-  "colum.filters.expiration.43200": "12 heures",
+  "column.filters.expiration.43200": "12 heures",
-  "colum.filters.expiration.604800": "1 semaine",
+  "column.filters.expiration.604800": "1 semaine",
-  "colum.filters.expiration.86400": "1 jour",
+  "column.filters.expiration.86400": "1 jour",
-  "colum.filters.expiration.never": "Jamais",
+  "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",

src/locales/he.json

@@ -259,13 +259,13 @@
   "chats.dividers.today": "היום",
   "chats.main.blankslate.title": "עדיין אין הודעות",
   "chats.search_placeholder": "התחל שיחה עם…",
-  "colum.filters.expiration.1800": "30 דקות",
+  "column.filters.expiration.1800": "30 דקות",
-  "colum.filters.expiration.21600": "6 שעות",
+  "column.filters.expiration.21600": "6 שעות",
-  "colum.filters.expiration.3600": "שעה",
+  "column.filters.expiration.3600": "שעה",
-  "colum.filters.expiration.43200": "12 שעות",
+  "column.filters.expiration.43200": "12 שעות",
-  "colum.filters.expiration.604800": "שבוע",
+  "column.filters.expiration.604800": "שבוע",
-  "colum.filters.expiration.86400": "יום",
+  "column.filters.expiration.86400": "יום",
-  "colum.filters.expiration.never": "אף פעם",
+  "column.filters.expiration.never": "אף פעם",
   "column.admin.awaiting_approval": "מחכה לאישור",
   "column.admin.create_announcement": "צור הודעה",
   "column.admin.dashboard": "לוח מחוונים",

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",
+  "column.filters.expiration.1800": "30 menit",
-  "colum.filters.expiration.21600": "6 jam",
+  "column.filters.expiration.21600": "6 jam",
-  "colum.filters.expiration.3600": "1 jam",
+  "column.filters.expiration.3600": "1 jam",
-  "colum.filters.expiration.43200": "12 jam",
+  "column.filters.expiration.43200": "12 jam",
-  "colum.filters.expiration.604800": "1 minggu",
+  "column.filters.expiration.604800": "1 minggu",
-  "colum.filters.expiration.86400": "1 hari",
+  "column.filters.expiration.86400": "1 hari",
-  "colum.filters.expiration.never": "Tidak pernah",
+  "column.filters.expiration.never": "Tidak pernah",
   "column.admin.announcements": "Pengumuman",
   "column.admin.awaiting_approval": "Menunggu persetujuan",
   "column.admin.create_announcement": "Membuat pengumuman",

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",
+  "column.filters.expiration.1800": "30 minuti",
-  "colum.filters.expiration.21600": "6 ore",
+  "column.filters.expiration.21600": "6 ore",
-  "colum.filters.expiration.3600": "1 ora",
+  "column.filters.expiration.3600": "1 ora",
-  "colum.filters.expiration.43200": "12 ore",
+  "column.filters.expiration.43200": "12 ore",
-  "colum.filters.expiration.604800": "1 settimana",
+  "column.filters.expiration.604800": "1 settimana",
-  "colum.filters.expiration.86400": "1 giorno",
+  "column.filters.expiration.86400": "1 giorno",
-  "colum.filters.expiration.never": "Mai",
+  "column.filters.expiration.never": "Mai",
   "column.admin.announcements": "Annunci",
   "column.admin.awaiting_approval": "Attesa approvazione",
   "column.admin.create_announcement": "Creazione annunci",

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",
+  "column.filters.expiration.1800": "30 minutter",
-  "colum.filters.expiration.21600": "6 timer",
+  "column.filters.expiration.21600": "6 timer",
-  "colum.filters.expiration.3600": "1 time",
+  "column.filters.expiration.3600": "1 time",
-  "colum.filters.expiration.43200": "12 timer",
+  "column.filters.expiration.43200": "12 timer",
-  "colum.filters.expiration.604800": "1 uke",
+  "column.filters.expiration.604800": "1 uke",
-  "colum.filters.expiration.86400": "1 dag",
+  "column.filters.expiration.86400": "1 dag",
-  "colum.filters.expiration.never": "Aldri",
+  "column.filters.expiration.never": "Aldri",
   "column.admin.announcements": "Kunngjøring",
   "column.admin.awaiting_approval": "Avventer godkjenning",
   "column.admin.create_announcement": "Opprett kunngjøring",

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",
+  "column.filters.expiration.1800": "30 minut",
-  "colum.filters.expiration.21600": "6 godzin",
+  "column.filters.expiration.21600": "6 godzin",
-  "colum.filters.expiration.3600": "1 godzinę",
+  "column.filters.expiration.3600": "1 godzinę",
-  "colum.filters.expiration.43200": "12 godzin",
+  "column.filters.expiration.43200": "12 godzin",
-  "colum.filters.expiration.604800": "1 tydzień",
+  "column.filters.expiration.604800": "1 tydzień",
-  "colum.filters.expiration.86400": "1 dzień",
+  "column.filters.expiration.86400": "1 dzień",
-  "colum.filters.expiration.never": "Nigdy",
+  "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",

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 минут",
+  "column.filters.expiration.1800": "30 минут",
-  "colum.filters.expiration.21600": "6 часов",
+  "column.filters.expiration.21600": "6 часов",
-  "colum.filters.expiration.3600": "1 час",
+  "column.filters.expiration.3600": "1 час",
-  "colum.filters.expiration.43200": "12 часов",
+  "column.filters.expiration.43200": "12 часов",
-  "colum.filters.expiration.604800": "1 неделя",
+  "column.filters.expiration.604800": "1 неделя",
-  "colum.filters.expiration.86400": "1 день",
+  "column.filters.expiration.86400": "1 день",
-  "colum.filters.expiration.never": "Никогда",
+  "column.filters.expiration.never": "Никогда",
   "column.admin.announcements": "Объявления",
   "column.admin.awaiting_approval": "Ожидает Одобрения",
   "column.admin.create_announcement": "Создать объявление",

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",
+  "column.filters.expiration.1800": "30 dakika",
-  "colum.filters.expiration.21600": "6 saat",
+  "column.filters.expiration.21600": "6 saat",
-  "colum.filters.expiration.3600": "1 saat",
+  "column.filters.expiration.3600": "1 saat",
-  "colum.filters.expiration.43200": "12 saat",
+  "column.filters.expiration.43200": "12 saat",
-  "colum.filters.expiration.604800": "1 hafta",
+  "column.filters.expiration.604800": "1 hafta",
-  "colum.filters.expiration.86400": "1 gün",
+  "column.filters.expiration.86400": "1 gün",
-  "colum.filters.expiration.never": "Asla",
+  "column.filters.expiration.never": "Asla",
   "column.admin.announcements": "Duyurular",
   "column.admin.awaiting_approval": "Onay Bekleniyor",
   "column.admin.create_announcement": "Duyuru oluşturun",

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分钟",
+  "column.filters.expiration.1800": "30分钟",
-  "colum.filters.expiration.21600": "6小时",
+  "column.filters.expiration.21600": "6小时",
-  "colum.filters.expiration.3600": "1小时",
+  "column.filters.expiration.3600": "1小时",
-  "colum.filters.expiration.43200": "12小时",
+  "column.filters.expiration.43200": "12小时",
-  "colum.filters.expiration.604800": "1周",
+  "column.filters.expiration.604800": "1周",
-  "colum.filters.expiration.86400": "1天",
+  "column.filters.expiration.86400": "1天",
-  "colum.filters.expiration.never": "从不",
+  "column.filters.expiration.never": "从不",
   "column.admin.announcements": "公告",
   "column.admin.awaiting_approval": "等待批准",
   "column.admin.create_announcement": "创建公告",

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分鐘",
+  "column.filters.expiration.1800": "30分鐘",
-  "colum.filters.expiration.21600": "6小時",
+  "column.filters.expiration.21600": "6小時",
-  "colum.filters.expiration.3600": "1小時",
+  "column.filters.expiration.3600": "1小時",
-  "colum.filters.expiration.43200": "12小時",
+  "column.filters.expiration.43200": "12小時",
-  "colum.filters.expiration.604800": "1週",
+  "column.filters.expiration.604800": "1週",
-  "colum.filters.expiration.86400": "1天",
+  "column.filters.expiration.86400": "1天",
-  "colum.filters.expiration.never": "永不過期",
+  "column.filters.expiration.never": "永不過期",
   "column.admin.announcements": "公告",
   "column.admin.awaiting_approval": "等待核准",
   "column.admin.create_announcement": "新增公告",

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,

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<StatusEntity, 'media_attachments'> {
   media_attachments: { preview_url: string }[];

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 {