Merge pull request #805 from cultuurnet/feature/III-5845

III-5845 - Organizer form: change title of location tab to 'Adres'
cultuurnet · Oct 12, 2023 · c65ced5 · c65ced5
2 parents 6c1abe5 + 11218ff
commit c65ced5
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 6 deletions.
diff --git a/src/i18n/de.json b/src/i18n/de.json
@@ -457,7 +457,8 @@
         "tip": "Geben Sie eine enthusiastische Beschreibung Ihrer Organisation, die sich speziell an Schulen und Lehrer richtet. Diese Beschreibung wird nur auf cultuurkuur.be, der Plattform für Bildung und Kultur, erscheinen."
       },
       "location": {
-        "title": "Standort"
+        "title": "Standort",
+        "title_organizer": "Adresse"
       },
       "place": {
         "add_new_label": "Ort nicht gefunden? Neuen Standort hinzufügen"

diff --git a/src/i18n/fr.json b/src/i18n/fr.json
@@ -459,7 +459,8 @@
         "tip": "Donnez une description enthousiaste de votre organisation, destinée spécifiquement aux écoles et aux enseignants. Cette description n'apparaîtra que sur cultuurkuur.be, la plateforme de l'éducation et de la culture."
       },
       "location": {
-        "title": "Lieu"
+        "title": "Lieu",
+        "title_organizer": "Adresse"
       },
       "place": {
         "add_new_label": "Lieu introuvable ? Ajouter un nouveau lieu"

diff --git a/src/i18n/nl.json b/src/i18n/nl.json
@@ -459,7 +459,8 @@
         "tip": "Geef een enthousiaste omschrijving van je organisatie, specifiek gericht naar scholen en leerkrachten. Deze beschrijving verschijnt enkel op cultuurkuur.be, het platform voor onderwijs en cultuur."
       },
       "location": {
-        "title": "Locatie"
+        "title": "Locatie",
+        "title_organizer": "Adres"
       },
       "place": {
         "add_new_label": "Locatie niet gevonden? Nieuwe locatie toevoegen"

diff --git a/src/pages/steps/AdditionalInformationStep/AdditionalInformationStep.tsx b/src/pages/steps/AdditionalInformationStep/AdditionalInformationStep.tsx
@@ -65,6 +65,7 @@ type TabContentProps = {
 
 type TabConfig = {
   field: Field;
+  titleKey?: string;
   TabContent: FC<TabContentProps & { [prop: string]: unknown }>;
   shouldShowOn?: Values<typeof AdditionalInformationStepVariant>[];
   shouldInvalidate: boolean;
@@ -120,6 +121,7 @@ const tabConfigurations: TabConfig[] = [
   {
     field: Fields.LOCATION,
     TabContent: PhysicalLocationStep,
+    titleKey: 'create.additionalInformation.location.title_organizer',
     shouldInvalidate: false,
     shouldShowOn: [AdditionalInformationStepVariant.ORGANIZER],
   },
@@ -152,17 +154,23 @@ const tabConfigurations: TabConfig[] = [
 type TabTitleProps = InlineProps & {
   scope: Scope;
   field: Field;
+  titleKey?: string;
   validationStatus: ValidationStatus;
 };
 
 const TabTitle = ({
   scope,
   field,
   validationStatus,
+  titleKey,
   ...props
 }: TabTitleProps) => {
   const { t } = useTranslation();
 
+  const title = titleKey
+    ? t(titleKey)
+    : t(`create.additionalInformation.${field}.title`);
+
   return (
     <Inline spacing={3} {...getInlineProps(props)}>
       {validationStatus === ValidationStatus.SUCCESS && (
@@ -177,7 +185,7 @@ const TabTitle = ({
       <Text>
         {scope === ScopeTypes.ORGANIZERS && field === Fields.MEDIA
           ? t('organizers.create.step2.pictures.title')
-          : t(`create.additionalInformation.${field}.title`)}
+          : title}
       </Text>
     </Inline>
   );
@@ -273,6 +281,7 @@ const AdditionalInformationStep = ({
           ({
             shouldShowOn,
             field,
+            titleKey,
             shouldInvalidate,
             TabContent,
             stepProps,
@@ -298,6 +307,7 @@ const AdditionalInformationStep = ({
                   <TabTitle
                     scope={scope}
                     field={field}
+                    titleKey={titleKey}
                     validationStatus={validatedFields[field]}
                   />
                 }

diff --git a/src/pages/steps/AdditionalInformationStep/PhysicalLocationStep.tsx b/src/pages/steps/AdditionalInformationStep/PhysicalLocationStep.tsx
@@ -6,7 +6,7 @@ import {
   TabContentProps,
   ValidationStatus,
 } from '@/pages/steps/AdditionalInformationStep/AdditionalInformationStep';
-import { isLocationSet, LocationStep } from '@/pages/steps/LocationStep';
+import { LocationStep } from '@/pages/steps/LocationStep';
 import { StepProps } from '@/pages/steps/Steps';
 import { StackProps } from '@/ui/Stack';
 

diff --git a/src/test/e2e/create-organizer.spec.ts b/src/test/e2e/create-organizer.spec.ts
@@ -56,7 +56,7 @@ test('create an organizer', async ({ baseURL, page }) => {
   await page.getByRole('button', { name: 'Uploaden' }).click();
   await page.getByText(`© ${dummyOrganizer.image.copyright}`).click();
 
-  await page.getByRole('tab', { name: 'Locatie' }).click();
+  await page.getByRole('tab', { name: 'Adres' }).click();
   await page.getByLabel('Gemeente').click();
   await page.getByLabel('Gemeente').fill(dummyOrganizer.location.municipality);
   await page.getByLabel(dummyOrganizer.location.municipality).click();