From aa098e95d17287c65f07c6d908dccd2061112830 Mon Sep 17 00:00:00 2001
From: Gabriel Bruno <gabriel.bruno@polymtl.ca>
Date: Wed, 27 Nov 2024 13:28:47 -0500
Subject: [PATCH] Update the arguments in withTranslation() exports.

Many of the uses of withTranslation() had outdated arguments, either missing translation files or not including needed ones.
This PR updates them to correctly match the current content of the files.
Also removes brackets in case of 0 or 1 file in the argument.
---
 .../src/components/dashboard/BottomPanel.tsx              | 2 +-
 .../src/components/dashboard/FullSizePanel.tsx            | 2 +-
 .../src/components/dashboard/MenuBar.tsx                  | 2 +-
 .../src/components/dashboard/NotificationArea.tsx         | 2 +-
 .../src/components/dashboard/RightPanel.tsx               | 2 +-
 .../src/components/dashboard/Toolbar.tsx                  | 2 +-
 .../components/forms/auth/anonymous/AnonymousLogin.tsx    | 2 +-
 .../chaire-lib-frontend/src/components/input/DayRange.tsx | 2 +-
 .../src/components/input/InputCheckbox.tsx                | 2 +-
 .../src/components/modal/ConfirmModal.tsx                 | 2 +-
 .../components/pageParts/CollectionDownloadButtons.tsx    | 2 +-
 .../src/components/pageParts/DistanceUnitFormatter.tsx    | 2 +-
 .../src/components/pageParts/DurationUnitFormatter.tsx    | 2 +-
 .../src/components/pageParts/FormErrors.tsx               | 2 +-
 .../src/components/pageParts/Header.tsx                   | 4 ++--
 .../src/components/pageParts/SelectedObjectButtons.tsx    | 2 +-
 .../src/components/pageParts/SpeedUnitFormatter.tsx       | 2 +-
 .../components/pageParts/admin/users/UsersComponent.tsx   | 2 +-
 .../src/components/pages/MaintenancePage.tsx              | 6 +++---
 .../src/components/pages/NotFoundPage.tsx                 | 4 ++--
 .../src/components/pages/ResetPasswordPage.tsx            | 2 +-
 .../src/components/pages/UnauthorizedPage.tsx             | 4 ++--
 .../__tests__/__snapshots__/NotFoundPage.test.tsx.snap    | 2 +-
 .../__snapshots__/UnauthorizedPage.test.tsx.snap          | 4 ++--
 .../src/components/dashboard/TransitionBottomPanel.tsx    | 2 +-
 .../src/components/dashboard/TransitionFullSizePanel.tsx  | 2 +-
 .../src/components/dashboard/TransitionRightPanel.tsx     | 2 +-
 .../src/components/dashboard/TransitionToolbar.tsx        | 2 +-
 .../forms/accessibilityMap/AccessibilityMapForm.tsx       | 2 +-
 .../accessibilityMap/widgets/BatchAttributesSelection.tsx | 2 +-
 .../src/components/forms/agency/TransitAgencyButton.tsx   | 2 +-
 .../components/forms/agency/TransitAgencyImportForm.tsx   | 2 +-
 .../src/components/forms/agency/TransitAgencyList.tsx     | 2 +-
 .../src/components/forms/agency/TransitAgencyPanel.tsx    | 2 +-
 .../forms/batchCalculation/BatchCalculationList.tsx       | 2 +-
 .../forms/batchCalculation/BatchCalculationPanel.tsx      | 2 +-
 .../stepForms/ConfigureBatchCalculationForm.tsx           | 2 +-
 .../components/forms/gtfs/GtfsExistingAgencyImport.tsx    | 2 +-
 .../src/components/forms/gtfs/GtfsExportForm.tsx          | 2 +-
 .../components/forms/gtfs/GtfsImportAgenciesComponent.tsx | 2 +-
 .../src/components/forms/gtfs/GtfsImportForm.tsx          | 2 +-
 .../components/forms/gtfs/GtfsImportNodesComponent.tsx    | 2 +-
 .../components/forms/gtfs/GtfsImportServiceComponent.tsx  | 2 +-
 .../src/components/forms/line/TransitLineButton.tsx       | 2 +-
 .../src/components/forms/line/TransitLineEdit.tsx         | 2 +-
 .../src/components/forms/line/TransitLineImportForm.tsx   | 2 +-
 .../components/forms/node/TransitNodeCollectionEdit.tsx   | 2 +-
 .../src/components/forms/node/TransitNodeEdit.tsx         | 2 +-
 .../src/components/forms/node/TransitNodeImportForm.tsx   | 2 +-
 .../src/components/forms/node/TransitNodePanel.tsx        | 2 +-
 .../src/components/forms/node/TransitNodeStatistics.tsx   | 2 +-
 .../src/components/forms/path/TransitPathButton.tsx       | 2 +-
 .../src/components/forms/path/TransitPathEdit.tsx         | 2 +-
 .../src/components/forms/path/TransitPathImportForm.tsx   | 2 +-
 .../src/components/forms/path/TransitPathList.tsx         | 2 +-
 .../src/components/forms/path/TransitPathNodeList.tsx     | 2 +-
 .../src/components/forms/preferences/PreferencesEdit.tsx  | 2 +-
 .../forms/preferences/PreferencesResetToDefaultButton.tsx | 2 +-
 .../sections/PreferencesSectionAccessibility.tsx          | 2 +-
 .../preferences/sections/PreferencesSectionFeatures.tsx   | 2 +-
 .../preferences/sections/PreferencesSectionRouting.tsx    | 2 +-
 .../sections/PreferencesSectionTransitLineMode.tsx        | 2 +-
 .../sections/PreferencesSectionTransitPaths.tsx           | 2 +-
 .../components/forms/scenario/TransitScenarioButton.tsx   | 2 +-
 .../src/components/forms/scenario/TransitScenarioEdit.tsx | 2 +-
 .../forms/scenario/TransitScenarioImportForm.tsx          | 2 +-
 .../forms/scenario/TransitScenarioLinesDetail.tsx         | 2 +-
 .../src/components/forms/scenario/TransitScenarioList.tsx | 2 +-
 .../components/forms/scenario/TransitScenarioPanel.tsx    | 2 +-
 .../components/forms/schedules/TransitScheduleButton.tsx  | 2 +-
 .../components/forms/schedules/TransitScheduleEdit.tsx    | 2 +-
 .../components/forms/schedules/TransitScheduleList.tsx    | 2 +-
 .../src/components/forms/service/TransitServiceButton.tsx | 2 +-
 .../src/components/forms/service/TransitServiceEdit.tsx   | 2 +-
 .../src/components/forms/service/TransitServiceFilter.tsx | 2 +-
 .../forms/service/TransitServiceFilterableList.tsx        | 2 +-
 .../src/components/forms/service/TransitServiceList.tsx   | 2 +-
 .../src/components/forms/service/TransitServicePanel.tsx  | 2 +-
 .../forms/service/TransitServicesImportForm.tsx           | 2 +-
 .../src/components/forms/simulation/SimulationButton.tsx  | 2 +-
 .../src/components/forms/simulation/SimulationEdit.tsx    | 2 +-
 .../src/components/forms/simulation/SimulationList.tsx    | 2 +-
 .../src/components/forms/simulation/SimulationPanel.tsx   | 2 +-
 .../forms/simulation/widgets/BaseSimulationComponent.tsx  | 2 +-
 .../simulation/widgets/SimulationParametersComponent.tsx  | 2 +-
 .../forms/simulation/widgets/SimulationRunButton.tsx      | 2 +-
 .../forms/simulation/widgets/SimulationRunDetail.tsx      | 2 +-
 .../forms/simulation/widgets/SimulationRunList.tsx        | 2 +-
 .../widgets/AttributeSelectionWidget.tsx                  | 8 ++++----
 .../forms/transitRouting/RoutingResultComponent.tsx       | 2 +-
 .../forms/transitRouting/RoutingResultsComponent.tsx      | 2 +-
 .../forms/transitRouting/TransitRoutingBatchForm.tsx      | 2 +-
 .../forms/transitRouting/TransitRoutingForm.tsx           | 2 +-
 .../transitRouting/widgets/BatchAttributesSelection.tsx   | 2 +-
 .../forms/transitRouting/widgets/BatchSaveToDb.tsx        | 4 ++--
 .../transitRouting/widgets/ODCoordinatesComponent.tsx     | 2 +-
 .../forms/transitRouting/widgets/TimeOfTripComponent.tsx  | 2 +-
 .../widgets/TransitRoutingBaseComponent.tsx               | 2 +-
 .../transition-frontend/src/components/parts/Button.tsx   | 2 +-
 .../src/components/parts/DocumentationTooltip.tsx         | 2 +-
 .../src/components/parts/FileImportForm.tsx               | 5 +----
 101 files changed, 111 insertions(+), 114 deletions(-)

diff --git a/packages/chaire-lib-frontend/src/components/dashboard/BottomPanel.tsx b/packages/chaire-lib-frontend/src/components/dashboard/BottomPanel.tsx
index 059190fa..3545b8f8 100644
--- a/packages/chaire-lib-frontend/src/components/dashboard/BottomPanel.tsx
+++ b/packages/chaire-lib-frontend/src/components/dashboard/BottomPanel.tsx
@@ -32,4 +32,4 @@ const BottomPanel: React.FunctionComponent<BottomPanelProps> = ({ contributions,
     return <section id="tr__bottom-panel">{contributionElements}</section>;
 };
 
-export default withTranslation(['transit', 'main'])(BottomPanel);
+export default withTranslation()(BottomPanel);
diff --git a/packages/chaire-lib-frontend/src/components/dashboard/FullSizePanel.tsx b/packages/chaire-lib-frontend/src/components/dashboard/FullSizePanel.tsx
index a2944a95..1abd22e4 100644
--- a/packages/chaire-lib-frontend/src/components/dashboard/FullSizePanel.tsx
+++ b/packages/chaire-lib-frontend/src/components/dashboard/FullSizePanel.tsx
@@ -38,4 +38,4 @@ const FullSizePanel: React.FunctionComponent<FullSizePanelProps> = ({
     return <section id="tr__full-size-panel">{contributionElements}</section>;
 };
 
-export default withTranslation(['transit', 'main'])(FullSizePanel);
+export default withTranslation()(FullSizePanel);
diff --git a/packages/chaire-lib-frontend/src/components/dashboard/MenuBar.tsx b/packages/chaire-lib-frontend/src/components/dashboard/MenuBar.tsx
index 8dbd62a6..096597bf 100644
--- a/packages/chaire-lib-frontend/src/components/dashboard/MenuBar.tsx
+++ b/packages/chaire-lib-frontend/src/components/dashboard/MenuBar.tsx
@@ -31,4 +31,4 @@ const MenuBar: React.FunctionComponent<MenuBarProps> = ({ contributions, ...prop
     return <nav id="tr__left-menu">{contributionElements}</nav>;
 };
 
-export default withTranslation(['transit', 'main'])(MenuBar);
+export default withTranslation()(MenuBar);
diff --git a/packages/chaire-lib-frontend/src/components/dashboard/NotificationArea.tsx b/packages/chaire-lib-frontend/src/components/dashboard/NotificationArea.tsx
index a7ff037b..288ce4cb 100644
--- a/packages/chaire-lib-frontend/src/components/dashboard/NotificationArea.tsx
+++ b/packages/chaire-lib-frontend/src/components/dashboard/NotificationArea.tsx
@@ -77,4 +77,4 @@ const NotificationArea: React.FunctionComponent<WithTranslation> = (props: WithT
     );
 };
 
-export default withTranslation([])(NotificationArea);
+export default withTranslation()(NotificationArea);
diff --git a/packages/chaire-lib-frontend/src/components/dashboard/RightPanel.tsx b/packages/chaire-lib-frontend/src/components/dashboard/RightPanel.tsx
index d1c9f9a5..64ddec8b 100644
--- a/packages/chaire-lib-frontend/src/components/dashboard/RightPanel.tsx
+++ b/packages/chaire-lib-frontend/src/components/dashboard/RightPanel.tsx
@@ -47,4 +47,4 @@ const RightPanel: React.FunctionComponent<RightPanelProps> = ({ contributions, .
     );
 };
 
-export default withTranslation(['transit', 'main'])(RightPanel);
+export default withTranslation()(RightPanel);
diff --git a/packages/chaire-lib-frontend/src/components/dashboard/Toolbar.tsx b/packages/chaire-lib-frontend/src/components/dashboard/Toolbar.tsx
index 40c62e54..1e3989f6 100644
--- a/packages/chaire-lib-frontend/src/components/dashboard/Toolbar.tsx
+++ b/packages/chaire-lib-frontend/src/components/dashboard/Toolbar.tsx
@@ -37,4 +37,4 @@ const Toolbar: React.FunctionComponent<MenuBarProps> = ({ contributions, ...prop
     );
 };
 
-export default withTranslation(['transit', 'main'])(Toolbar);
+export default withTranslation()(Toolbar);
diff --git a/packages/chaire-lib-frontend/src/components/forms/auth/anonymous/AnonymousLogin.tsx b/packages/chaire-lib-frontend/src/components/forms/auth/anonymous/AnonymousLogin.tsx
index bdaca0b1..d2c7acc0 100644
--- a/packages/chaire-lib-frontend/src/components/forms/auth/anonymous/AnonymousLogin.tsx
+++ b/packages/chaire-lib-frontend/src/components/forms/auth/anonymous/AnonymousLogin.tsx
@@ -37,4 +37,4 @@ const mapDispatchToProps = (dispatch, props: Omit<AnonymousLoginProps, 'startAno
         dispatch(startAnonymousLogin(props.history, props.location, callback))
 });
 
-export default connect(mapStateToProps, mapDispatchToProps)(withTranslation('auth')(AnonymousLogin));
+export default connect(mapStateToProps, mapDispatchToProps)(withTranslation()(AnonymousLogin));
diff --git a/packages/chaire-lib-frontend/src/components/input/DayRange.tsx b/packages/chaire-lib-frontend/src/components/input/DayRange.tsx
index 907fc727..a24dbf1a 100644
--- a/packages/chaire-lib-frontend/src/components/input/DayRange.tsx
+++ b/packages/chaire-lib-frontend/src/components/input/DayRange.tsx
@@ -125,4 +125,4 @@ export class DayRange extends React.Component<DayRangeProps> {
     }
 }
 
-export default withTranslation(['main'])(DayRange);
+export default withTranslation('main')(DayRange);
diff --git a/packages/chaire-lib-frontend/src/components/input/InputCheckbox.tsx b/packages/chaire-lib-frontend/src/components/input/InputCheckbox.tsx
index d511dbd0..cfd4feb3 100644
--- a/packages/chaire-lib-frontend/src/components/input/InputCheckbox.tsx
+++ b/packages/chaire-lib-frontend/src/components/input/InputCheckbox.tsx
@@ -267,6 +267,6 @@ class InputCheckboxBooleanInner extends React.Component<InputCheckboxBoolProps>
     }
 }
 
-export const InputCheckboxBoolean = withTranslation(['main'])(InputCheckboxBooleanInner);
+export const InputCheckboxBoolean = withTranslation('main')(InputCheckboxBooleanInner);
 
 export default InputCheckbox;
diff --git a/packages/chaire-lib-frontend/src/components/modal/ConfirmModal.tsx b/packages/chaire-lib-frontend/src/components/modal/ConfirmModal.tsx
index 241dd82f..2fc1e7da 100644
--- a/packages/chaire-lib-frontend/src/components/modal/ConfirmModal.tsx
+++ b/packages/chaire-lib-frontend/src/components/modal/ConfirmModal.tsx
@@ -113,4 +113,4 @@ export class ConfirmModal extends React.Component<ConfirmModalProps> {
     }
 }
 
-export default withTranslation()(ConfirmModal);
+export default withTranslation('main')(ConfirmModal);
diff --git a/packages/chaire-lib-frontend/src/components/pageParts/CollectionDownloadButtons.tsx b/packages/chaire-lib-frontend/src/components/pageParts/CollectionDownloadButtons.tsx
index 07c48d42..34439b00 100644
--- a/packages/chaire-lib-frontend/src/components/pageParts/CollectionDownloadButtons.tsx
+++ b/packages/chaire-lib-frontend/src/components/pageParts/CollectionDownloadButtons.tsx
@@ -120,4 +120,4 @@ const CollectionDownloadButtons = function (props: CollectionDownloadButtonsProp
     );
 };
 
-export default withTranslation('main')(CollectionDownloadButtons);
+export default withTranslation()(CollectionDownloadButtons);
diff --git a/packages/chaire-lib-frontend/src/components/pageParts/DistanceUnitFormatter.tsx b/packages/chaire-lib-frontend/src/components/pageParts/DistanceUnitFormatter.tsx
index 8af25de3..98a7647f 100644
--- a/packages/chaire-lib-frontend/src/components/pageParts/DistanceUnitFormatter.tsx
+++ b/packages/chaire-lib-frontend/src/components/pageParts/DistanceUnitFormatter.tsx
@@ -59,4 +59,4 @@ const DistanceUnitFormatter: React.FunctionComponent<DistanceUnitFormatterProps>
     return <span onClick={cycleThroughDestinationUnits}>{formattedValue}</span>;
 };
 
-export default withTranslation([])(DistanceUnitFormatter);
+export default withTranslation('main')(DistanceUnitFormatter);
diff --git a/packages/chaire-lib-frontend/src/components/pageParts/DurationUnitFormatter.tsx b/packages/chaire-lib-frontend/src/components/pageParts/DurationUnitFormatter.tsx
index d71e8d79..8f2c807c 100644
--- a/packages/chaire-lib-frontend/src/components/pageParts/DurationUnitFormatter.tsx
+++ b/packages/chaire-lib-frontend/src/components/pageParts/DurationUnitFormatter.tsx
@@ -65,4 +65,4 @@ const DurationUnitFormatter: React.FunctionComponent<DurationUnitFormatterProps>
     return <span onClick={cycleThroughDestinationUnits}>{formattedValue}</span>;
 };
 
-export default withTranslation([])(DurationUnitFormatter);
+export default withTranslation('main')(DurationUnitFormatter);
diff --git a/packages/chaire-lib-frontend/src/components/pageParts/FormErrors.tsx b/packages/chaire-lib-frontend/src/components/pageParts/FormErrors.tsx
index fdd2f7b3..c44e4a09 100644
--- a/packages/chaire-lib-frontend/src/components/pageParts/FormErrors.tsx
+++ b/packages/chaire-lib-frontend/src/components/pageParts/FormErrors.tsx
@@ -47,4 +47,4 @@ const FormErrors: React.FunctionComponent<FormErrorsProps> = (props: FormErrorsP
     }
 };
 
-export default withTranslation([])(FormErrors);
+export default withTranslation('auth')(FormErrors);
diff --git a/packages/chaire-lib-frontend/src/components/pageParts/Header.tsx b/packages/chaire-lib-frontend/src/components/pageParts/Header.tsx
index 780abafa..df009f9d 100644
--- a/packages/chaire-lib-frontend/src/components/pageParts/Header.tsx
+++ b/packages/chaire-lib-frontend/src/components/pageParts/Header.tsx
@@ -74,7 +74,7 @@ const UserMenuButton: React.FunctionComponent<UserMenuButtonProps & WithTranslat
         </React.Fragment>
     );
 };
-const TranslatableUserMenuButton = withTranslation('menu')(UserMenuButton);
+const TranslatableUserMenuButton = withTranslation()(UserMenuButton);
 
 interface UserMenuProps {
     user: CliUser;
@@ -115,7 +115,7 @@ const UserMenu: React.FunctionComponent<UserMenuProps & WithTranslation> = (prop
         </div>
     );
 };
-const TranslatableUserMenu = withTranslation('menu')(UserMenu);
+const TranslatableUserMenu = withTranslation()(UserMenu);
 
 const User: React.FunctionComponent<UserProps & WithTranslation> = (props: UserProps & WithTranslation) => {
     const [display, setDisplay] = React.useState('none');
diff --git a/packages/chaire-lib-frontend/src/components/pageParts/SelectedObjectButtons.tsx b/packages/chaire-lib-frontend/src/components/pageParts/SelectedObjectButtons.tsx
index a367a9a7..7d6c7c5d 100644
--- a/packages/chaire-lib-frontend/src/components/pageParts/SelectedObjectButtons.tsx
+++ b/packages/chaire-lib-frontend/src/components/pageParts/SelectedObjectButtons.tsx
@@ -195,4 +195,4 @@ const SelectedObjectButtons: React.FunctionComponent<SelectedObjectButtonsProps<
     );
 };
 
-export default withTranslation([])(SelectedObjectButtons);
+export default withTranslation(['main', 'notifications'])(SelectedObjectButtons);
diff --git a/packages/chaire-lib-frontend/src/components/pageParts/SpeedUnitFormatter.tsx b/packages/chaire-lib-frontend/src/components/pageParts/SpeedUnitFormatter.tsx
index 42bec6c2..f737933a 100644
--- a/packages/chaire-lib-frontend/src/components/pageParts/SpeedUnitFormatter.tsx
+++ b/packages/chaire-lib-frontend/src/components/pageParts/SpeedUnitFormatter.tsx
@@ -54,4 +54,4 @@ const SpeedUnitFormatter: React.FunctionComponent<SpeedUnitFormatterProps> = (pr
     return <span onClick={cycleThroughDestinationUnits}>{formattedValue}</span>;
 };
 
-export default withTranslation([])(SpeedUnitFormatter);
+export default withTranslation('main')(SpeedUnitFormatter);
diff --git a/packages/chaire-lib-frontend/src/components/pageParts/admin/users/UsersComponent.tsx b/packages/chaire-lib-frontend/src/components/pageParts/admin/users/UsersComponent.tsx
index e32e47f5..01ea618f 100644
--- a/packages/chaire-lib-frontend/src/components/pageParts/admin/users/UsersComponent.tsx
+++ b/packages/chaire-lib-frontend/src/components/pageParts/admin/users/UsersComponent.tsx
@@ -120,4 +120,4 @@ const UsersComponent: React.FunctionComponent<WithTranslation> = (props: WithTra
     );
 };
 
-export default withTranslation(['admin', 'main'])(UsersComponent);
+export default withTranslation('admin')(UsersComponent);
diff --git a/packages/chaire-lib-frontend/src/components/pages/MaintenancePage.tsx b/packages/chaire-lib-frontend/src/components/pages/MaintenancePage.tsx
index 6c360a58..e2cebf79 100644
--- a/packages/chaire-lib-frontend/src/components/pages/MaintenancePage.tsx
+++ b/packages/chaire-lib-frontend/src/components/pages/MaintenancePage.tsx
@@ -14,10 +14,10 @@ interface MaintenancePageProps extends WithTranslation {
 
 export const MaintenancePage: React.FunctionComponent<MaintenancePageProps> = (props: MaintenancePageProps) => (
     <div>
-        {props.t('Maintenance')}
+        {props.t('auth:Maintenance')}
         <br />
-        <Link to={props.linkPath ? props.linkPath : '/home'}>{props.t('BackToHomePage')}</Link>
+        <Link to={props.linkPath ? props.linkPath : '/home'}>{props.t('auth:BackToHomePage')}</Link>
     </div>
 );
 
-export default withTranslation(['auth'])(MaintenancePage);
+export default withTranslation('auth')(MaintenancePage);
diff --git a/packages/chaire-lib-frontend/src/components/pages/NotFoundPage.tsx b/packages/chaire-lib-frontend/src/components/pages/NotFoundPage.tsx
index fec826ff..b9961366 100644
--- a/packages/chaire-lib-frontend/src/components/pages/NotFoundPage.tsx
+++ b/packages/chaire-lib-frontend/src/components/pages/NotFoundPage.tsx
@@ -10,8 +10,8 @@ import { withTranslation, WithTranslation } from 'react-i18next';
 
 export const NotFoundPage: React.FunctionComponent<WithTranslation> = (props: WithTranslation) => (
     <div>
-        404 - <Link to="/">{props.t('BackToHomePage')}</Link>
+        404 - <Link to="/">{props.t('auth:BackToHomePage')}</Link>
     </div>
 );
 
-export default withTranslation(['auth'])(NotFoundPage);
+export default withTranslation('auth')(NotFoundPage);
diff --git a/packages/chaire-lib-frontend/src/components/pages/ResetPasswordPage.tsx b/packages/chaire-lib-frontend/src/components/pages/ResetPasswordPage.tsx
index 1d4688b8..22d208dc 100644
--- a/packages/chaire-lib-frontend/src/components/pages/ResetPasswordPage.tsx
+++ b/packages/chaire-lib-frontend/src/components/pages/ResetPasswordPage.tsx
@@ -45,7 +45,7 @@ const SimpleMessage: React.FunctionComponent<SimpleMessageProps> = (props: Simpl
     );
 };
 
-const SimpleMessageWidget = withTranslation()(SimpleMessage);
+const SimpleMessageWidget = withTranslation('auth')(SimpleMessage);
 
 export class ResetPasswordPage extends React.Component<ResetPasswordPageProps, ResetPasswordState> {
     private submitButtonRef;
diff --git a/packages/chaire-lib-frontend/src/components/pages/UnauthorizedPage.tsx b/packages/chaire-lib-frontend/src/components/pages/UnauthorizedPage.tsx
index ead7ef3c..842e4950 100644
--- a/packages/chaire-lib-frontend/src/components/pages/UnauthorizedPage.tsx
+++ b/packages/chaire-lib-frontend/src/components/pages/UnauthorizedPage.tsx
@@ -10,8 +10,8 @@ import { withTranslation, WithTranslation } from 'react-i18next';
 
 export const UnauthorizedPage: React.FunctionComponent<WithTranslation> = (props: WithTranslation) => (
     <div>
-        {props.t('Unauthorized')} - <Link to="/login">{props.t('BackToLoginPage')}</Link>
+        {props.t('auth:Unauthorized')} - <Link to="/login">{props.t('auth:BackToLoginPage')}</Link>
     </div>
 );
 
-export default withTranslation(['auth'])(UnauthorizedPage);
+export default withTranslation('auth')(UnauthorizedPage);
diff --git a/packages/chaire-lib-frontend/src/components/pages/__tests__/__snapshots__/NotFoundPage.test.tsx.snap b/packages/chaire-lib-frontend/src/components/pages/__tests__/__snapshots__/NotFoundPage.test.tsx.snap
index b45af752..d8960035 100644
--- a/packages/chaire-lib-frontend/src/components/pages/__tests__/__snapshots__/NotFoundPage.test.tsx.snap
+++ b/packages/chaire-lib-frontend/src/components/pages/__tests__/__snapshots__/NotFoundPage.test.tsx.snap
@@ -43,7 +43,7 @@ exports[`Should correctly render NotFound page 1`] = `
                 href="/"
                 onClick={[Function]}
               >
-                BackToHomePage
+                auth:BackToHomePage
               </a>
             </LinkAnchor>
           </Link>
diff --git a/packages/chaire-lib-frontend/src/components/pages/__tests__/__snapshots__/UnauthorizedPage.test.tsx.snap b/packages/chaire-lib-frontend/src/components/pages/__tests__/__snapshots__/UnauthorizedPage.test.tsx.snap
index cb762740..59ef9cff 100644
--- a/packages/chaire-lib-frontend/src/components/pages/__tests__/__snapshots__/UnauthorizedPage.test.tsx.snap
+++ b/packages/chaire-lib-frontend/src/components/pages/__tests__/__snapshots__/UnauthorizedPage.test.tsx.snap
@@ -31,7 +31,7 @@ exports[`Should correctly render Unauthorized page 1`] = `
         tReady={false}
       >
         <div>
-          Unauthorized
+          auth:Unauthorized
            - 
           <Link
             to="/login"
@@ -44,7 +44,7 @@ exports[`Should correctly render Unauthorized page 1`] = `
                 href="/login"
                 onClick={[Function]}
               >
-                BackToLoginPage
+                auth:BackToLoginPage
               </a>
             </LinkAnchor>
           </Link>
diff --git a/packages/transition-frontend/src/components/dashboard/TransitionBottomPanel.tsx b/packages/transition-frontend/src/components/dashboard/TransitionBottomPanel.tsx
index 1666c7a5..61e0336f 100644
--- a/packages/transition-frontend/src/components/dashboard/TransitionBottomPanel.tsx
+++ b/packages/transition-frontend/src/components/dashboard/TransitionBottomPanel.tsx
@@ -32,4 +32,4 @@ const BottomPanel: React.FunctionComponent<LayoutSectionProps> = (props: LayoutS
     return <React.Fragment>{path.path && <TransitPathNodesList selectedPath={path.path} />}</React.Fragment>;
 };
 
-export default withTranslation(['transit', 'main', 'form'])(BottomPanel);
+export default withTranslation()(BottomPanel);
diff --git a/packages/transition-frontend/src/components/dashboard/TransitionFullSizePanel.tsx b/packages/transition-frontend/src/components/dashboard/TransitionFullSizePanel.tsx
index cda8af3c..d3cf1e89 100644
--- a/packages/transition-frontend/src/components/dashboard/TransitionFullSizePanel.tsx
+++ b/packages/transition-frontend/src/components/dashboard/TransitionFullSizePanel.tsx
@@ -56,4 +56,4 @@ const FullSizePanel: React.FunctionComponent<LayoutSectionProps> = (props: Layou
     );
 };
 
-export default withTranslation(['transit', 'main', 'form'])(FullSizePanel);
+export default withTranslation()(FullSizePanel);
diff --git a/packages/transition-frontend/src/components/dashboard/TransitionRightPanel.tsx b/packages/transition-frontend/src/components/dashboard/TransitionRightPanel.tsx
index 570674d4..9fb2d119 100644
--- a/packages/transition-frontend/src/components/dashboard/TransitionRightPanel.tsx
+++ b/packages/transition-frontend/src/components/dashboard/TransitionRightPanel.tsx
@@ -52,4 +52,4 @@ const RightPanel: React.FunctionComponent<RightPanelProps> = (props: RightPanelP
     );
 };
 
-export default withTranslation(['transit', 'main', 'form'])(RightPanel);
+export default withTranslation()(RightPanel);
diff --git a/packages/transition-frontend/src/components/dashboard/TransitionToolbar.tsx b/packages/transition-frontend/src/components/dashboard/TransitionToolbar.tsx
index 8a2e5101..2448e26b 100644
--- a/packages/transition-frontend/src/components/dashboard/TransitionToolbar.tsx
+++ b/packages/transition-frontend/src/components/dashboard/TransitionToolbar.tsx
@@ -400,4 +400,4 @@ class Toolbar extends React.Component<LayoutSectionProps, TransitionToolbarState
     }
 }
 
-export default withTranslation(['transit', 'main'])(Toolbar);
+export default withTranslation(['transit', 'main', 'od', 'notifications'])(Toolbar);
diff --git a/packages/transition-frontend/src/components/forms/accessibilityMap/AccessibilityMapForm.tsx b/packages/transition-frontend/src/components/forms/accessibilityMap/AccessibilityMapForm.tsx
index cdd3d6e8..973b2391 100644
--- a/packages/transition-frontend/src/components/forms/accessibilityMap/AccessibilityMapForm.tsx
+++ b/packages/transition-frontend/src/components/forms/accessibilityMap/AccessibilityMapForm.tsx
@@ -466,4 +466,4 @@ class AccessibilityMapForm extends ChangeEventsForm<AccessibilityMapFormProps, T
     }
 }
 
-export default withTranslation(['transit', 'main'])(AccessibilityMapForm);
+export default withTranslation(['transit', 'main', 'form', 'notifications'])(AccessibilityMapForm);
diff --git a/packages/transition-frontend/src/components/forms/accessibilityMap/widgets/BatchAttributesSelection.tsx b/packages/transition-frontend/src/components/forms/accessibilityMap/widgets/BatchAttributesSelection.tsx
index 1b907791..67f3b575 100644
--- a/packages/transition-frontend/src/components/forms/accessibilityMap/widgets/BatchAttributesSelection.tsx
+++ b/packages/transition-frontend/src/components/forms/accessibilityMap/widgets/BatchAttributesSelection.tsx
@@ -80,4 +80,4 @@ const BatchAttributesSelectionComponent: React.FunctionComponent<BatchAttributes
     );
 };
 
-export default withTranslation(['transit', 'main'])(BatchAttributesSelectionComponent);
+export default withTranslation('main')(BatchAttributesSelectionComponent);
diff --git a/packages/transition-frontend/src/components/forms/agency/TransitAgencyButton.tsx b/packages/transition-frontend/src/components/forms/agency/TransitAgencyButton.tsx
index a06b3a98..a11f5cad 100644
--- a/packages/transition-frontend/src/components/forms/agency/TransitAgencyButton.tsx
+++ b/packages/transition-frontend/src/components/forms/agency/TransitAgencyButton.tsx
@@ -274,4 +274,4 @@ const TransitAgencyButton: React.FunctionComponent<AgencyButtonProps> = (props:
     );
 };
 
-export default withTranslation(['transit', 'main', 'form', 'notifications'])(TransitAgencyButton);
+export default withTranslation(['transit', 'main', 'notifications'])(TransitAgencyButton);
diff --git a/packages/transition-frontend/src/components/forms/agency/TransitAgencyImportForm.tsx b/packages/transition-frontend/src/components/forms/agency/TransitAgencyImportForm.tsx
index 408a05df..cc35a55b 100644
--- a/packages/transition-frontend/src/components/forms/agency/TransitAgencyImportForm.tsx
+++ b/packages/transition-frontend/src/components/forms/agency/TransitAgencyImportForm.tsx
@@ -46,4 +46,4 @@ const AgenciesImportForm: React.FunctionComponent<AgencyImportFormProps & WithTr
     );
 };
 
-export default withTranslation(['transit', 'main'])(AgenciesImportForm);
+export default withTranslation(['main', 'notifications'])(AgenciesImportForm);
diff --git a/packages/transition-frontend/src/components/forms/agency/TransitAgencyList.tsx b/packages/transition-frontend/src/components/forms/agency/TransitAgencyList.tsx
index e494b2fd..b6306174 100644
--- a/packages/transition-frontend/src/components/forms/agency/TransitAgencyList.tsx
+++ b/packages/transition-frontend/src/components/forms/agency/TransitAgencyList.tsx
@@ -136,4 +136,4 @@ const TransitAgencyList: React.FunctionComponent<AgencyListProps> = (props: Agen
     );
 };
 
-export default withTranslation(['transit', 'main'])(TransitAgencyList);
+export default withTranslation('transit')(TransitAgencyList);
diff --git a/packages/transition-frontend/src/components/forms/agency/TransitAgencyPanel.tsx b/packages/transition-frontend/src/components/forms/agency/TransitAgencyPanel.tsx
index 46d5831c..eb7e458d 100644
--- a/packages/transition-frontend/src/components/forms/agency/TransitAgencyPanel.tsx
+++ b/packages/transition-frontend/src/components/forms/agency/TransitAgencyPanel.tsx
@@ -228,4 +228,4 @@ const AgencyPanel: React.FunctionComponent<AgencyPanelProps> = (props: AgencyPan
     );
 };
 
-export default withTranslation(['transit', 'main', 'form'])(AgencyPanel);
+export default withTranslation(['transit', 'form'])(AgencyPanel);
diff --git a/packages/transition-frontend/src/components/forms/batchCalculation/BatchCalculationList.tsx b/packages/transition-frontend/src/components/forms/batchCalculation/BatchCalculationList.tsx
index 13cfc219..14b612af 100644
--- a/packages/transition-frontend/src/components/forms/batchCalculation/BatchCalculationList.tsx
+++ b/packages/transition-frontend/src/components/forms/batchCalculation/BatchCalculationList.tsx
@@ -69,4 +69,4 @@ const BatchCalculationList: React.FunctionComponent<BatchCalculationListProps> =
     );
 };
 
-export default withTranslation(['transit', 'main', 'form', 'notifications'])(BatchCalculationList);
+export default withTranslation('transit')(BatchCalculationList);
diff --git a/packages/transition-frontend/src/components/forms/batchCalculation/BatchCalculationPanel.tsx b/packages/transition-frontend/src/components/forms/batchCalculation/BatchCalculationPanel.tsx
index 79832686..09fe2a4c 100644
--- a/packages/transition-frontend/src/components/forms/batchCalculation/BatchCalculationPanel.tsx
+++ b/packages/transition-frontend/src/components/forms/batchCalculation/BatchCalculationPanel.tsx
@@ -69,4 +69,4 @@ const CalculationPanel: React.FunctionComponent<CalculationPanelPanelProps & Wit
     );
 };
 
-export default withTranslation(['transit', 'main', 'form'])(CalculationPanel);
+export default withTranslation()(CalculationPanel);
diff --git a/packages/transition-frontend/src/components/forms/batchCalculation/stepForms/ConfigureBatchCalculationForm.tsx b/packages/transition-frontend/src/components/forms/batchCalculation/stepForms/ConfigureBatchCalculationForm.tsx
index 3e526fc5..cbd37050 100644
--- a/packages/transition-frontend/src/components/forms/batchCalculation/stepForms/ConfigureBatchCalculationForm.tsx
+++ b/packages/transition-frontend/src/components/forms/batchCalculation/stepForms/ConfigureBatchCalculationForm.tsx
@@ -156,4 +156,4 @@ const ConfigureCalculationParametersForm: React.FunctionComponent<
     );
 };
 
-export default withTranslation(['transit', 'main'])(ConfigureCalculationParametersForm);
+export default withTranslation('transit')(ConfigureCalculationParametersForm);
diff --git a/packages/transition-frontend/src/components/forms/gtfs/GtfsExistingAgencyImport.tsx b/packages/transition-frontend/src/components/forms/gtfs/GtfsExistingAgencyImport.tsx
index 67d68d7a..e95c90a7 100644
--- a/packages/transition-frontend/src/components/forms/gtfs/GtfsExistingAgencyImport.tsx
+++ b/packages/transition-frontend/src/components/forms/gtfs/GtfsExistingAgencyImport.tsx
@@ -117,4 +117,4 @@ const GtfsExistingAgencyImport: React.FunctionComponent<GtfsExistingAgencyImport
     );
 };
 
-export default withTranslation(['transit', 'main'])(GtfsExistingAgencyImport);
+export default withTranslation('transit')(GtfsExistingAgencyImport);
diff --git a/packages/transition-frontend/src/components/forms/gtfs/GtfsExportForm.tsx b/packages/transition-frontend/src/components/forms/gtfs/GtfsExportForm.tsx
index 98cf7fcb..025bc6a3 100644
--- a/packages/transition-frontend/src/components/forms/gtfs/GtfsExportForm.tsx
+++ b/packages/transition-frontend/src/components/forms/gtfs/GtfsExportForm.tsx
@@ -155,4 +155,4 @@ class GtfsExportForm extends ChangeEventsForm<WithTranslation, ChangeEventsState
     }
 }
 
-export default withTranslation(['transit', 'main'])(GtfsExportForm);
+export default withTranslation('transit')(GtfsExportForm);
diff --git a/packages/transition-frontend/src/components/forms/gtfs/GtfsImportAgenciesComponent.tsx b/packages/transition-frontend/src/components/forms/gtfs/GtfsImportAgenciesComponent.tsx
index 24a22580..64b75a83 100644
--- a/packages/transition-frontend/src/components/forms/gtfs/GtfsImportAgenciesComponent.tsx
+++ b/packages/transition-frontend/src/components/forms/gtfs/GtfsImportAgenciesComponent.tsx
@@ -67,4 +67,4 @@ const GtfsImportAgenciesComponent: React.FunctionComponent<GtfsImportAgenciesCom
     );
 };
 
-export default withTranslation(['transit', 'main'])(GtfsImportAgenciesComponent);
+export default withTranslation()(GtfsImportAgenciesComponent);
diff --git a/packages/transition-frontend/src/components/forms/gtfs/GtfsImportForm.tsx b/packages/transition-frontend/src/components/forms/gtfs/GtfsImportForm.tsx
index 0039eae7..1ce1eac5 100644
--- a/packages/transition-frontend/src/components/forms/gtfs/GtfsImportForm.tsx
+++ b/packages/transition-frontend/src/components/forms/gtfs/GtfsImportForm.tsx
@@ -518,4 +518,4 @@ class GtfsImportForm extends React.Component<GtfsImportProps, GtfsImportState> {
     }
 }
 
-export default withTranslation(['transit', 'main', 'notifications'])(GtfsImportForm);
+export default withTranslation(['transit', 'notifications'])(GtfsImportForm);
diff --git a/packages/transition-frontend/src/components/forms/gtfs/GtfsImportNodesComponent.tsx b/packages/transition-frontend/src/components/forms/gtfs/GtfsImportNodesComponent.tsx
index 6d15e3a6..c94f7772 100644
--- a/packages/transition-frontend/src/components/forms/gtfs/GtfsImportNodesComponent.tsx
+++ b/packages/transition-frontend/src/components/forms/gtfs/GtfsImportNodesComponent.tsx
@@ -56,4 +56,4 @@ const GtfsImportNodesComponent: React.FunctionComponent<GtfsImportNodesComponent
     );
 };
 
-export default withTranslation(['transit', 'main'])(GtfsImportNodesComponent);
+export default withTranslation('transit')(GtfsImportNodesComponent);
diff --git a/packages/transition-frontend/src/components/forms/gtfs/GtfsImportServiceComponent.tsx b/packages/transition-frontend/src/components/forms/gtfs/GtfsImportServiceComponent.tsx
index 937c8972..9ea38ee5 100644
--- a/packages/transition-frontend/src/components/forms/gtfs/GtfsImportServiceComponent.tsx
+++ b/packages/transition-frontend/src/components/forms/gtfs/GtfsImportServiceComponent.tsx
@@ -74,4 +74,4 @@ const GtfsImportServiceComponent: React.FunctionComponent<GtfsImportServiceCompo
     );
 };
 
-export default withTranslation(['transit', 'main'])(GtfsImportServiceComponent);
+export default withTranslation('main')(GtfsImportServiceComponent);
diff --git a/packages/transition-frontend/src/components/forms/line/TransitLineButton.tsx b/packages/transition-frontend/src/components/forms/line/TransitLineButton.tsx
index 8058c114..5439a884 100644
--- a/packages/transition-frontend/src/components/forms/line/TransitLineButton.tsx
+++ b/packages/transition-frontend/src/components/forms/line/TransitLineButton.tsx
@@ -187,4 +187,4 @@ const TransitLineButton: React.FunctionComponent<LineButtonProps> = (props: Line
     );
 };
 
-export default withTranslation(['transit', 'main', 'form', 'notifications'])(TransitLineButton);
+export default withTranslation(['transit', 'main', 'notifications'])(TransitLineButton);
diff --git a/packages/transition-frontend/src/components/forms/line/TransitLineEdit.tsx b/packages/transition-frontend/src/components/forms/line/TransitLineEdit.tsx
index 1f56b1c5..6751463d 100644
--- a/packages/transition-frontend/src/components/forms/line/TransitLineEdit.tsx
+++ b/packages/transition-frontend/src/components/forms/line/TransitLineEdit.tsx
@@ -467,4 +467,4 @@ class TransitLineEdit extends SaveableObjectForm<Line, LineFormProps, LineFormSt
     }
 }
 
-export default withTranslation(['transit', 'main'])(TransitLineEdit);
+export default withTranslation(['transit', 'form', 'main', 'notifications'])(TransitLineEdit);
diff --git a/packages/transition-frontend/src/components/forms/line/TransitLineImportForm.tsx b/packages/transition-frontend/src/components/forms/line/TransitLineImportForm.tsx
index 8410bc31..ce47636a 100644
--- a/packages/transition-frontend/src/components/forms/line/TransitLineImportForm.tsx
+++ b/packages/transition-frontend/src/components/forms/line/TransitLineImportForm.tsx
@@ -50,4 +50,4 @@ const LineImportForm: React.FunctionComponent<LineImportFormProps & WithTranslat
     );
 };
 
-export default withTranslation(['transit', 'main'])(LineImportForm);
+export default withTranslation(['main', 'notifications'])(LineImportForm);
diff --git a/packages/transition-frontend/src/components/forms/node/TransitNodeCollectionEdit.tsx b/packages/transition-frontend/src/components/forms/node/TransitNodeCollectionEdit.tsx
index 1c849a6b..6629665c 100644
--- a/packages/transition-frontend/src/components/forms/node/TransitNodeCollectionEdit.tsx
+++ b/packages/transition-frontend/src/components/forms/node/TransitNodeCollectionEdit.tsx
@@ -323,4 +323,4 @@ class TransitNodeCollectionEdit extends React.Component<
     }
 }
 
-export default withTranslation(['transit', 'main', 'notifications'])(TransitNodeCollectionEdit);
+export default withTranslation(['transit', 'main', 'form', 'notifications'])(TransitNodeCollectionEdit);
diff --git a/packages/transition-frontend/src/components/forms/node/TransitNodeEdit.tsx b/packages/transition-frontend/src/components/forms/node/TransitNodeEdit.tsx
index 50f20a58..72f4afbe 100644
--- a/packages/transition-frontend/src/components/forms/node/TransitNodeEdit.tsx
+++ b/packages/transition-frontend/src/components/forms/node/TransitNodeEdit.tsx
@@ -496,4 +496,4 @@ class TransitNodeEdit extends SaveableObjectForm<Node, NodeFormProps, NodeFormSt
     }
 }
 
-export default withTranslation(['transit', 'main', 'notifications'])(TransitNodeEdit);
+export default withTranslation(['transit', 'main', 'form', 'notifications'])(TransitNodeEdit);
diff --git a/packages/transition-frontend/src/components/forms/node/TransitNodeImportForm.tsx b/packages/transition-frontend/src/components/forms/node/TransitNodeImportForm.tsx
index 63e8f1c3..b5b0a67d 100644
--- a/packages/transition-frontend/src/components/forms/node/TransitNodeImportForm.tsx
+++ b/packages/transition-frontend/src/components/forms/node/TransitNodeImportForm.tsx
@@ -51,4 +51,4 @@ const NodesImportForm: React.FunctionComponent<NodeImportFormProps & WithTransla
     );
 };
 
-export default withTranslation(['transit', 'main'])(NodesImportForm);
+export default withTranslation(['notifications', 'main'])(NodesImportForm);
diff --git a/packages/transition-frontend/src/components/forms/node/TransitNodePanel.tsx b/packages/transition-frontend/src/components/forms/node/TransitNodePanel.tsx
index 227c7f0e..7048d003 100644
--- a/packages/transition-frontend/src/components/forms/node/TransitNodePanel.tsx
+++ b/packages/transition-frontend/src/components/forms/node/TransitNodePanel.tsx
@@ -315,4 +315,4 @@ const NodePanel: React.FunctionComponent<WithTranslation> = (props: WithTranslat
     );
 };
 
-export default withTranslation(['transit', 'main', 'form'])(NodePanel);
+export default withTranslation(['transit', 'main', 'notifications'])(NodePanel);
diff --git a/packages/transition-frontend/src/components/forms/node/TransitNodeStatistics.tsx b/packages/transition-frontend/src/components/forms/node/TransitNodeStatistics.tsx
index 6abf570d..640fa49f 100644
--- a/packages/transition-frontend/src/components/forms/node/TransitNodeStatistics.tsx
+++ b/packages/transition-frontend/src/components/forms/node/TransitNodeStatistics.tsx
@@ -99,4 +99,4 @@ const TransitNodeStatistics: React.FunctionComponent<NodeStatsProps> = (props: N
     );
 };
 
-export default withTranslation(['transit'])(TransitNodeStatistics);
+export default withTranslation('transit')(TransitNodeStatistics);
diff --git a/packages/transition-frontend/src/components/forms/path/TransitPathButton.tsx b/packages/transition-frontend/src/components/forms/path/TransitPathButton.tsx
index 9695bab9..b57dabc2 100644
--- a/packages/transition-frontend/src/components/forms/path/TransitPathButton.tsx
+++ b/packages/transition-frontend/src/components/forms/path/TransitPathButton.tsx
@@ -254,4 +254,4 @@ const TransitPathButton: React.FunctionComponent<PathButtonProps> = (props: Path
     );
 };
 
-export default withTranslation(['transit', 'main', 'form', 'notifications'])(TransitPathButton);
+export default withTranslation(['transit', 'main', 'notifications'])(TransitPathButton);
diff --git a/packages/transition-frontend/src/components/forms/path/TransitPathEdit.tsx b/packages/transition-frontend/src/components/forms/path/TransitPathEdit.tsx
index d000648b..5cd136cf 100644
--- a/packages/transition-frontend/src/components/forms/path/TransitPathEdit.tsx
+++ b/packages/transition-frontend/src/components/forms/path/TransitPathEdit.tsx
@@ -859,4 +859,4 @@ class TransitPathEdit extends SaveableObjectForm<Path, PathFormProps, PathFormSt
     }
 }
 
-export default withTranslation(['transit', 'main'])(TransitPathEdit);
+export default withTranslation(['transit', 'main', 'form', 'notifications'])(TransitPathEdit);
diff --git a/packages/transition-frontend/src/components/forms/path/TransitPathImportForm.tsx b/packages/transition-frontend/src/components/forms/path/TransitPathImportForm.tsx
index 3054d846..2a8224c7 100644
--- a/packages/transition-frontend/src/components/forms/path/TransitPathImportForm.tsx
+++ b/packages/transition-frontend/src/components/forms/path/TransitPathImportForm.tsx
@@ -60,4 +60,4 @@ const PathsImportForm: React.FunctionComponent<PathImportFormProps & WithTransla
     );
 };
 
-export default withTranslation(['transit', 'main'])(PathsImportForm);
+export default withTranslation(['main', 'notifications'])(PathsImportForm);
diff --git a/packages/transition-frontend/src/components/forms/path/TransitPathList.tsx b/packages/transition-frontend/src/components/forms/path/TransitPathList.tsx
index cdfe373d..d5ca2996 100644
--- a/packages/transition-frontend/src/components/forms/path/TransitPathList.tsx
+++ b/packages/transition-frontend/src/components/forms/path/TransitPathList.tsx
@@ -54,4 +54,4 @@ const TransitPathList: React.FunctionComponent<PathListProps> = (props: PathList
     );
 };
 
-export default withTranslation(['transit', 'main', 'form', 'notifications'])(TransitPathList);
+export default withTranslation('transit')(TransitPathList);
diff --git a/packages/transition-frontend/src/components/forms/path/TransitPathNodeList.tsx b/packages/transition-frontend/src/components/forms/path/TransitPathNodeList.tsx
index 0729d167..7d93e9c0 100644
--- a/packages/transition-frontend/src/components/forms/path/TransitPathNodeList.tsx
+++ b/packages/transition-frontend/src/components/forms/path/TransitPathNodeList.tsx
@@ -96,4 +96,4 @@ const TransitPathNodeList: React.FunctionComponent<PathListProps> = (props: Path
     );
 };
 
-export default withTranslation(['transit', 'main'])(TransitPathNodeList);
+export default withTranslation('transit')(TransitPathNodeList);
diff --git a/packages/transition-frontend/src/components/forms/preferences/PreferencesEdit.tsx b/packages/transition-frontend/src/components/forms/preferences/PreferencesEdit.tsx
index 028c724a..c70b0166 100644
--- a/packages/transition-frontend/src/components/forms/preferences/PreferencesEdit.tsx
+++ b/packages/transition-frontend/src/components/forms/preferences/PreferencesEdit.tsx
@@ -191,4 +191,4 @@ class PreferencesPanel extends SaveableObjectForm<PreferencesClass, PreferencesP
     }
 }
 
-export default withTranslation(['transit', 'main', 'form'])(PreferencesPanel);
+export default withTranslation('main')(PreferencesPanel);
diff --git a/packages/transition-frontend/src/components/forms/preferences/PreferencesResetToDefaultButton.tsx b/packages/transition-frontend/src/components/forms/preferences/PreferencesResetToDefaultButton.tsx
index c78156cf..dc979a41 100644
--- a/packages/transition-frontend/src/components/forms/preferences/PreferencesResetToDefaultButton.tsx
+++ b/packages/transition-frontend/src/components/forms/preferences/PreferencesResetToDefaultButton.tsx
@@ -33,4 +33,4 @@ const PreferencesResetToDefaultButton: React.FunctionComponent<PreferencesResetT
     );
 };
 
-export default withTranslation(['main'])(PreferencesResetToDefaultButton);
+export default withTranslation('main')(PreferencesResetToDefaultButton);
diff --git a/packages/transition-frontend/src/components/forms/preferences/sections/PreferencesSectionAccessibility.tsx b/packages/transition-frontend/src/components/forms/preferences/sections/PreferencesSectionAccessibility.tsx
index f0bd004d..d2ee81ad 100644
--- a/packages/transition-frontend/src/components/forms/preferences/sections/PreferencesSectionAccessibility.tsx
+++ b/packages/transition-frontend/src/components/forms/preferences/sections/PreferencesSectionAccessibility.tsx
@@ -29,4 +29,4 @@ const PreferencesSectionTransitRouting: React.FunctionComponent<PreferencesSecti
     </Collapsible>
 );
 
-export default withTranslation(['main', 'transit'])(PreferencesSectionTransitRouting);
+export default withTranslation('transit')(PreferencesSectionTransitRouting);
diff --git a/packages/transition-frontend/src/components/forms/preferences/sections/PreferencesSectionFeatures.tsx b/packages/transition-frontend/src/components/forms/preferences/sections/PreferencesSectionFeatures.tsx
index ad077f8c..50ba6ec3 100644
--- a/packages/transition-frontend/src/components/forms/preferences/sections/PreferencesSectionFeatures.tsx
+++ b/packages/transition-frontend/src/components/forms/preferences/sections/PreferencesSectionFeatures.tsx
@@ -41,4 +41,4 @@ const PreferencesSectionFeatures: React.FunctionComponent<PreferencesSectionProp
     );
 };
 
-export default withTranslation(['main', 'transit'])(PreferencesSectionFeatures);
+export default withTranslation('main')(PreferencesSectionFeatures);
diff --git a/packages/transition-frontend/src/components/forms/preferences/sections/PreferencesSectionRouting.tsx b/packages/transition-frontend/src/components/forms/preferences/sections/PreferencesSectionRouting.tsx
index b5c9ed9b..57e30609 100644
--- a/packages/transition-frontend/src/components/forms/preferences/sections/PreferencesSectionRouting.tsx
+++ b/packages/transition-frontend/src/components/forms/preferences/sections/PreferencesSectionRouting.tsx
@@ -54,4 +54,4 @@ const PreferencesSectionTransitRouting: React.FunctionComponent<PreferencesSecti
     </Collapsible>
 );
 
-export default withTranslation(['main', 'transit'])(PreferencesSectionTransitRouting);
+export default withTranslation('transit')(PreferencesSectionTransitRouting);
diff --git a/packages/transition-frontend/src/components/forms/preferences/sections/PreferencesSectionTransitLineMode.tsx b/packages/transition-frontend/src/components/forms/preferences/sections/PreferencesSectionTransitLineMode.tsx
index fb46e89b..aaabefd4 100644
--- a/packages/transition-frontend/src/components/forms/preferences/sections/PreferencesSectionTransitLineMode.tsx
+++ b/packages/transition-frontend/src/components/forms/preferences/sections/PreferencesSectionTransitLineMode.tsx
@@ -194,4 +194,4 @@ const PreferencesSectionTransitLineMode: React.FunctionComponent<PreferencesSect
     );
 };
 
-export default withTranslation(['main', 'transit'])(PreferencesSectionTransitLineMode);
+export default withTranslation('transit')(PreferencesSectionTransitLineMode);
diff --git a/packages/transition-frontend/src/components/forms/preferences/sections/PreferencesSectionTransitPaths.tsx b/packages/transition-frontend/src/components/forms/preferences/sections/PreferencesSectionTransitPaths.tsx
index a695bac9..e8e84518 100644
--- a/packages/transition-frontend/src/components/forms/preferences/sections/PreferencesSectionTransitPaths.tsx
+++ b/packages/transition-frontend/src/components/forms/preferences/sections/PreferencesSectionTransitPaths.tsx
@@ -20,4 +20,4 @@ const PreferencesSectionTransitPaths: React.FunctionComponent<PreferencesSection
     return null;
 };
 
-export default withTranslation(['main', 'transit'])(PreferencesSectionTransitPaths);
+export default withTranslation()(PreferencesSectionTransitPaths);
diff --git a/packages/transition-frontend/src/components/forms/scenario/TransitScenarioButton.tsx b/packages/transition-frontend/src/components/forms/scenario/TransitScenarioButton.tsx
index f865893e..9e1fb0c5 100644
--- a/packages/transition-frontend/src/components/forms/scenario/TransitScenarioButton.tsx
+++ b/packages/transition-frontend/src/components/forms/scenario/TransitScenarioButton.tsx
@@ -90,4 +90,4 @@ const TransitScenarioButton: React.FunctionComponent<ScenarioButtonProps> = (pro
     );
 };
 
-export default withTranslation(['transit', 'main', 'form', 'notifications'])(TransitScenarioButton);
+export default withTranslation(['transit', 'main'])(TransitScenarioButton);
diff --git a/packages/transition-frontend/src/components/forms/scenario/TransitScenarioEdit.tsx b/packages/transition-frontend/src/components/forms/scenario/TransitScenarioEdit.tsx
index bf126e64..ba7b010c 100644
--- a/packages/transition-frontend/src/components/forms/scenario/TransitScenarioEdit.tsx
+++ b/packages/transition-frontend/src/components/forms/scenario/TransitScenarioEdit.tsx
@@ -355,4 +355,4 @@ class TransitScenarioEdit extends SaveableObjectForm<Scenario, ScenarioFormProps
     }
 }
 
-export default withTranslation(['transit', 'main', 'notifications'])(TransitScenarioEdit);
+export default withTranslation(['transit', 'main', 'form'])(TransitScenarioEdit);
diff --git a/packages/transition-frontend/src/components/forms/scenario/TransitScenarioImportForm.tsx b/packages/transition-frontend/src/components/forms/scenario/TransitScenarioImportForm.tsx
index c30e5fda..46cbaff2 100644
--- a/packages/transition-frontend/src/components/forms/scenario/TransitScenarioImportForm.tsx
+++ b/packages/transition-frontend/src/components/forms/scenario/TransitScenarioImportForm.tsx
@@ -45,4 +45,4 @@ const ScenariosImportForm: React.FunctionComponent<ScenarioImportFormProps & Wit
     );
 };
 
-export default withTranslation(['transit', 'main'])(ScenariosImportForm);
+export default withTranslation(['main', 'notifications'])(ScenariosImportForm);
diff --git a/packages/transition-frontend/src/components/forms/scenario/TransitScenarioLinesDetail.tsx b/packages/transition-frontend/src/components/forms/scenario/TransitScenarioLinesDetail.tsx
index 6ddad299..98a876cc 100644
--- a/packages/transition-frontend/src/components/forms/scenario/TransitScenarioLinesDetail.tsx
+++ b/packages/transition-frontend/src/components/forms/scenario/TransitScenarioLinesDetail.tsx
@@ -56,4 +56,4 @@ const TransitScenarioLinesDetail: React.FunctionComponent<TransitScenarioLinesDe
     );
 };
 
-export default withTranslation(['transit', 'main'])(TransitScenarioLinesDetail);
+export default withTranslation()(TransitScenarioLinesDetail);
diff --git a/packages/transition-frontend/src/components/forms/scenario/TransitScenarioList.tsx b/packages/transition-frontend/src/components/forms/scenario/TransitScenarioList.tsx
index ea4efae9..32708de9 100644
--- a/packages/transition-frontend/src/components/forms/scenario/TransitScenarioList.tsx
+++ b/packages/transition-frontend/src/components/forms/scenario/TransitScenarioList.tsx
@@ -69,4 +69,4 @@ const TransitScenarioList: React.FunctionComponent<ScenarioListProps> = (props:
     );
 };
 
-export default withTranslation(['transit', 'main', 'form', 'notifications'])(TransitScenarioList);
+export default withTranslation('transit')(TransitScenarioList);
diff --git a/packages/transition-frontend/src/components/forms/scenario/TransitScenarioPanel.tsx b/packages/transition-frontend/src/components/forms/scenario/TransitScenarioPanel.tsx
index a3a25ec5..e1b931b8 100644
--- a/packages/transition-frontend/src/components/forms/scenario/TransitScenarioPanel.tsx
+++ b/packages/transition-frontend/src/components/forms/scenario/TransitScenarioPanel.tsx
@@ -95,4 +95,4 @@ const ScenarioPanel: React.FunctionComponent<WithTranslation> = (props: WithTran
     );
 };
 
-export default withTranslation(['transit', 'main', 'form'])(ScenarioPanel);
+export default withTranslation('transit')(ScenarioPanel);
diff --git a/packages/transition-frontend/src/components/forms/schedules/TransitScheduleButton.tsx b/packages/transition-frontend/src/components/forms/schedules/TransitScheduleButton.tsx
index 10ebfb27..b9294f0b 100644
--- a/packages/transition-frontend/src/components/forms/schedules/TransitScheduleButton.tsx
+++ b/packages/transition-frontend/src/components/forms/schedules/TransitScheduleButton.tsx
@@ -94,4 +94,4 @@ const TransitScheduleButton: React.FunctionComponent<ScheduleButtonProps> = (pro
     );
 };
 
-export default withTranslation(['transit', 'main', 'form', 'notifications'])(TransitScheduleButton);
+export default withTranslation(['transit', 'notifications'])(TransitScheduleButton);
diff --git a/packages/transition-frontend/src/components/forms/schedules/TransitScheduleEdit.tsx b/packages/transition-frontend/src/components/forms/schedules/TransitScheduleEdit.tsx
index b108eb37..d34642d2 100644
--- a/packages/transition-frontend/src/components/forms/schedules/TransitScheduleEdit.tsx
+++ b/packages/transition-frontend/src/components/forms/schedules/TransitScheduleEdit.tsx
@@ -631,4 +631,4 @@ class TransitScheduleEdit extends SaveableObjectForm<Schedule, ScheduleFormProps
     }
 }
 
-export default withTranslation(['transit', 'main', 'form', 'notifications'])(TransitScheduleEdit);
+export default withTranslation(['transit', 'main', 'notifications'])(TransitScheduleEdit);
diff --git a/packages/transition-frontend/src/components/forms/schedules/TransitScheduleList.tsx b/packages/transition-frontend/src/components/forms/schedules/TransitScheduleList.tsx
index 86e8b7f2..b1fcac8a 100644
--- a/packages/transition-frontend/src/components/forms/schedules/TransitScheduleList.tsx
+++ b/packages/transition-frontend/src/components/forms/schedules/TransitScheduleList.tsx
@@ -125,4 +125,4 @@ const TransitScheduleList: React.FunctionComponent<ScheduleListProps> = (props:
     );
 };
 
-export default withTranslation(['transit', 'main', 'form', 'notifications'])(TransitScheduleList);
+export default withTranslation('transit')(TransitScheduleList);
diff --git a/packages/transition-frontend/src/components/forms/service/TransitServiceButton.tsx b/packages/transition-frontend/src/components/forms/service/TransitServiceButton.tsx
index ff2d5c79..f2b11698 100644
--- a/packages/transition-frontend/src/components/forms/service/TransitServiceButton.tsx
+++ b/packages/transition-frontend/src/components/forms/service/TransitServiceButton.tsx
@@ -135,4 +135,4 @@ const TransitServiceButton: React.FunctionComponent<ScheduleButtonProps> = (prop
     );
 };
 
-export default withTranslation(['transit', 'main', 'form', 'notifications'])(TransitServiceButton);
+export default withTranslation(['transit', 'main'])(TransitServiceButton);
diff --git a/packages/transition-frontend/src/components/forms/service/TransitServiceEdit.tsx b/packages/transition-frontend/src/components/forms/service/TransitServiceEdit.tsx
index 7b29786a..e007bc6c 100644
--- a/packages/transition-frontend/src/components/forms/service/TransitServiceEdit.tsx
+++ b/packages/transition-frontend/src/components/forms/service/TransitServiceEdit.tsx
@@ -377,4 +377,4 @@ class TransitServiceEdit extends SaveableObjectForm<Service, ServiceFormProps, S
     }
 }
 
-export default withTranslation(['transit', 'main', 'notifications'])(TransitServiceEdit);
+export default withTranslation(['transit', 'main', 'form', 'notifications'])(TransitServiceEdit);
diff --git a/packages/transition-frontend/src/components/forms/service/TransitServiceFilter.tsx b/packages/transition-frontend/src/components/forms/service/TransitServiceFilter.tsx
index ac0574f9..2a90c11d 100644
--- a/packages/transition-frontend/src/components/forms/service/TransitServiceFilter.tsx
+++ b/packages/transition-frontend/src/components/forms/service/TransitServiceFilter.tsx
@@ -145,4 +145,4 @@ const TransitServiceFilter: React.FunctionComponent<TransitServiceFilterProps> =
     );
 };
 
-export default withTranslation(['transit', 'main'])(TransitServiceFilter);
+export default withTranslation('transit')(TransitServiceFilter);
diff --git a/packages/transition-frontend/src/components/forms/service/TransitServiceFilterableList.tsx b/packages/transition-frontend/src/components/forms/service/TransitServiceFilterableList.tsx
index 3cac72b1..26bd2e23 100644
--- a/packages/transition-frontend/src/components/forms/service/TransitServiceFilterableList.tsx
+++ b/packages/transition-frontend/src/components/forms/service/TransitServiceFilterableList.tsx
@@ -52,4 +52,4 @@ const TransitServiceFilterableList: React.FunctionComponent<TransitServiceFilter
     );
 };
 
-export default withTranslation(['transit', 'main'])(TransitServiceFilterableList);
+export default withTranslation()(TransitServiceFilterableList);
diff --git a/packages/transition-frontend/src/components/forms/service/TransitServiceList.tsx b/packages/transition-frontend/src/components/forms/service/TransitServiceList.tsx
index d557e194..8e40f646 100644
--- a/packages/transition-frontend/src/components/forms/service/TransitServiceList.tsx
+++ b/packages/transition-frontend/src/components/forms/service/TransitServiceList.tsx
@@ -117,4 +117,4 @@ const TransitServiceList: React.FunctionComponent<ServiceListProps> = (props: Se
     );
 };
 
-export default withTranslation(['transit', 'main', 'form', 'notifications'])(TransitServiceList);
+export default withTranslation(['transit', 'main', 'notifications'])(TransitServiceList);
diff --git a/packages/transition-frontend/src/components/forms/service/TransitServicePanel.tsx b/packages/transition-frontend/src/components/forms/service/TransitServicePanel.tsx
index 90520829..0efb567b 100644
--- a/packages/transition-frontend/src/components/forms/service/TransitServicePanel.tsx
+++ b/packages/transition-frontend/src/components/forms/service/TransitServicePanel.tsx
@@ -104,4 +104,4 @@ const ServicesPanel: React.FunctionComponent<WithTranslation> = (props: WithTran
     );
 };
 
-export default withTranslation(['transit', 'main', 'form'])(ServicesPanel);
+export default withTranslation('transit')(ServicesPanel);
diff --git a/packages/transition-frontend/src/components/forms/service/TransitServicesImportForm.tsx b/packages/transition-frontend/src/components/forms/service/TransitServicesImportForm.tsx
index 5e52baec..83379009 100644
--- a/packages/transition-frontend/src/components/forms/service/TransitServicesImportForm.tsx
+++ b/packages/transition-frontend/src/components/forms/service/TransitServicesImportForm.tsx
@@ -45,4 +45,4 @@ const ServicesImportForm: React.FunctionComponent<ServicesImportFormProps & With
     );
 };
 
-export default withTranslation(['transit', 'main'])(ServicesImportForm);
+export default withTranslation(['main', 'notifications'])(ServicesImportForm);
diff --git a/packages/transition-frontend/src/components/forms/simulation/SimulationButton.tsx b/packages/transition-frontend/src/components/forms/simulation/SimulationButton.tsx
index a5cb0fe0..7901012b 100644
--- a/packages/transition-frontend/src/components/forms/simulation/SimulationButton.tsx
+++ b/packages/transition-frontend/src/components/forms/simulation/SimulationButton.tsx
@@ -100,4 +100,4 @@ const SimulationButton: React.FunctionComponent<SimulationButtonProps> = (props:
     );
 };
 
-export default withTranslation(['transit', 'main', 'form', 'notifications'])(SimulationButton);
+export default withTranslation(['transit', 'main', 'notifications'])(SimulationButton);
diff --git a/packages/transition-frontend/src/components/forms/simulation/SimulationEdit.tsx b/packages/transition-frontend/src/components/forms/simulation/SimulationEdit.tsx
index 583758da..86806431 100644
--- a/packages/transition-frontend/src/components/forms/simulation/SimulationEdit.tsx
+++ b/packages/transition-frontend/src/components/forms/simulation/SimulationEdit.tsx
@@ -200,4 +200,4 @@ class SimulationEdit extends SaveableObjectForm<Simulation, SimulationFormProps,
     }
 }
 
-export default withTranslation(['transit', 'main', 'notifications'])(SimulationEdit);
+export default withTranslation(['transit', 'main', 'form'])(SimulationEdit);
diff --git a/packages/transition-frontend/src/components/forms/simulation/SimulationList.tsx b/packages/transition-frontend/src/components/forms/simulation/SimulationList.tsx
index 9692df09..636b02f7 100644
--- a/packages/transition-frontend/src/components/forms/simulation/SimulationList.tsx
+++ b/packages/transition-frontend/src/components/forms/simulation/SimulationList.tsx
@@ -70,4 +70,4 @@ const SimulationList: React.FunctionComponent<SimulationListProps> = (props: Sim
     );
 };
 
-export default withTranslation(['transit', 'main', 'form', 'notifications'])(SimulationList);
+export default withTranslation('transit')(SimulationList);
diff --git a/packages/transition-frontend/src/components/forms/simulation/SimulationPanel.tsx b/packages/transition-frontend/src/components/forms/simulation/SimulationPanel.tsx
index 0c819058..40c617b0 100644
--- a/packages/transition-frontend/src/components/forms/simulation/SimulationPanel.tsx
+++ b/packages/transition-frontend/src/components/forms/simulation/SimulationPanel.tsx
@@ -104,4 +104,4 @@ const SimulationsPanel: React.FunctionComponent<WithTranslation> = (props: WithT
     );
 };
 
-export default withTranslation(['transit', 'main', 'form'])(SimulationsPanel);
+export default withTranslation()(SimulationsPanel);
diff --git a/packages/transition-frontend/src/components/forms/simulation/widgets/BaseSimulationComponent.tsx b/packages/transition-frontend/src/components/forms/simulation/widgets/BaseSimulationComponent.tsx
index 0d90a724..853c3a28 100644
--- a/packages/transition-frontend/src/components/forms/simulation/widgets/BaseSimulationComponent.tsx
+++ b/packages/transition-frontend/src/components/forms/simulation/widgets/BaseSimulationComponent.tsx
@@ -62,4 +62,4 @@ const BaseSimulationComponent: React.FunctionComponent<BaseSimulationComponentPr
     );
 };
 
-export default withTranslation(['transit', 'main'])(BaseSimulationComponent);
+export default withTranslation('transit')(BaseSimulationComponent);
diff --git a/packages/transition-frontend/src/components/forms/simulation/widgets/SimulationParametersComponent.tsx b/packages/transition-frontend/src/components/forms/simulation/widgets/SimulationParametersComponent.tsx
index d62326a4..e27d694a 100644
--- a/packages/transition-frontend/src/components/forms/simulation/widgets/SimulationParametersComponent.tsx
+++ b/packages/transition-frontend/src/components/forms/simulation/widgets/SimulationParametersComponent.tsx
@@ -139,4 +139,4 @@ const SimulationParametersComponent: React.FunctionComponent<SimulationParameter
     );
 };
 
-export default withTranslation(['transit', 'main'])(SimulationParametersComponent);
+export default withTranslation('transit')(SimulationParametersComponent);
diff --git a/packages/transition-frontend/src/components/forms/simulation/widgets/SimulationRunButton.tsx b/packages/transition-frontend/src/components/forms/simulation/widgets/SimulationRunButton.tsx
index 047edffd..df096309 100644
--- a/packages/transition-frontend/src/components/forms/simulation/widgets/SimulationRunButton.tsx
+++ b/packages/transition-frontend/src/components/forms/simulation/widgets/SimulationRunButton.tsx
@@ -127,4 +127,4 @@ const SimulationRunButton: React.FunctionComponent<SimulationRunButtonProps> = (
     );
 };
 
-export default withTranslation(['transit', 'main', 'form', 'notifications'])(SimulationRunButton);
+export default withTranslation(['transit', 'notifications'])(SimulationRunButton);
diff --git a/packages/transition-frontend/src/components/forms/simulation/widgets/SimulationRunDetail.tsx b/packages/transition-frontend/src/components/forms/simulation/widgets/SimulationRunDetail.tsx
index b014a2ba..0f73a354 100644
--- a/packages/transition-frontend/src/components/forms/simulation/widgets/SimulationRunDetail.tsx
+++ b/packages/transition-frontend/src/components/forms/simulation/widgets/SimulationRunDetail.tsx
@@ -65,4 +65,4 @@ const SimulationRunDetail: React.FunctionComponent<SimulationRunDetailProps> = (
     );
 };
 
-export default withTranslation(['transit', 'main', 'form', 'notifications'])(SimulationRunDetail);
+export default withTranslation('transit')(SimulationRunDetail);
diff --git a/packages/transition-frontend/src/components/forms/simulation/widgets/SimulationRunList.tsx b/packages/transition-frontend/src/components/forms/simulation/widgets/SimulationRunList.tsx
index c73c4cef..e908b804 100644
--- a/packages/transition-frontend/src/components/forms/simulation/widgets/SimulationRunList.tsx
+++ b/packages/transition-frontend/src/components/forms/simulation/widgets/SimulationRunList.tsx
@@ -61,4 +61,4 @@ const SimulationRunList: React.FunctionComponent<SimulationRunListProps> = (prop
     );
 };
 
-export default withTranslation(['transit', 'main', 'form', 'notifications'])(SimulationRunList);
+export default withTranslation('transit')(SimulationRunList);
diff --git a/packages/transition-frontend/src/components/forms/transitCalculation/widgets/AttributeSelectionWidget.tsx b/packages/transition-frontend/src/components/forms/transitCalculation/widgets/AttributeSelectionWidget.tsx
index 8c3a1612..8709dac7 100644
--- a/packages/transition-frontend/src/components/forms/transitCalculation/widgets/AttributeSelectionWidget.tsx
+++ b/packages/transition-frontend/src/components/forms/transitCalculation/widgets/AttributeSelectionWidget.tsx
@@ -57,7 +57,7 @@ function CsvAttributeSelectionWidgetBase<T extends object>(
     );
 }
 
-export const CsvAttributeSelectionWidget = withTranslation(['transit', 'main'])(
+export const CsvAttributeSelectionWidget = withTranslation('transit')(
     CsvAttributeSelectionWidgetBase
 ) as unknown as <T extends object>(props: BatchCsvAttributeSelectionComponentProps<T>) => JSX.Element;
 
@@ -92,7 +92,7 @@ function BooleanAttributeSelectionWidgetBase<T extends object>(
 }
 
 // we need to add as unknown since
-export const BooleanAttributeSelectionWidget = withTranslation(['transit', 'main'])(
+export const BooleanAttributeSelectionWidget = withTranslation('transit')(
     BooleanAttributeSelectionWidgetBase
 ) as unknown as <T extends object>(props: BatchAttributeSelectionComponentProps<T>) => JSX.Element;
 
@@ -138,7 +138,7 @@ function TimeAttributeSelectionWidgetBase<T extends Partial<TransitDemandFromCsv
     );
 }
 
-export const TimeAttributeSelectionWidget = withTranslation(['transit', 'main'])(TimeAttributeSelectionWidgetBase);
+export const TimeAttributeSelectionWidget = withTranslation('transit')(TimeAttributeSelectionWidgetBase);
 
 function TimeFormatAttributeSelectionWidgetBase<T extends Partial<TransitDemandFromCsvAttributes>>(
     props: BatchAttributeSelectionComponentProps<T> & WithTranslation
@@ -172,6 +172,6 @@ function TimeFormatAttributeSelectionWidgetBase<T extends Partial<TransitDemandF
     );
 }
 
-export const TimeFormatAttributeSelectionWidget = withTranslation(['transit', 'main'])(
+export const TimeFormatAttributeSelectionWidget = withTranslation('transit')(
     TimeFormatAttributeSelectionWidgetBase
 );
diff --git a/packages/transition-frontend/src/components/forms/transitRouting/RoutingResultComponent.tsx b/packages/transition-frontend/src/components/forms/transitRouting/RoutingResultComponent.tsx
index 396c41e5..1594116b 100644
--- a/packages/transition-frontend/src/components/forms/transitRouting/RoutingResultComponent.tsx
+++ b/packages/transition-frontend/src/components/forms/transitRouting/RoutingResultComponent.tsx
@@ -115,4 +115,4 @@ const RoutingResults: React.FunctionComponent<TransitRoutingResultsProps> = (pro
     );
 };
 
-export default withTranslation(['transit', 'main'])(RoutingResults);
+export default withTranslation()(RoutingResults);
diff --git a/packages/transition-frontend/src/components/forms/transitRouting/RoutingResultsComponent.tsx b/packages/transition-frontend/src/components/forms/transitRouting/RoutingResultsComponent.tsx
index 4c40a846..99880b83 100644
--- a/packages/transition-frontend/src/components/forms/transitRouting/RoutingResultsComponent.tsx
+++ b/packages/transition-frontend/src/components/forms/transitRouting/RoutingResultsComponent.tsx
@@ -64,4 +64,4 @@ const RoutingResults: React.FunctionComponent<TransitRoutingResultsProps> = (pro
     );
 };
 
-export default withTranslation(['transit', 'main'])(RoutingResults);
+export default withTranslation('transit')(RoutingResults);
diff --git a/packages/transition-frontend/src/components/forms/transitRouting/TransitRoutingBatchForm.tsx b/packages/transition-frontend/src/components/forms/transitRouting/TransitRoutingBatchForm.tsx
index cb88cf5b..53529bc2 100644
--- a/packages/transition-frontend/src/components/forms/transitRouting/TransitRoutingBatchForm.tsx
+++ b/packages/transition-frontend/src/components/forms/transitRouting/TransitRoutingBatchForm.tsx
@@ -65,4 +65,4 @@ class TransitRoutingBatchForm extends ChangeEventsForm<
 
 // ** File upload
 //export default FileUploaderHOC(TransitRoutingForm, null, false);
-export default withTranslation(['transit', 'main'])(TransitRoutingBatchForm);
+export default withTranslation('transit')(TransitRoutingBatchForm);
diff --git a/packages/transition-frontend/src/components/forms/transitRouting/TransitRoutingForm.tsx b/packages/transition-frontend/src/components/forms/transitRouting/TransitRoutingForm.tsx
index 21d92e49..8cee379b 100644
--- a/packages/transition-frontend/src/components/forms/transitRouting/TransitRoutingForm.tsx
+++ b/packages/transition-frontend/src/components/forms/transitRouting/TransitRoutingForm.tsx
@@ -493,4 +493,4 @@ class TransitRoutingForm extends ChangeEventsForm<TransitRoutingFormProps, Trans
     }
 }
 
-export default withTranslation(['transit', 'main'])(TransitRoutingForm);
+export default withTranslation(['transit', 'main', 'form'])(TransitRoutingForm);
diff --git a/packages/transition-frontend/src/components/forms/transitRouting/widgets/BatchAttributesSelection.tsx b/packages/transition-frontend/src/components/forms/transitRouting/widgets/BatchAttributesSelection.tsx
index 0c337dc3..c9e1d805 100644
--- a/packages/transition-frontend/src/components/forms/transitRouting/widgets/BatchAttributesSelection.tsx
+++ b/packages/transition-frontend/src/components/forms/transitRouting/widgets/BatchAttributesSelection.tsx
@@ -84,4 +84,4 @@ const BatchAttributesSelectionComponent: React.FunctionComponent<BatchAttributes
     );
 };
 
-export default withTranslation(['transit', 'main'])(BatchAttributesSelectionComponent);
+export default withTranslation('main')(BatchAttributesSelectionComponent);
diff --git a/packages/transition-frontend/src/components/forms/transitRouting/widgets/BatchSaveToDb.tsx b/packages/transition-frontend/src/components/forms/transitRouting/widgets/BatchSaveToDb.tsx
index 68efea5c..7feeae7b 100644
--- a/packages/transition-frontend/src/components/forms/transitRouting/widgets/BatchSaveToDb.tsx
+++ b/packages/transition-frontend/src/components/forms/transitRouting/widgets/BatchSaveToDb.tsx
@@ -122,7 +122,7 @@ const SaveToDbChoiceComponent: React.FunctionComponent<SaveToDbChoiceComponentPr
     );
 };
 
-const SaveToDbChoiceComponentTranslated = withTranslation(['transit', 'main'])(SaveToDbChoiceComponent);
+const SaveToDbChoiceComponentTranslated = withTranslation('transit')(SaveToDbChoiceComponent);
 
 const BatchSaveToDbComponent: React.FunctionComponent<BatchAttributesSelectionComponentProps> = (
     props: BatchAttributesSelectionComponentProps
@@ -167,4 +167,4 @@ const BatchSaveToDbComponent: React.FunctionComponent<BatchAttributesSelectionCo
     );
 };
 
-export default withTranslation(['transit', 'main'])(BatchSaveToDbComponent);
+export default withTranslation('transit')(BatchSaveToDbComponent);
diff --git a/packages/transition-frontend/src/components/forms/transitRouting/widgets/ODCoordinatesComponent.tsx b/packages/transition-frontend/src/components/forms/transitRouting/widgets/ODCoordinatesComponent.tsx
index 3743dd56..65fd5786 100644
--- a/packages/transition-frontend/src/components/forms/transitRouting/widgets/ODCoordinatesComponent.tsx
+++ b/packages/transition-frontend/src/components/forms/transitRouting/widgets/ODCoordinatesComponent.tsx
@@ -284,4 +284,4 @@ class ODCoordinatesComponent extends React.Component<ODCoordinatesComponentProps
     }
 }
 
-export default withTranslation(['transit', 'main'])(ODCoordinatesComponent);
+export default withTranslation('transit')(ODCoordinatesComponent);
diff --git a/packages/transition-frontend/src/components/forms/transitRouting/widgets/TimeOfTripComponent.tsx b/packages/transition-frontend/src/components/forms/transitRouting/widgets/TimeOfTripComponent.tsx
index e6c905d9..70c452b9 100644
--- a/packages/transition-frontend/src/components/forms/transitRouting/widgets/TimeOfTripComponent.tsx
+++ b/packages/transition-frontend/src/components/forms/transitRouting/widgets/TimeOfTripComponent.tsx
@@ -48,4 +48,4 @@ const TimeOfTripComponent: React.FunctionComponent<TimeOfTripComponentProps> = (
     );
 };
 
-export default withTranslation(['transit', 'main'])(TimeOfTripComponent);
+export default withTranslation('transit')(TimeOfTripComponent);
diff --git a/packages/transition-frontend/src/components/forms/transitRouting/widgets/TransitRoutingBaseComponent.tsx b/packages/transition-frontend/src/components/forms/transitRouting/widgets/TransitRoutingBaseComponent.tsx
index adef2fcb..4b814120 100644
--- a/packages/transition-frontend/src/components/forms/transitRouting/widgets/TransitRoutingBaseComponent.tsx
+++ b/packages/transition-frontend/src/components/forms/transitRouting/widgets/TransitRoutingBaseComponent.tsx
@@ -100,4 +100,4 @@ const TransitRoutingBaseComponent: React.FunctionComponent<TransitRoutingBaseCom
     );
 };
 
-export default withTranslation(['transit', 'main'])(TransitRoutingBaseComponent);
+export default withTranslation('transit')(TransitRoutingBaseComponent);
diff --git a/packages/transition-frontend/src/components/parts/Button.tsx b/packages/transition-frontend/src/components/parts/Button.tsx
index bddf6443..28addd30 100644
--- a/packages/transition-frontend/src/components/parts/Button.tsx
+++ b/packages/transition-frontend/src/components/parts/Button.tsx
@@ -109,4 +109,4 @@ const Button: React.FunctionComponent<ButtonProps> = (props: ButtonProps) => {
     );
 };
 
-export default withTranslation(['transit', 'main', 'form', 'notifications'])(Button);
+export default withTranslation('main')(Button);
diff --git a/packages/transition-frontend/src/components/parts/DocumentationTooltip.tsx b/packages/transition-frontend/src/components/parts/DocumentationTooltip.tsx
index 26674407..d287770c 100644
--- a/packages/transition-frontend/src/components/parts/DocumentationTooltip.tsx
+++ b/packages/transition-frontend/src/components/parts/DocumentationTooltip.tsx
@@ -83,4 +83,4 @@ const DocumentationTooltip: React.FunctionComponent<DocumentationTooltipProps> =
     }
 };
 
-export default withTranslation(['transit'])(DocumentationTooltip);
+export default withTranslation('transit')(DocumentationTooltip);
diff --git a/packages/transition-frontend/src/components/parts/FileImportForm.tsx b/packages/transition-frontend/src/components/parts/FileImportForm.tsx
index c2fc5960..8e2b0999 100644
--- a/packages/transition-frontend/src/components/parts/FileImportForm.tsx
+++ b/packages/transition-frontend/src/components/parts/FileImportForm.tsx
@@ -80,7 +80,4 @@ const FileImportForm: React.FunctionComponent<FileImportFormProps & WithTranslat
     );
 };
 
-export default FileUploaderHOC(
-    withTranslation(['transit', 'main', 'form', 'notifications'])(FileImportForm),
-    ImporterValidator
-);
+export default FileUploaderHOC(withTranslation('main')(FileImportForm), ImporterValidator);