Skip to content

Commit

Permalink
Merge pull request #340 from plebbit/development
Browse files Browse the repository at this point in the history
Development
  • Loading branch information
plebeius-eth authored Apr 26, 2024
2 parents 328e3a0 + 18a63df commit d2e9276
Show file tree
Hide file tree
Showing 54 changed files with 493 additions and 146 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"dependencies": {
"@capacitor/app": "1.1.1",
"@floating-ui/react": "0.26.1",
"@plebbit/plebbit-react-hooks": "https://github.com/plebbit/plebbit-react-hooks.git#176d361ce4dfecc4fdc3c3675a9777099d47d8ce",
"@plebbit/plebbit-react-hooks": "https://github.com/plebbit/plebbit-react-hooks.git#6d0d38ad52ce77715cb05be6cec55d691f5f013d",
"@testing-library/jest-dom": "5.14.1",
"@testing-library/react": "13.0.0",
"@testing-library/user-event": "13.2.1",
Expand Down
4 changes: 3 additions & 1 deletion public/translations/ar/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -300,5 +300,7 @@
"undelete": "إلغاء الحذف",
"loading_comments": "تحميل التعليقات",
"you_blocked_community": "لقد حظرت هذه المجتمعة",
"show": "اظهر"
"show": "اظهر",
"plebbit_options": "خيارات plebbit",
"general": "عام"
}
4 changes: 3 additions & 1 deletion public/translations/bn/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -300,5 +300,7 @@
"undelete": "মুছে ফেলা প্রত্যাহার",
"loading_comments": "মন্তব্য লোড হচ্ছে",
"you_blocked_community": "আপনি এই সম্প্রদায়টি ব্লক করেছেন",
"show": "দেখান"
"show": "দেখান",
"plebbit_options": "প্লেবিট বিকল্প",
"general": "সাধারণ"
}
4 changes: 3 additions & 1 deletion public/translations/cs/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -300,5 +300,7 @@
"undelete": "Obnovit smazání",
"loading_comments": "Načítání komentářů",
"you_blocked_community": "Zablokovali jste tuto komunitu",
"show": "ukázat"
"show": "ukázat",
"plebbit_options": "plebbit možnosti",
"general": "obecné"
}
4 changes: 3 additions & 1 deletion public/translations/da/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -300,5 +300,7 @@
"undelete": "Gendan sletning",
"loading_comments": "Indlæser kommentarer",
"you_blocked_community": "Du har blokeret dette fællesskab",
"show": "vise"
"show": "vise",
"plebbit_options": "plebbit indstillinger",
"general": "almindelig"
}
4 changes: 3 additions & 1 deletion public/translations/de/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -300,5 +300,7 @@
"undelete": "Wiederherstellen",
"loading_comments": "Lade Kommentare",
"you_blocked_community": "Du hast diese Gemeinschaft blockiert",
"show": "zeigen"
"show": "zeigen",
"plebbit_options": "plebbit optionen",
"general": "allgemein"
}
4 changes: 3 additions & 1 deletion public/translations/el/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -300,5 +300,7 @@
"undelete": "Ανάκτηση διαγραφής",
"loading_comments": "Φόρτωση σχολίων",
"you_blocked_community": "Έχετε αποκλείσει αυτή την κοινότητα",
"show": "εμφάνιση"
"show": "εμφάνιση",
"plebbit_options": "επιλογές plebbit",
"general": "γενικός"
}
4 changes: 3 additions & 1 deletion public/translations/en/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -300,5 +300,7 @@
"undelete": "Undelete",
"loading_comments": "Loading comments",
"you_blocked_community": "You blocked this community",
"show": "show"
"show": "show",
"plebbit_options": "plebbit options",
"general": "general"
}
4 changes: 3 additions & 1 deletion public/translations/es/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -300,5 +300,7 @@
"undelete": "Recuperar",
"loading_comments": "Cargando comentarios",
"you_blocked_community": "Has bloqueado esta comunidad",
"show": "mostrar"
"show": "mostrar",
"plebbit_options": "opciones plebbit",
"general": "general"
}
4 changes: 3 additions & 1 deletion public/translations/fa/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -300,5 +300,7 @@
"undelete": "بازیابی",
"loading_comments": "بارگذاری نظرات",
"you_blocked_community": "شما این انجمن را مسدود کرده‌اید",
"show": "نمایش"
"show": "نمایش",
"plebbit_options": "گزینه های plebbit",
"general": "عمومی"
}
4 changes: 3 additions & 1 deletion public/translations/fi/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -300,5 +300,7 @@
"undelete": "Palauta",
"loading_comments": "Ladataan kommentteja",
"you_blocked_community": "Olet estänyt tämän yhteisön",
"show": "näyttää"
"show": "näyttää",
"plebbit_options": "plebbit-vaihtoehdot",
"general": "yleinen"
}
4 changes: 3 additions & 1 deletion public/translations/fil/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -300,5 +300,7 @@
"undelete": "I-undelete",
"loading_comments": "Naglo-load ng mga komento",
"you_blocked_community": "I-block mo ang komunidad na ito",
"show": "ipakita"
"show": "ipakita",
"plebbit_options": "mga pagpipilian ng plebbit",
"general": "pangkalahatan"
}
4 changes: 3 additions & 1 deletion public/translations/fr/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -300,5 +300,7 @@
"undelete": "Récupérer",
"loading_comments": "Chargement des commentaires",
"you_blocked_community": "Vous avez bloqué cette communauté",
"show": "montrer"
"show": "montrer",
"plebbit_options": "options plebbit",
"general": "général"
}
4 changes: 3 additions & 1 deletion public/translations/he/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -300,5 +300,7 @@
"undelete": "שחזור מחיקה",
"loading_comments": "טוען תגובות",
"you_blocked_community": "חסמת את הקהילה הזו",
"show": "תצוגה"
"show": "תצוגה",
"plebbit_options": "אפשרויות plebbit",
"general": "כללי"
}
4 changes: 3 additions & 1 deletion public/translations/hi/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -300,5 +300,7 @@
"undelete": "डिलीट को वापस लाओ",
"loading_comments": "टिप्पणियाँ लोड हो रही हैं",
"you_blocked_community": "आपने इस समुदाय को ब्लॉक कर दिया है",
"show": "दिखाएँ"
"show": "दिखाएँ",
"plebbit_options": "plebbit विकल्प",
"general": "सामान्य"
}
4 changes: 3 additions & 1 deletion public/translations/hu/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -300,5 +300,7 @@
"undelete": "Visszaállítás",
"loading_comments": "Megjegyzések betöltése",
"you_blocked_community": "Blokkoltad ezt a közösséget",
"show": "mutat"
"show": "mutat",
"plebbit_options": "plebbit lehetőségek",
"general": "általános"
}
4 changes: 3 additions & 1 deletion public/translations/id/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -300,5 +300,7 @@
"undelete": "Batalkan penghapusan",
"loading_comments": "Memuat komentar",
"you_blocked_community": "Anda telah memblokir komunitas ini",
"show": "menunjukkan"
"show": "menunjukkan",
"plebbit_options": "opsi plebbit",
"general": "umum"
}
4 changes: 3 additions & 1 deletion public/translations/it/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -300,5 +300,7 @@
"undelete": "Annulla eliminazione",
"loading_comments": "Caricamento commenti",
"you_blocked_community": "Hai bloccato questa comunità",
"show": "mostra"
"show": "mostra",
"plebbit_options": "opzioni plebbit",
"general": "generali"
}
4 changes: 3 additions & 1 deletion public/translations/ja/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -300,5 +300,7 @@
"undelete": "削除を取り消す",
"loading_comments": "コメントを読み込み中",
"you_blocked_community": "このコミュニティをブロックしました",
"show": "表示"
"show": "表示",
"plebbit_options": "plebbitのオプション",
"general": "一般的な"
}
4 changes: 3 additions & 1 deletion public/translations/ko/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -300,5 +300,7 @@
"undelete": "삭제 취소",
"loading_comments": "댓글 로드 중",
"you_blocked_community": "이 커뮤니티를 차단했습니다",
"show": "보여주다"
"show": "보여주다",
"plebbit_options": "plebbit 옵션",
"general": "일반"
}
4 changes: 3 additions & 1 deletion public/translations/mr/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -300,5 +300,7 @@
"undelete": "डिलीट करा",
"loading_comments": "टिप्पणी लोड होत आहे",
"you_blocked_community": "तुम्ही ह्या समुदायाला ब्लॉक केलं आहे",
"show": "दाखवा"
"show": "दाखवा",
"plebbit_options": "प्लेबिट पर्याय",
"general": "सामान्य"
}
4 changes: 3 additions & 1 deletion public/translations/nl/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -300,5 +300,7 @@
"undelete": "Herstellen",
"loading_comments": "Reacties laden",
"you_blocked_community": "U hebt deze gemeenschap geblokkeerd",
"show": "tonen"
"show": "tonen",
"plebbit_options": "plebbit-opties",
"general": "algemeen"
}
4 changes: 3 additions & 1 deletion public/translations/no/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -300,5 +300,7 @@
"undelete": "Gjenopprette",
"loading_comments": "Laster inn kommentarer",
"you_blocked_community": "Du har blokkert dette fellesskapet",
"show": "vise"
"show": "vise",
"plebbit_options": "plebbit alternativer",
"general": "generell"
}
4 changes: 3 additions & 1 deletion public/translations/pl/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -300,5 +300,7 @@
"undelete": "Przywróć",
"loading_comments": "Ładowanie komentarzy",
"you_blocked_community": "Zablokowałeś tę społeczność",
"show": "pokazać"
"show": "pokazać",
"plebbit_options": "opcje plebbit",
"general": "ogólny"
}
4 changes: 3 additions & 1 deletion public/translations/pt/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -300,5 +300,7 @@
"undelete": "Recuperar",
"loading_comments": "Carregando comentários",
"you_blocked_community": "Você bloqueou esta comunidade",
"show": "mostrar"
"show": "mostrar",
"plebbit_options": "opções plebbit",
"general": "geral"
}
4 changes: 3 additions & 1 deletion public/translations/ro/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -300,5 +300,7 @@
"undelete": "Recuperare",
"loading_comments": "Se încarcă comentariile",
"you_blocked_community": "Ați blocat această comunitate",
"show": "arată"
"show": "arată",
"plebbit_options": "opțiuni plebbit",
"general": "general"
}
4 changes: 3 additions & 1 deletion public/translations/ru/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -300,5 +300,7 @@
"undelete": "Восстановить",
"loading_comments": "Загрузка комментариев",
"you_blocked_community": "Вы заблокировали это сообщество",
"show": "показать"
"show": "показать",
"plebbit_options": "опции plebbit",
"general": "общий"
}
4 changes: 3 additions & 1 deletion public/translations/sq/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -300,5 +300,7 @@
"undelete": "Rikuperimi",
"loading_comments": "Duke u ngarkuar komentet",
"you_blocked_community": "Ju keni bllokuar këtë komunitet",
"show": "shfaq"
"show": "shfaq",
"plebbit_options": "opsione plebbit",
"general": "i përgjithshëm"
}
4 changes: 3 additions & 1 deletion public/translations/sv/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -300,5 +300,7 @@
"undelete": "Ångra radering",
"loading_comments": "Laddar kommentarer",
"you_blocked_community": "Du har blockerat den här gemenskapen",
"show": "visa"
"show": "visa",
"plebbit_options": "plebbit-alternativ",
"general": "allmän"
}
4 changes: 3 additions & 1 deletion public/translations/te/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -300,5 +300,7 @@
"undelete": "తొలగించడం రద్దు చేయండి",
"loading_comments": "వ్యాఖ్యలను లోడ్ అవుతోంది",
"you_blocked_community": "ఈ సముదాయాన్ని మీరు నిరోధించారు",
"show": "చూపించు"
"show": "చూపించు",
"plebbit_options": "plebbit ఎంపికలు",
"general": "సాధారణ"
}
4 changes: 3 additions & 1 deletion public/translations/th/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -300,5 +300,7 @@
"undelete": "ยกเลิกการลบ",
"loading_comments": "กำลังโหลดความคิดเห็น",
"you_blocked_community": "คุณบล็อกชุมชนนี้แล้ว",
"show": "แสดง"
"show": "แสดง",
"plebbit_options": "ตัวเลือก plebbit",
"general": "ทั่วไป"
}
4 changes: 3 additions & 1 deletion public/translations/tr/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -300,5 +300,7 @@
"undelete": "Silme işlemini geri al",
"loading_comments": "Yorumlar yükleniyor",
"you_blocked_community": "Bu topluluğu engellediniz",
"show": "göstermek"
"show": "göstermek",
"plebbit_options": "plebbit seçenekleri",
"general": "genel"
}
4 changes: 3 additions & 1 deletion public/translations/uk/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -300,5 +300,7 @@
"undelete": "Скасувати видалення",
"loading_comments": "Завантаження коментарів",
"you_blocked_community": "Ви заблокували цю спільноту",
"show": "показати"
"show": "показати",
"plebbit_options": "плебіт варіанти",
"general": "загальний"
}
4 changes: 3 additions & 1 deletion public/translations/ur/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -300,5 +300,7 @@
"undelete": "حذف کو واپس لائیں",
"loading_comments": "تبصرے لوڈ ہو رہے ہیں",
"you_blocked_community": "آپ نے یہ سماج بلاک کر دی ہے",
"show": "دکھائیں"
"show": "دکھائیں",
"plebbit_options": "پلیبٹ اختیارات",
"general": "عام"
}
4 changes: 3 additions & 1 deletion public/translations/vi/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -300,5 +300,7 @@
"undelete": "Khôi phục",
"loading_comments": "Đang tải bình luận",
"you_blocked_community": "Bạn đã chặn cộng đồng này",
"show": "hiển thị"
"show": "hiển thị",
"plebbit_options": "tùy chọn plebbit",
"general": "chung"
}
4 changes: 3 additions & 1 deletion public/translations/zh/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -300,5 +300,7 @@
"undelete": "取消删除",
"loading_comments": "正在加载评论",
"you_blocked_community": "您已封锁了此社区",
"show": "显示"
"show": "显示",
"plebbit_options": "plebbit选项",
"general": "一般"
}
1 change: 1 addition & 0 deletions src/app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ const App = () => {

<Route path='/settings' element={<Settings />} />
<Route path='/p/:subplebbitAddress/settings' element={<SubplebbitSettings />} />
<Route path='/settings/plebbit-options' element={<Settings />} />

<Route path='/profile/about' element={<About />} />

Expand Down
2 changes: 1 addition & 1 deletion src/components/header/header.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
.tabMenu li .choice {
color: var(--text-primary);
background-color: var(--background-secondary);
border-bottom: 0px solid var(--border-primary);
border-bottom: 1px solid var(--border-primary);
}

.tabs {
Expand Down
Loading

0 comments on commit d2e9276

Please sign in to comment.