Skip to content

Commit

Permalink
Prettified Code!
Browse files Browse the repository at this point in the history
  • Loading branch information
@mkue @actions-user
mkue authored and actions-user committed Nov 16, 2023
1 parent e5dc747 commit a0eb6e7
Show file tree
Hide file tree
Showing 4 changed files with 106 additions and 119 deletions.
100 changes: 50 additions & 50 deletions shared/locales/de/website-transparency.json
View file
Original file line number Diff line number Diff line change
@@ -1,52 +1,52 @@
{
"amount": "{{ value, currency }}",
"section-1": {
"title-1": "Transparenz schafft Vertrauen.",
"title-2": "Vertrauen schafft Solidarität.",
"since-march-2020": "Seit März 2020",
"totalContributions": "{{ contributorCount }} Spender:innen spendeten insgesamt {{value, currency}}",
"totalPayments": "{{ value }} Auszahlungen direkt aufs Mobiltelefon",
"totalRecipients": "{{ value }} Empfänger:innen wurden aufgenommen in unserem 3-Jahresprogramm"
},
"section-2": {
"title": "Wie wird Social Income finanziert?",
"donations": "Spenden",
"amount-since-march-2020": "Insgesamt seit März 2020",
"contributions-from": "{{ value, currency }} von",
"individuals": "{{ count }} Individuen",
"institutions": "{{ count }} Institutionen",
"past-payouts": "Vergangene Auszahlungen: {{ value, currency }}",
"future-payouts": "Künftige Auszahlungen: {{ value, currency }}",
"past-costs": "Bereits verwendet um Kosten zu decken: {{ value, currency }}",
"future-costs": "Um kommende Kosten zu decken: {{ value, currency }}"
},
"section-3": {
"title": "Von wo kommen die Spender:innen?",
"subtitle": "Wir erhalten Spenden aus {{ value }} Ländern.",
"country-amount": "{{ value, currency }} von {{ contributorsCount }} Spender:innen",
"all-countries": "Alle Länder anzeigen"
},
"section-4": {
"title": "Wie werden Spenden ausbezahlt?",
"subtitle": "Individuelle Spenden werden zu 100% ausbezahlt. Institutionell Spenden werden gebraucht um die operativen Kosten zu decken.",
"amount-since-march-2020": "Insgesamt seit März 2020",
"expenses": "Ausgaben",
"payments-total": "{{ value, currency }} ausbezahlt an {{ recipientsCount }} Empfänger:innen",
"payments-last-month": "Letzter Monat: {{ value, currency }} an {{ recipientsCount }} Empfänger:innen",
"future-payouts": "Künftige Auszahlungen: {{ value, currency }}",
"total-costs": "{{ value, currency }} Gebühren und Kosten",
"payment-fees": "Zustellgebühren: {{ value, currency }}",
"payment-fees-tooltip": "Dies beinhaltet die Transaktionsgebühren von Zahlungsportalen wie Stripe.",
"transaction-fees": "Transaktionsgebühren: {{ value, currency }}",
"transaction-fees-tooltip": "Dies beinhaltet Kontogebühren, Geldwechselgebühren, sowie Währungsverluste.",
"operating-costs": "Operative Kosten: {{ value, currency }}",
"operating-costs-tooltip": "Dies beinhaltet Kosten für Saläre, Marketing, Fundraising.",
"other-costs": "Andere Kosten: {{ value, currency }}",
"other-costs-tooltip": "??",
"reserves": "Reserven",
"covers-payments": "Reserven decken Auszahlungen für",
"covers-payments-1": "{{ recipientsCount }} Empfänger:innen für {{ monthsCount }} Monate",
"covers-payments-2": "{{ recipientsCount }} Empfänger:innen für einen Monat",
"reserves-text": "Wir halten liquide Mittel um Zahlungen über mehrere Monate ohne Neugeld finanzieren zu können."
}
"amount": "{{ value, currency }}",
"section-1": {
"title-1": "Transparenz schafft Vertrauen.",
"title-2": "Vertrauen schafft Solidarität.",
"since-march-2020": "Seit März 2020",
"totalContributions": "{{ contributorCount }} Spender:innen spendeten insgesamt {{value, currency}}",
"totalPayments": "{{ value }} Auszahlungen direkt aufs Mobiltelefon",
"totalRecipients": "{{ value }} Empfänger:innen wurden aufgenommen in unserem 3-Jahresprogramm"
},
"section-2": {
"title": "Wie wird Social Income finanziert?",
"donations": "Spenden",
"amount-since-march-2020": "Insgesamt seit März 2020",
"contributions-from": "{{ value, currency }} von",
"individuals": "{{ count }} Individuen",
"institutions": "{{ count }} Institutionen",
"past-payouts": "Vergangene Auszahlungen: {{ value, currency }}",
"future-payouts": "Künftige Auszahlungen: {{ value, currency }}",
"past-costs": "Bereits verwendet um Kosten zu decken: {{ value, currency }}",
"future-costs": "Um kommende Kosten zu decken: {{ value, currency }}"
},
"section-3": {
"title": "Von wo kommen die Spender:innen?",
"subtitle": "Wir erhalten Spenden aus {{ value }} Ländern.",
"country-amount": "{{ value, currency }} von {{ contributorsCount }} Spender:innen",
"all-countries": "Alle Länder anzeigen"
},
"section-4": {
"title": "Wie werden Spenden ausbezahlt?",
"subtitle": "Individuelle Spenden werden zu 100% ausbezahlt. Institutionell Spenden werden gebraucht um die operativen Kosten zu decken.",
"amount-since-march-2020": "Insgesamt seit März 2020",
"expenses": "Ausgaben",
"payments-total": "{{ value, currency }} ausbezahlt an {{ recipientsCount }} Empfänger:innen",
"payments-last-month": "Letzter Monat: {{ value, currency }} an {{ recipientsCount }} Empfänger:innen",
"future-payouts": "Künftige Auszahlungen: {{ value, currency }}",
"total-costs": "{{ value, currency }} Gebühren und Kosten",
"payment-fees": "Zustellgebühren: {{ value, currency }}",
"payment-fees-tooltip": "Dies beinhaltet die Transaktionsgebühren von Zahlungsportalen wie Stripe.",
"transaction-fees": "Transaktionsgebühren: {{ value, currency }}",
"transaction-fees-tooltip": "Dies beinhaltet Kontogebühren, Geldwechselgebühren, sowie Währungsverluste.",
"operating-costs": "Operative Kosten: {{ value, currency }}",
"operating-costs-tooltip": "Dies beinhaltet Kosten für Saläre, Marketing, Fundraising.",
"other-costs": "Andere Kosten: {{ value, currency }}",
"other-costs-tooltip": "??",
"reserves": "Reserven",
"covers-payments": "Reserven decken Auszahlungen für",
"covers-payments-1": "{{ recipientsCount }} Empfänger:innen für {{ monthsCount }} Monate",
"covers-payments-2": "{{ recipientsCount }} Empfänger:innen für einen Monat",
"reserves-text": "Wir halten liquide Mittel um Zahlungen über mehrere Monate ohne Neugeld finanzieren zu können."
}
}
100 changes: 50 additions & 50 deletions shared/locales/en/website-transparency.json
View file
Original file line number Diff line number Diff line change
@@ -1,52 +1,52 @@
{
"amount": "{{ value, currency }}",
"section-1": {
"title-1": "Transparency builds trust.",
"title-2": "Trust builds solidarity.",
"since-march-2020": "Since March 2020",
"totalContributions": "{{ contributorCount }} contributors donated a total of {{value, currency}}",
"totalPayments": "{{ value }} mobile money payments made",
"totalRecipients": "{{ value }} recipients enrolled for a 3-year program"
},
"section-2": {
"title": "How is Social Income funded?",
"donations": "Donations",
"amount-since-march-2020": "Total amount since March 2020",
"contributions-from": "{{ value, currency }} contributions from",
"individuals": "{{ count }} Individuals",
"institutions": "{{ count }} Institutions",
"past-payouts": "Already paid out: {{ value, currency }}",
"future-payouts": "To be paid out: {{ value, currency }}",
"past-costs": "Already used to cover costs: {{ value, currency }}",
"future-costs": "To be used to cover costs: {{ value, currency }}"
},
"section-3": {
"title": "Where are our contributors from?",
"subtitle": "We received contributions from {{ value }} countries.",
"country-amount": "{{ value, currency }} from {{ contributorsCount }} contributors",
"all-countries": "Show All Countries"
},
"section-4": {
"title": "How are the funds used?",
"subtitle": "Recurring individual donations are always paid out to 100%. Institutional donations are used to cover our operational costs.",
"amount-since-march-2020": "Total amount since March 2020",
"expenses": "Expenses",
"payments-total": "{{ value, currency }} paid out to {{ recipientsCount }} recipients",
"payments-last-month": "Last month: {{ value, currency }} to {{ recipientsCount }} recipients",
"future-payouts": "To be paid out: {{ value, currency }}",
"total-costs": "{{ value, currency }} fees and costs",
"payment-fees": "Payment fees: {{ value, currency }}",
"payment-fees-tooltip": "This includes transaction fees charged by payment providers like Stripe.",
"transaction-fees": "Transaction fees: {{ value, currency }}",
"transaction-fees-tooltip": "This includes bank account fees, exchange rate fees, or foreign currency losses.",
"operating-costs": "Operating costs: {{ value, currency }}",
"operating-costs-tooltip": "This includes salaries, fundraising, and other costs to run the organization.",
"other-costs": "Other costs: {{ value, currency }}",
"other-costs-tooltip": "??",
"reserves": "Reserves",
"covers-payments": "This covers payments for",
"covers-payments-1": "{{ recipientsCount }} recipients for {{ monthsCount }} months",
"covers-payments-2": "{{ recipientsCount }} recipients for 1 month",
"reserves-text": "We keep liquid funds to make sure we can cover payments over multiple months without being dependent on contributions."
}
"amount": "{{ value, currency }}",
"section-1": {
"title-1": "Transparency builds trust.",
"title-2": "Trust builds solidarity.",
"since-march-2020": "Since March 2020",
"totalContributions": "{{ contributorCount }} contributors donated a total of {{value, currency}}",
"totalPayments": "{{ value }} mobile money payments made",
"totalRecipients": "{{ value }} recipients enrolled for a 3-year program"
},
"section-2": {
"title": "How is Social Income funded?",
"donations": "Donations",
"amount-since-march-2020": "Total amount since March 2020",
"contributions-from": "{{ value, currency }} contributions from",
"individuals": "{{ count }} Individuals",
"institutions": "{{ count }} Institutions",
"past-payouts": "Already paid out: {{ value, currency }}",
"future-payouts": "To be paid out: {{ value, currency }}",
"past-costs": "Already used to cover costs: {{ value, currency }}",
"future-costs": "To be used to cover costs: {{ value, currency }}"
},
"section-3": {
"title": "Where are our contributors from?",
"subtitle": "We received contributions from {{ value }} countries.",
"country-amount": "{{ value, currency }} from {{ contributorsCount }} contributors",
"all-countries": "Show All Countries"
},
"section-4": {
"title": "How are the funds used?",
"subtitle": "Recurring individual donations are always paid out to 100%. Institutional donations are used to cover our operational costs.",
"amount-since-march-2020": "Total amount since March 2020",
"expenses": "Expenses",
"payments-total": "{{ value, currency }} paid out to {{ recipientsCount }} recipients",
"payments-last-month": "Last month: {{ value, currency }} to {{ recipientsCount }} recipients",
"future-payouts": "To be paid out: {{ value, currency }}",
"total-costs": "{{ value, currency }} fees and costs",
"payment-fees": "Payment fees: {{ value, currency }}",
"payment-fees-tooltip": "This includes transaction fees charged by payment providers like Stripe.",
"transaction-fees": "Transaction fees: {{ value, currency }}",
"transaction-fees-tooltip": "This includes bank account fees, exchange rate fees, or foreign currency losses.",
"operating-costs": "Operating costs: {{ value, currency }}",
"operating-costs-tooltip": "This includes salaries, fundraising, and other costs to run the organization.",
"other-costs": "Other costs: {{ value, currency }}",
"other-costs-tooltip": "??",
"reserves": "Reserves",
"covers-payments": "This covers payments for",
"covers-payments-1": "{{ recipientsCount }} recipients for {{ monthsCount }} months",
"covers-payments-2": "{{ recipientsCount }} recipients for 1 month",
"reserves-text": "We keep liquid funds to make sure we can cover payments over multiple months without being dependent on contributions."
}
}
12 changes: 3 additions & 9 deletions website/src/app/[lang]/[region]/(website)/transparency/finances/[currency]/info-card.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,9 @@ type TransparencyCardProps = {
secondContent?: ReactElement;
};

export function InfoCard({
sectionTitle,
title,
text,
firstIcon,
firstContent,
secondIcon,
secondContent,
}: TransparencyCardProps) {
export function InfoCard(
{ sectionTitle, title, text, firstIcon, firstContent, secondIcon, secondContent }: TransparencyCardProps,
) {
return (
<Card>
<CardContent className="grid grid-cols-1 items-center divide-y py-8 md:grid-cols-2 md:divide-x md:divide-y-0">
Expand Down
13 changes: 3 additions & 10 deletions website/src/components/navbar/navbar-client.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,16 +62,9 @@ type NavbarProps = {
}[];
} & DefaultParams;

export function NavbarClient({
lang,
region,
translations,
languages,
regions,
currencies,
navigation = [],
showNavigation = true,
}: NavbarProps) {
export function NavbarClient(
{ lang, region, translations, languages, regions, currencies, navigation = [], showNavigation = true }: NavbarProps,
) {
const [isOpen, setIsOpen] = useState(false);

const i18nDialog = (
Expand Down

0 comments on commit a0eb6e7

Please sign in to comment.