From ce1f721629534f9e06ac2f722059aa976c58aa5b Mon Sep 17 00:00:00 2001
From: Sophia Kuhlmann <sophia.kuhlmann@student.uni-luebeck.de>
Date: Tue, 1 Apr 2025 11:00:04 +0000
Subject: [PATCH] HOLI-11326 fix typos and change order on act page
---
core/i18n/locales/de.json | 9 ++++-----
core/i18n/locales/en.json | 1 -
core/screens/act/ActHome.tsx | 2 +-
core/screens/act/__tests__/ActHome.test.tsx | 10 +++++-----
4 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/core/i18n/locales/de.json b/core/i18n/locales/de.json
index 1e997edbb4..97db53fc38 100644
--- a/core/i18n/locales/de.json
+++ b/core/i18n/locales/de.json
@@ -5,14 +5,13 @@
"act.events.filter.heading": "Events filtern",
"act.events.filter.submitButton": "Events anzeigen",
"act.events.fromTo": "bis",
- "act.events.listing.partnerModal.headline": "Our volunteering partners",
- "act.events.listing.partnerModal.Gemeinschaftswerk Nachhaltigkeit.buttonText": "Besuche voltastics.com",
- "act.events.listing.partnerModal.Gemeinschaftswerk Nachhaltigkeit.headline": "Anerkennung für freiwilliges Engagement",
- "act.events.listing.partnerModal.Gemeinschaftswerk Nachhaltigkeit.text": "Wir begeistern Unternehmen und Freiwillige sich digital zu vernetzen, um freiwilliges Engagement sichtbarer zu machen und gegenseitige Unterstützung besser zu organisieren.",
+ "act.events.listing.partnerModal.Gemeinschaftswerk Nachhaltigkeit.buttonText": "Besuche gemeinschaftswerk-nachhaltigkeit.de",
+ "act.events.listing.partnerModal.Gemeinschaftswerk Nachhaltigkeit.headline": "Gemeinsam Zukunft gestalten",
+ "act.events.listing.partnerModal.Gemeinschaftswerk Nachhaltigkeit.text": "Wir vernetzen engagierte Menschen und Organisationen, die nachhaltige Projekte und umweltbewusste Lebensstile fördern. Mit sinnvollen Events unterstützt die Initiative den Wandel zu einer ressourcenschonenden Zukunft.",
"act.events.opportunities": "Events",
"act.events.partnerInfoRowText": "über Gemeinschaftswerk Nachhaltigkeit",
"act.events.showAll": "Weitere Events",
- "act.events.subline": "Erlebene Events mit Bedeutung",
+ "act.events.subline": "Finde passende Events",
"act.events.thumbnail.label": "Event Cover Bild",
"act.events.title": "Events",
"act.events.detail.organisationNameFallback": "Externe Initiative",
diff --git a/core/i18n/locales/en.json b/core/i18n/locales/en.json
index d6e606068d..9fe90b94e3 100644
--- a/core/i18n/locales/en.json
+++ b/core/i18n/locales/en.json
@@ -5,7 +5,6 @@
"act.events.filter.heading": "Filter events",
"act.events.filter.submitButton": "Show events",
"act.events.fromTo": "to",
- "act.events.listing.partnerModal.headline": "Our volunteering partners",
"act.events.listing.partnerModal.Gemeinschaftswerk Nachhaltigkeit.buttonText": "Visit gemeinschaftswerk-nachhaltigkeit.de",
"act.events.listing.partnerModal.Gemeinschaftswerk Nachhaltigkeit.headline": "Create the future together",
"act.events.listing.partnerModal.Gemeinschaftswerk Nachhaltigkeit.text": "We connect committed people and organizations who promote sustainable projects and eco-friendly lifestyles. Through meaningful events, the initiative supports the transition to a resource-conserving future.",
diff --git a/core/screens/act/ActHome.tsx b/core/screens/act/ActHome.tsx
index 40ffa28dee..9699515481 100644
--- a/core/screens/act/ActHome.tsx
+++ b/core/screens/act/ActHome.tsx
@@ -23,8 +23,8 @@ const { useParam } = createParamHooks<ActHomeParams>()
export const orderedSections = (selectedContentType?: string) => {
const sections = [
ActSectionType.VOLUNTEERING,
- ActSectionType.CHALLENGES,
ActSectionType.EVENTS,
+ ActSectionType.CHALLENGES,
ActSectionType.TASKS,
ActSectionType.DONATIONS,
]
diff --git a/core/screens/act/__tests__/ActHome.test.tsx b/core/screens/act/__tests__/ActHome.test.tsx
index 652a8fec20..fe64aa5111 100644
--- a/core/screens/act/__tests__/ActHome.test.tsx
+++ b/core/screens/act/__tests__/ActHome.test.tsx
@@ -21,12 +21,12 @@ jest.mock('@holi/core/screens/act/ActSection', () => {
})
const cases = [
- { section: undefined, order: ['VOLUNTEERING', 'CHALLENGES', 'EVENTS', 'TASKS', 'DONATIONS'] },
- { section: 'SPACE', order: ['VOLUNTEERING', 'CHALLENGES', 'EVENTS', 'TASKS', 'DONATIONS'] },
- { section: 'DONATIONS', order: ['DONATIONS', 'VOLUNTEERING', 'CHALLENGES', 'EVENTS', 'TASKS'] },
- { section: 'VOLUNTEERING', order: ['VOLUNTEERING', 'CHALLENGES', 'EVENTS', 'TASKS', 'DONATIONS'] },
+ { section: undefined, order: ['VOLUNTEERING', 'EVENTS', 'CHALLENGES', 'TASKS', 'DONATIONS'] },
+ { section: 'SPACE', order: ['VOLUNTEERING', 'EVENTS', 'CHALLENGES', 'TASKS', 'DONATIONS'] },
+ { section: 'DONATIONS', order: ['DONATIONS', 'VOLUNTEERING', 'EVENTS', 'CHALLENGES', 'TASKS'] },
+ { section: 'VOLUNTEERING', order: ['VOLUNTEERING', 'EVENTS', 'CHALLENGES', 'TASKS', 'DONATIONS'] },
{ section: 'CHALLENGES', order: ['CHALLENGES', 'VOLUNTEERING', 'EVENTS', 'TASKS', 'DONATIONS'] },
- { section: 'TASKS', order: ['TASKS', 'VOLUNTEERING', 'CHALLENGES', 'EVENTS', 'DONATIONS'] },
+ { section: 'TASKS', order: ['TASKS', 'VOLUNTEERING', 'EVENTS', 'CHALLENGES', 'DONATIONS'] },
]
describe('ActHome Section', () => {
--
GitLab