Merge pull request #523 from plebbit/development

Development
plebbit · Sep 6, 2024 · 8951e7f · 8951e7f
2 parents 1d86267 + b8fc7fb
commit 8951e7f
Show file tree

Hide file tree

Showing 37 changed files with 75 additions and 38 deletions.
diff --git a/public/translations/ar/default.json b/public/translations/ar/default.json
@@ -230,5 +230,6 @@
   "add": "أضف",
   "pattern": "نمط",
   "enable": "تفعيل",
-  "order": "ترتيب"
+  "order": "ترتيب",
+  "text": "نص"
 }
diff --git a/public/translations/bn/default.json b/public/translations/bn/default.json
@@ -230,5 +230,6 @@
   "add": "যোগ করুন",
   "pattern": "প্যাটার্ন",
   "enable": "সক্রিয় করুন",
-  "order": "অর্ডার"
+  "order": "অর্ডার",
+  "text": "টেক্সট"
 }
diff --git a/public/translations/cs/default.json b/public/translations/cs/default.json
@@ -230,5 +230,6 @@
   "add": "Přidat",
   "pattern": "Vzor",
   "enable": "Povolit",
-  "order": "Pořadí"
+  "order": "Pořadí",
+  "text": "Text"
 }
diff --git a/public/translations/da/default.json b/public/translations/da/default.json
@@ -230,5 +230,6 @@
   "add": "Tilføj",
   "pattern": "Mønster",
   "enable": "Aktiver",
-  "order": "Rækkefølge"
+  "order": "Rækkefølge",
+  "text": "Tekst"
 }
diff --git a/public/translations/de/default.json b/public/translations/de/default.json
@@ -230,5 +230,6 @@
   "add": "Hinzufügen",
   "pattern": "Muster",
   "enable": "Aktivieren",
-  "order": "Reihenfolge"
+  "order": "Reihenfolge",
+  "text": "Text"
 }
diff --git a/public/translations/el/default.json b/public/translations/el/default.json
@@ -230,5 +230,6 @@
   "add": "Προσθήκη",
   "pattern": "Μοτίβο",
   "enable": "Ενεργοποιήστε",
-  "order": "Σειρά"
+  "order": "Σειρά",
+  "text": "Κείμενο"
 }
diff --git a/public/translations/en/default.json b/public/translations/en/default.json
@@ -230,5 +230,6 @@
   "add": "Add",
   "pattern": "Pattern",
   "enable": "Enable",
-  "order": "Order"
+  "order": "Order",
+  "text": "Text"
 }
diff --git a/public/translations/es/default.json b/public/translations/es/default.json
@@ -230,5 +230,6 @@
   "add": "Añadir",
   "pattern": "Patrón",
   "enable": "Habilitar",
-  "order": "Orden"
+  "order": "Orden",
+  "text": "Texto"
 }
diff --git a/public/translations/fa/default.json b/public/translations/fa/default.json
@@ -230,5 +230,6 @@
   "add": "اضافه کردن",
   "pattern": "الگو",
   "enable": "فعال کردن",
-  "order": "ترتیب"
+  "order": "ترتیب",
+  "text": "متن"
 }
diff --git a/public/translations/fi/default.json b/public/translations/fi/default.json
@@ -230,5 +230,6 @@
   "add": "Lisää",
   "pattern": "Malli",
   "enable": "Ota käyttöön",
-  "order": "Järjestys"
+  "order": "Järjestys",
+  "text": "Teksti"
 }
diff --git a/public/translations/fil/default.json b/public/translations/fil/default.json
@@ -230,5 +230,6 @@
   "add": "Idagdag",
   "pattern": "Pattern",
   "enable": "I-enable",
-  "order": "Kaayusan"
+  "order": "Kaayusan",
+  "text": "Teksto"
 }
diff --git a/public/translations/fr/default.json b/public/translations/fr/default.json
@@ -230,5 +230,6 @@
   "add": "Ajouter",
   "pattern": "Modèle",
   "enable": "Activer",
-  "order": "Ordre"
+  "order": "Ordre",
+  "text": "Texte"
 }
diff --git a/public/translations/he/default.json b/public/translations/he/default.json
@@ -230,5 +230,6 @@
   "add": "הוסף",
   "pattern": "תבנית",
   "enable": "הפעל",
-  "order": "סדר"
+  "order": "סדר",
+  "text": "טקסט"
 }
diff --git a/public/translations/hi/default.json b/public/translations/hi/default.json
@@ -230,5 +230,6 @@
   "add": "जोड़ें",
   "pattern": "पैटर्न",
   "enable": "सक्षम करें",
-  "order": "क्रम"
+  "order": "क्रम",
+  "text": "पाठ"
 }
diff --git a/public/translations/hu/default.json b/public/translations/hu/default.json
@@ -230,5 +230,6 @@
   "add": "Hozzáad",
   "pattern": "Minta",
   "enable": "Engedélyez",
-  "order": "Rendelés"
+  "order": "Rendelés",
+  "text": "Szöveg"
 }
diff --git a/public/translations/id/default.json b/public/translations/id/default.json
@@ -230,5 +230,6 @@
   "add": "Tambahkan",
   "pattern": "Pola",
   "enable": "Aktifkan",
-  "order": "Urutan"
+  "order": "Urutan",
+  "text": "Teks"
 }
diff --git a/public/translations/it/default.json b/public/translations/it/default.json
@@ -230,5 +230,6 @@
   "add": "Aggiungi",
   "pattern": "Modello",
   "enable": "Abilita",
-  "order": "Ordine"
+  "order": "Ordine",
+  "text": "Testo"
 }
diff --git a/public/translations/ja/default.json b/public/translations/ja/default.json
@@ -230,5 +230,6 @@
   "add": "追加",
   "pattern": "パターン",
   "enable": "有効にする",
-  "order": "順序"
+  "order": "順序",
+  "text": "テキスト"
 }
diff --git a/public/translations/ko/default.json b/public/translations/ko/default.json
@@ -230,5 +230,6 @@
   "add": "추가",
   "pattern": "패턴",
   "enable": "사용",
-  "order": "순서"
+  "order": "순서",
+  "text": "텍스트"
 }
diff --git a/public/translations/mr/default.json b/public/translations/mr/default.json
@@ -230,5 +230,6 @@
   "add": "अॅड करा",
   "pattern": "पॅटर्न",
   "enable": "सक्षम करा",
-  "order": "आदेश"
+  "order": "आदेश",
+  "text": "पाठ"
 }
diff --git a/public/translations/nl/default.json b/public/translations/nl/default.json
@@ -230,5 +230,6 @@
   "add": "Toevoegen",
   "pattern": "Patroon",
   "enable": "Inschakelen",
-  "order": "Volgorde"
+  "order": "Volgorde",
+  "text": "Tekst"
 }
diff --git a/public/translations/no/default.json b/public/translations/no/default.json
@@ -230,5 +230,6 @@
   "add": "Legg til",
   "pattern": "Mønster",
   "enable": "Aktiver",
-  "order": "Rekkefølge"
+  "order": "Rekkefølge",
+  "text": "Tekst"
 }
diff --git a/public/translations/pl/default.json b/public/translations/pl/default.json
@@ -230,5 +230,6 @@
   "add": "Dodaj",
   "pattern": "Wzór",
   "enable": "Włącz",
-  "order": "Kolejność"
+  "order": "Kolejność",
+  "text": "Tekst"
 }
diff --git a/public/translations/pt/default.json b/public/translations/pt/default.json
@@ -230,5 +230,6 @@
   "add": "Adicionar",
   "pattern": "Padrão",
   "enable": "Ativar",
-  "order": "Ordem"
+  "order": "Ordem",
+  "text": "Texto"
 }
diff --git a/public/translations/ro/default.json b/public/translations/ro/default.json
@@ -230,5 +230,6 @@
   "add": "Adaugă",
   "pattern": "Model",
   "enable": "Activare",
-  "order": "Ordine"
+  "order": "Ordine",
+  "text": "Text"
 }
diff --git a/public/translations/ru/default.json b/public/translations/ru/default.json
@@ -230,5 +230,6 @@
   "add": "Добавить",
   "pattern": "Шаблон",
   "enable": "Включить",
-  "order": "Порядок"
+  "order": "Порядок",
+  "text": "Текст"
 }
diff --git a/public/translations/sq/default.json b/public/translations/sq/default.json
@@ -230,5 +230,6 @@
   "add": "Shto",
   "pattern": "Model",
   "enable": "Aktivizo",
-  "order": "Rendit"
+  "order": "Rendit",
+  "text": "Tekst"
 }
diff --git a/public/translations/sv/default.json b/public/translations/sv/default.json
@@ -230,5 +230,6 @@
   "add": "Lägg till",
   "pattern": "Mönster",
   "enable": "Aktivera",
-  "order": "Ordning"
+  "order": "Ordning",
+  "text": "Text"
 }
diff --git a/public/translations/te/default.json b/public/translations/te/default.json
@@ -230,5 +230,6 @@
   "add": "చేర్చండి",
   "pattern": "ప్యాటర్న్",
   "enable": "చేర్చు",
-  "order": "ఆర్డర్"
+  "order": "ఆర్డర్",
+  "text": "పాఠం"
 }
diff --git a/public/translations/th/default.json b/public/translations/th/default.json
@@ -230,5 +230,6 @@
   "add": "เพิ่ม",
   "pattern": "รูปแบบ",
   "enable": "เปิดใช้งาน",
-  "order": "ลำดับ"
+  "order": "ลำดับ",
+  "text": "ข้อความ"
 }
diff --git a/public/translations/tr/default.json b/public/translations/tr/default.json
@@ -230,5 +230,6 @@
   "add": "Ekle",
   "pattern": "Desen",
   "enable": "Etkinleştir",
-  "order": "Sıra"
+  "order": "Sıra",
+  "text": "Metin"
 }
diff --git a/public/translations/uk/default.json b/public/translations/uk/default.json
@@ -230,5 +230,6 @@
   "add": "Додати",
   "pattern": "Шаблон",
   "enable": "Увімкнути",
-  "order": "Порядок"
+  "order": "Порядок",
+  "text": "Текст"
 }
diff --git a/public/translations/ur/default.json b/public/translations/ur/default.json
@@ -230,5 +230,6 @@
   "add": "شامل کریں",
   "pattern": "نمونہ",
   "enable": "فعال کریں",
-  "order": "ترتیب"
+  "order": "ترتیب",
+  "text": "متن"
 }
diff --git a/public/translations/vi/default.json b/public/translations/vi/default.json
@@ -230,5 +230,6 @@
   "add": "Thêm",
   "pattern": "Mẫu",
   "enable": "Kích hoạt",
-  "order": "Thứ tự"
+  "order": "Thứ tự",
+  "text": "Văn bản"
 }
diff --git a/public/translations/zh/default.json b/public/translations/zh/default.json
@@ -230,5 +230,6 @@
   "add": "添加",
   "pattern": "模式",
   "enable": "启用",
-  "order": "顺序"
+  "order": "顺序",
+  "text": "文本"
 }
diff --git a/src/components/settings-modal/settings-modal.tsx b/src/components/settings-modal/settings-modal.tsx
@@ -1,5 +1,5 @@
 import { useState } from 'react';
-import { useNavigate } from 'react-router-dom';
+import { useLocation, useNavigate } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
 import styles from './settings-modal.module.css';
 import AccountSettings from './account-settings';
@@ -12,10 +12,12 @@ import PlebbitOptions from './plebbit-options';
 
 const SettingsModal = () => {
   const { t } = useTranslation();
+  const location = useLocation();
   const navigate = useNavigate();
 
   const closeModal = () => {
-    navigate(-1);
+    const newPath = location.pathname.replace(/\/settings$/, '');
+    navigate(newPath);
   };
 
   const [showInterfaceSettings, setShowInterfaceSettings] = useState(false);

diff --git a/src/views/catalog/catalog-filters/catalog-filters.tsx b/src/views/catalog/catalog-filters/catalog-filters.tsx
@@ -43,7 +43,7 @@ const FiltersTable = () => {
         <tr>
           <th>{t('order')}</th>
           <th>{t('enable')}</th>
-          <th>{t('pattern')}</th>
+          <th>{t('text')}</th>
           <th>{t('delete')}</th>
         </tr>
       </thead>