Skip to content

Commit

Permalink
Merge pull request #437 from plebbit/development
Browse files Browse the repository at this point in the history 
Development
  • Loading branch information
@plebeius-eth
plebeius-eth authored Dec 4, 2024
2 parents d94d87a + b8ebef0 commit 040d7fb
Show file tree
Hide file tree
Showing 51 changed files with 271 additions and 134 deletions.
3 changes: 2 additions & 1 deletion public/translations/ar/default.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -322,5 +322,6 @@
"create_new_account": "<1>إنشاء</1> حساب جديد",
"wallet_number": "المحفظة #{{index}}",
"view_more": "عرض المزيد",
"submit_community": "قدم مجتمعك"
"submit_community": "قدم مجتمعك",
"hide_avatars_from_replies": "إخفاء الصور الرمزية من الردود"
}
3 changes: 2 additions & 1 deletion public/translations/bn/default.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -322,5 +322,6 @@
"create_new_account": "<1>নতুন তৈরি করুন</1> অ্যাকাউন্ট",
"wallet_number": "ওয়ালেট #{{index}}",
"view_more": "আরও দেখুন",
"submit_community": "আপনার সম্প্রদায় জমা দিন"
"submit_community": "আপনার সম্প্রদায় জমা দিন",
"hide_avatars_from_replies": "প্রতিক্রিয়া থেকে অ্যাভাটারগুলি লুকান"
}
3 changes: 2 additions & 1 deletion public/translations/cs/default.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -322,5 +322,6 @@
"create_new_account": "<1>vytvořit</1> nový účet",
"wallet_number": "peněženka #{{index}}",
"view_more": "zobrazit více",
"submit_community": "Odešlete svou komunitu"
"submit_community": "Odešlete svou komunitu",
"hide_avatars_from_replies": "Skrýt avatary v odpovědích"
}
3 changes: 2 additions & 1 deletion public/translations/da/default.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -322,5 +322,6 @@
"create_new_account": "<1>oprette</1> en ny konto",
"wallet_number": "tegneboks #{{index}}",
"view_more": "se mere",
"submit_community": "Indsend dit fællesskab"
"submit_community": "Indsend dit fællesskab",
"hide_avatars_from_replies": "Skjul avatarer fra svar"
}
3 changes: 2 additions & 1 deletion public/translations/de/default.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -322,5 +322,6 @@
"create_new_account": "<1>erstelle</1> ein neues Konto",
"wallet_number": "Wallet #{{index}}",
"view_more": "mehr anzeigen",
"submit_community": "Reichen Sie Ihre Gemeinschaft ein"
"submit_community": "Reichen Sie Ihre Gemeinschaft ein",
"hide_avatars_from_replies": "Avatare in Antworten ausblenden"
}
3 changes: 2 additions & 1 deletion public/translations/el/default.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -322,5 +322,6 @@
"create_new_account": "<1>δημιουργία</1> νέου λογαριασμού",
"wallet_number": "πορτοφόλι #{{index}}",
"view_more": "δείτε περισσότερα",
"submit_community": "Υποβάλετε την κοινότητά σας"
"submit_community": "Υποβάλετε την κοινότητά σας",
"hide_avatars_from_replies": "Απόκρυψη avatar από τις απαντήσεις"
}
3 changes: 2 additions & 1 deletion public/translations/en/default.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -322,5 +322,6 @@
"create_new_account": "<1>create</1> a new account",
"wallet_number": "wallet #{{index}}",
"view_more": "view more",
"submit_community": "Submit your community"
"submit_community": "Submit your community",
"hide_avatars_from_replies": "Hide avatars from replies"
}
3 changes: 2 additions & 1 deletion public/translations/es/default.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -322,5 +322,6 @@
"create_new_account": "<1>crear</1> una nueva cuenta",
"wallet_number": "billetera #{{index}}",
"view_more": "ver más",
"submit_community": "Envía tu comunidad"
"submit_community": "Envía tu comunidad",
"hide_avatars_from_replies": "Ocultar avatares de las respuestas"
}
3 changes: 2 additions & 1 deletion public/translations/fa/default.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -322,5 +322,6 @@
"create_new_account": "<1>ایجاد</1> یک حساب جدید",
"wallet_number": "کیف پول #{{index}}",
"view_more": "مشاهده بیشتر",
"submit_community": "جامعه خود را ارسال کنید"
"submit_community": "جامعه خود را ارسال کنید",
"hide_avatars_from_replies": "تصاویر پروفایل را از پاسخ‌ها پنهان کن"
}
3 changes: 2 additions & 1 deletion public/translations/fi/default.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -322,5 +322,6 @@
"create_new_account": "<1>luo</1> uusi tili",
"wallet_number": "lompakko #{{index}}",
"view_more": "näytä lisää",
"submit_community": "Lähetä yhteisösi"
"submit_community": "Lähetä yhteisösi",
"hide_avatars_from_replies": "Piilota avatarit vastauksista"
}
3 changes: 2 additions & 1 deletion public/translations/fil/default.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -322,5 +322,6 @@
"create_new_account": "<1>lumikha</1> ng bagong account",
"wallet_number": "wallet #{{index}}",
"view_more": "tingnan pa",
"submit_community": "I-submit ang iyong komunidad"
"submit_community": "I-submit ang iyong komunidad",
"hide_avatars_from_replies": "Itago ang mga avatar mula sa mga sagot"
}
3 changes: 2 additions & 1 deletion public/translations/fr/default.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -322,5 +322,6 @@
"create_new_account": "<1>créer</1> un nouveau compte",
"wallet_number": "portefeuille #{{index}}",
"view_more": "voir plus",
"submit_community": "Soumettez votre communauté"
"submit_community": "Soumettez votre communauté",
"hide_avatars_from_replies": "Cacher les avatars des réponses"
}
3 changes: 2 additions & 1 deletion public/translations/he/default.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -322,5 +322,6 @@
"create_new_account": "<1>צור</1> חשבון חדש",
"wallet_number": "ארנק #{{index}}",
"view_more": "ראה עוד",
"submit_community": "שלח את הקהילה שלך"
"submit_community": "שלח את הקהילה שלך",
"hide_avatars_from_replies": "הסתרת תמונות פרופיל בתשובות"
}
3 changes: 2 additions & 1 deletion public/translations/hi/default.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -322,5 +322,6 @@
"create_new_account": "<1>नया बनाएं</1> खाता",
"wallet_number": "वॉलेट #{{index}}",
"view_more": "और देखें",
"submit_community": "अपनी समुदाय सबमिट करें"
"submit_community": "अपनी समुदाय सबमिट करें",
"hide_avatars_from_replies": "उत्तर से अवतार छुपाएं"
}
3 changes: 2 additions & 1 deletion public/translations/hu/default.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -322,5 +322,6 @@
"create_new_account": "<1>hozzon létre</1> egy új fiókot",
"wallet_number": "tárca #{{index}}",
"view_more": "több megtekintése",
"submit_community": "Küldje el közösségét"
"submit_community": "Küldje el közösségét",
"hide_avatars_from_replies": "Rejtse el az avatarokat a válaszokból"
}
3 changes: 2 additions & 1 deletion public/translations/id/default.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -322,5 +322,6 @@
"create_new_account": "<1>buat</1> akun baru",
"wallet_number": "dompet #{{index}}",
"view_more": "lihat lebih banyak",
"submit_community": "Kirim komunitas Anda"
"submit_community": "Kirim komunitas Anda",
"hide_avatars_from_replies": "Sembunyikan avatar dari balasan"
}
3 changes: 2 additions & 1 deletion public/translations/it/default.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -322,5 +322,6 @@
"create_new_account": "<1>crea</1> un nuovo account",
"wallet_number": "wallet #{{index}}",
"view_more": "altri",
"submit_community": "Invia la tua comunità"
"submit_community": "Invia la tua comunità",
"hide_avatars_from_replies": "Nascondi avatar da commenti"
}
3 changes: 2 additions & 1 deletion public/translations/ja/default.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -322,5 +322,6 @@
"create_new_account": "<1>新しい</1>アカウントを作成",
"wallet_number": "ウォレット #{{index}}",
"view_more": "もっと見る",
"submit_community": "コミュニティを提出してください"
"submit_community": "コミュニティを提出してください",
"hide_avatars_from_replies": "返信からアバターを非表示にする"
}
3 changes: 2 additions & 1 deletion public/translations/ko/default.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -322,5 +322,6 @@
"create_new_account": "<1>새로 만들기</1> 계정",
"wallet_number": "지갑 #{{index}}",
"view_more": "더보기",
"submit_community": "커뮤니티를 제출하세요"
"submit_community": "커뮤니티를 제출하세요",
"hide_avatars_from_replies": "답글에서 아바타 숨기기"
}
3 changes: 2 additions & 1 deletion public/translations/mr/default.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -322,5 +322,6 @@
"create_new_account": "<1>नवीन तयार करा</1> खाता",
"wallet_number": "वॉलेट #{{index}}",
"view_more": "अधिक पाहा",
"submit_community": "तुमच्या समुदायाला सबमिट करा"
"submit_community": "तुमच्या समुदायाला सबमिट करा",
"hide_avatars_from_replies": "उत्तरांमधून अवतार लपवा"
}
3 changes: 2 additions & 1 deletion public/translations/nl/default.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -322,5 +322,6 @@
"create_new_account": "<1>maak</1> een nieuw account aan",
"wallet_number": "portemonnee #{{index}}",
"view_more": "meer bekijken",
"submit_community": "Dien uw gemeenschap in"
"submit_community": "Dien uw gemeenschap in",
"hide_avatars_from_replies": "Verberg avatars van reacties"
}
3 changes: 2 additions & 1 deletion public/translations/no/default.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -322,5 +322,6 @@
"create_new_account": "<1>opprett</1> en ny konto",
"wallet_number": "lommebok #{{index}}",
"view_more": "vis mer",
"submit_community": "Send inn ditt fellesskap"
"submit_community": "Send inn ditt fellesskap",
"hide_avatars_from_replies": "Skjul avatarer fra svar"
}
3 changes: 2 additions & 1 deletion public/translations/pl/default.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -322,5 +322,6 @@
"create_new_account": "<1>stwórz</1> nowe konto",
"wallet_number": "portfel #{{index}}",
"view_more": "zobacz więcej",
"submit_community": "Prześlij swoją społeczność"
"submit_community": "Prześlij swoją społeczność",
"hide_avatars_from_replies": "Ukryj avatary w odpowiedziach"
}
3 changes: 2 additions & 1 deletion public/translations/pt/default.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -322,5 +322,6 @@
"create_new_account": "<1>criar</1> uma nova conta",
"wallet_number": "carteira #{{index}}",
"view_more": "ver mais",
"submit_community": "Envie sua comunidade"
"submit_community": "Envie sua comunidade",
"hide_avatars_from_replies": "Esconder avatares das respostas"
}
3 changes: 2 additions & 1 deletion public/translations/ro/default.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -322,5 +322,6 @@
"create_new_account": "<1>creați</1> un cont nou",
"wallet_number": "portofel #{{index}}",
"view_more": "vezi mai mult",
"submit_community": "Trimite comunitatea ta"
"submit_community": "Trimite comunitatea ta",
"hide_avatars_from_replies": "Ascunde avatarele din răspunsuri"
}
3 changes: 2 additions & 1 deletion public/translations/ru/default.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -322,5 +322,6 @@
"create_new_account": "<1>создать</1> новую учетную запись",
"wallet_number": "кошелек #{{index}}",
"view_more": "смотреть больше",
"submit_community": "Отправьте ваше сообщество"
"submit_community": "Отправьте ваше сообщество",
"hide_avatars_from_replies": "Скрыть аватары в ответах"
}
3 changes: 2 additions & 1 deletion public/translations/sq/default.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -322,5 +322,6 @@
"create_new_account": "<1>krijo</1> një llogari të re",
"wallet_number": "portofol #{{index}}",
"view_more": "shiko më shumë",
"submit_community": "Dorëzo komunitetin tuaj"
"submit_community": "Dorëzo komunitetin tuaj",
"hide_avatars_from_replies": "Fshih avatarët nga përgjigjet"
}
3 changes: 2 additions & 1 deletion public/translations/sv/default.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -322,5 +322,6 @@
"create_new_account": "<1>skapa</1> ett nytt konto",
"wallet_number": "plånbok #{{index}}",
"view_more": "visa mer",
"submit_community": "Skicka in ditt samhälle"
"submit_community": "Skicka in ditt samhälle",
"hide_avatars_from_replies": "Dölj avatarer från svar"
}
3 changes: 2 additions & 1 deletion public/translations/te/default.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -322,5 +322,6 @@
"create_new_account": "<1>తరువాత</1> కొత్త ఖాతా",
"wallet_number": "వాలెట్ #{{index}}",
"view_more": "మరింత చూడండి",
"submit_community": "మీ కమ్యూనిటి పంపించండి"
"submit_community": "మీ కమ్యూనిటి పంపించండి",
"hide_avatars_from_replies": "ప్రతిస్పందనల నుండి అవతార్లను దాచు"
}
3 changes: 2 additions & 1 deletion public/translations/th/default.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -322,5 +322,6 @@
"create_new_account": "<1>สร้าง</1> บัญชีใหม่",
"wallet_number": "กระเป๋าเงิน #{{index}}",
"view_more": "ดูเพิ่มเติม",
"submit_community": "ส่งชุมชนของคุณ"
"submit_community": "ส่งชุมชนของคุณ",
"hide_avatars_from_replies": "ซ่อนอวาตาร์จากคำตอบ"
}
3 changes: 2 additions & 1 deletion public/translations/tr/default.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -322,5 +322,6 @@
"create_new_account": "<1>oluştur</1> yeni bir hesap",
"wallet_number": "cüzdan #{{index}}",
"view_more": "daha fazla görüntüle",
"submit_community": "Topluluğunuzu gönderin"
"submit_community": "Topluluğunuzu gönderin",
"hide_avatars_from_replies": "Yanıtlardan avatarları gizle"
}
3 changes: 2 additions & 1 deletion public/translations/uk/default.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -322,5 +322,6 @@
"create_new_account": "<1>створити</1> новий обліковий запис",
"wallet_number": "гаманець #{{index}}",
"view_more": "переглянути більше",
"submit_community": "Надішліть своє співтовариство"
"submit_community": "Надішліть своє співтовариство",
"hide_avatars_from_replies": "Сховати аватари в відповідях"
}
3 changes: 2 additions & 1 deletion public/translations/ur/default.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -322,5 +322,6 @@
"create_new_account": "<1>نیا بنائیں</1> اکاؤنٹ",
"wallet_number": "والٹ #{{index}}",
"view_more": "مزید دیکھیں",
"submit_community": "اپنی کمیونٹی جمع کروائیں"
"submit_community": "اپنی کمیونٹی جمع کروائیں",
"hide_avatars_from_replies": "جوابوں سے اوتار چھپائیں"
}
3 changes: 2 additions & 1 deletion public/translations/vi/default.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -322,5 +322,6 @@
"create_new_account": "<1>tạo</1> tài khoản mới",
"wallet_number": "ví #{{index}}",
"view_more": "xem thêm",
"submit_community": "Gửi cộng đồng của bạn"
"submit_community": "Gửi cộng đồng của bạn",
"hide_avatars_from_replies": "Ẩn avatar trong các câu trả lời"
}
3 changes: 2 additions & 1 deletion public/translations/zh/default.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -322,5 +322,6 @@
"create_new_account": "<1>创建</1>新账户",
"wallet_number": "钱包 #{{index}}",
"view_more": "查看更多",
"submit_community": "提交您的社区"
"submit_community": "提交您的社区",
"hide_avatars_from_replies": "隐藏回复中的头像"
}
3 changes: 1 addition & 2 deletions src/components/header/header.module.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,7 @@
width: 84px;
max-height: 26px;
margin-top: 16px;
margin-right: 5px;
padding-right: 1ex;
padding-right: 5px;
filter: var(--filter90);
}

Expand Down
6 changes: 3 additions & 3 deletions src/components/header/header.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ const Header = () => {
(isInProfileView && !isInHomeAboutView) ||
(isInAllView && !isInAllAboutView) ||
(isInAuthorView && !isInHomeAboutView);
const logoSrc = isInSubplebbitView ? suggested?.avatarUrl : 'assets/logo/seedit.png';
const logoSrc = isInSubplebbitView && suggested?.avatarUrl ? suggested?.avatarUrl : 'assets/logo/seedit.png';
const logoIsAvatar = isInSubplebbitView && suggested?.avatarUrl;
const logoLink = isInSubplebbitView ? `/p/${params.subplebbitAddress}` : isInProfileView ? '/profile' : '/';

Expand All @@ -377,10 +377,10 @@ const Header = () => {
>
<div className={styles.logoContainer}>
<Link to={logoLink} className={styles.logoLink}>
{(logoIsAvatar || (!isInSubplebbitView && !isInProfileView && !isInAuthorView)) && (
{(logoIsAvatar || (!isInSubplebbitView && !isInProfileView && !isInAuthorView) || (isInSubplebbitView && !suggested?.avatarUrl)) && (
<img className={`${logoIsAvatar ? styles.avatar : styles.logo}`} src={logoSrc} alt='' />
)}
{!isInSubplebbitView && !isInProfileView && !isInAuthorView && (
{((!isInSubplebbitView && !isInProfileView && !isInAuthorView) || (isInSubplebbitView && !suggested?.avatarUrl)) && (
<img src={`assets/logo/seedit-text-${theme === 'dark' ? 'dark' : 'light'}.svg`} className={styles.logoText} alt='' />
)}
</Link>
Expand Down
Loading

0 comments on commit 040d7fb

Please sign in to comment.