Skip to content

Commit

Permalink
Update the arguments in withTranslation() exports.
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
GabrielBruno24 authored and tahini committed Dec 3, 2024
1 parent 460ea27 commit aa098e9
Show file tree
Hide file tree
Showing 101 changed files with 111 additions and 114 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Original file line number Diff line number Diff line change
Expand Up @@ -77,4 +77,4 @@ const NotificationArea: React.FunctionComponent<WithTranslation> = (props: WithT
);
};

export default withTranslation([])(NotificationArea);
export default withTranslation()(NotificationArea);
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,4 @@ const RightPanel: React.FunctionComponent<RightPanelProps> = ({ contributions, .
);
};

export default withTranslation(['transit', 'main'])(RightPanel);
export default withTranslation()(RightPanel);
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,4 @@ const Toolbar: React.FunctionComponent<MenuBarProps> = ({ contributions, ...prop
);
};

export default withTranslation(['transit', 'main'])(Toolbar);
export default withTranslation()(Toolbar);
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Original file line number Diff line number Diff line change
Expand Up @@ -125,4 +125,4 @@ export class DayRange extends React.Component<DayRangeProps> {
}
}

export default withTranslation(['main'])(DayRange);
export default withTranslation('main')(DayRange);
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Original file line number Diff line number Diff line change
Expand Up @@ -113,4 +113,4 @@ export class ConfirmModal extends React.Component<ConfirmModalProps> {
}
}

export default withTranslation()(ConfirmModal);
export default withTranslation('main')(ConfirmModal);
Original file line number Diff line number Diff line change
Expand Up @@ -120,4 +120,4 @@ const CollectionDownloadButtons = function (props: CollectionDownloadButtonsProp
);
};

export default withTranslation('main')(CollectionDownloadButtons);
export default withTranslation()(CollectionDownloadButtons);
Original file line number Diff line number Diff line change
Expand Up @@ -59,4 +59,4 @@ const DistanceUnitFormatter: React.FunctionComponent<DistanceUnitFormatterProps>
return <span onClick={cycleThroughDestinationUnits}>{formattedValue}</span>;
};

export default withTranslation([])(DistanceUnitFormatter);
export default withTranslation('main')(DistanceUnitFormatter);
Original file line number Diff line number Diff line change
Expand Up @@ -65,4 +65,4 @@ const DurationUnitFormatter: React.FunctionComponent<DurationUnitFormatterProps>
return <span onClick={cycleThroughDestinationUnits}>{formattedValue}</span>;
};

export default withTranslation([])(DurationUnitFormatter);
export default withTranslation('main')(DurationUnitFormatter);
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,4 @@ const FormErrors: React.FunctionComponent<FormErrorsProps> = (props: FormErrorsP
}
};

export default withTranslation([])(FormErrors);
export default withTranslation('auth')(FormErrors);
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -195,4 +195,4 @@ const SelectedObjectButtons: React.FunctionComponent<SelectedObjectButtonsProps<
);
};

export default withTranslation([])(SelectedObjectButtons);
export default withTranslation(['main', 'notifications'])(SelectedObjectButtons);
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Original file line number Diff line number Diff line change
Expand Up @@ -120,4 +120,4 @@ const UsersComponent: React.FunctionComponent<WithTranslation> = (props: WithTra
);
};

export default withTranslation(['admin', 'main'])(UsersComponent);
export default withTranslation('admin')(UsersComponent);
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ exports[`Should correctly render NotFound page 1`] = `
href="/"
onClick={[Function]}
>
BackToHomePage
auth:BackToHomePage
</a>
</LinkAnchor>
</Link>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ exports[`Should correctly render Unauthorized page 1`] = `
tReady={false}
>
<div>
Unauthorized
auth:Unauthorized
-
<Link
to="/login"
Expand All @@ -44,7 +44,7 @@ exports[`Should correctly render Unauthorized page 1`] = `
href="/login"
onClick={[Function]}
>
BackToLoginPage
auth:BackToLoginPage
</a>
</LinkAnchor>
</Link>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,4 @@ const FullSizePanel: React.FunctionComponent<LayoutSectionProps> = (props: Layou
);
};

export default withTranslation(['transit', 'main', 'form'])(FullSizePanel);
export default withTranslation()(FullSizePanel);
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,4 @@ const RightPanel: React.FunctionComponent<RightPanelProps> = (props: RightPanelP
);
};

export default withTranslation(['transit', 'main', 'form'])(RightPanel);
export default withTranslation()(RightPanel);
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Original file line number Diff line number Diff line change
Expand Up @@ -466,4 +466,4 @@ class AccessibilityMapForm extends ChangeEventsForm<AccessibilityMapFormProps, T
}
}

export default withTranslation(['transit', 'main'])(AccessibilityMapForm);
export default withTranslation(['transit', 'main', 'form', 'notifications'])(AccessibilityMapForm);
Original file line number Diff line number Diff line change
Expand Up @@ -80,4 +80,4 @@ const BatchAttributesSelectionComponent: React.FunctionComponent<BatchAttributes
);
};

export default withTranslation(['transit', 'main'])(BatchAttributesSelectionComponent);
export default withTranslation('main')(BatchAttributesSelectionComponent);
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,4 @@ const AgenciesImportForm: React.FunctionComponent<AgencyImportFormProps & WithTr
);
};

export default withTranslation(['transit', 'main'])(AgenciesImportForm);
export default withTranslation(['main', 'notifications'])(AgenciesImportForm);
Original file line number Diff line number Diff line change
Expand Up @@ -136,4 +136,4 @@ const TransitAgencyList: React.FunctionComponent<AgencyListProps> = (props: Agen
);
};

export default withTranslation(['transit', 'main'])(TransitAgencyList);
export default withTranslation('transit')(TransitAgencyList);
Original file line number Diff line number Diff line change
Expand Up @@ -228,4 +228,4 @@ const AgencyPanel: React.FunctionComponent<AgencyPanelProps> = (props: AgencyPan
);
};

export default withTranslation(['transit', 'main', 'form'])(AgencyPanel);
export default withTranslation(['transit', 'form'])(AgencyPanel);
Original file line number Diff line number Diff line change
Expand Up @@ -69,4 +69,4 @@ const BatchCalculationList: React.FunctionComponent<BatchCalculationListProps> =
);
};

export default withTranslation(['transit', 'main', 'form', 'notifications'])(BatchCalculationList);
export default withTranslation('transit')(BatchCalculationList);
Original file line number Diff line number Diff line change
Expand Up @@ -69,4 +69,4 @@ const CalculationPanel: React.FunctionComponent<CalculationPanelPanelProps & Wit
);
};

export default withTranslation(['transit', 'main', 'form'])(CalculationPanel);
export default withTranslation()(CalculationPanel);
Original file line number Diff line number Diff line change
Expand Up @@ -156,4 +156,4 @@ const ConfigureCalculationParametersForm: React.FunctionComponent<
);
};

export default withTranslation(['transit', 'main'])(ConfigureCalculationParametersForm);
export default withTranslation('transit')(ConfigureCalculationParametersForm);
Original file line number Diff line number Diff line change
Expand Up @@ -117,4 +117,4 @@ const GtfsExistingAgencyImport: React.FunctionComponent<GtfsExistingAgencyImport
);
};

export default withTranslation(['transit', 'main'])(GtfsExistingAgencyImport);
export default withTranslation('transit')(GtfsExistingAgencyImport);
Original file line number Diff line number Diff line change
Expand Up @@ -155,4 +155,4 @@ class GtfsExportForm extends ChangeEventsForm<WithTranslation, ChangeEventsState
}
}

export default withTranslation(['transit', 'main'])(GtfsExportForm);
export default withTranslation('transit')(GtfsExportForm);
Original file line number Diff line number Diff line change
Expand Up @@ -67,4 +67,4 @@ const GtfsImportAgenciesComponent: React.FunctionComponent<GtfsImportAgenciesCom
);
};

export default withTranslation(['transit', 'main'])(GtfsImportAgenciesComponent);
export default withTranslation()(GtfsImportAgenciesComponent);
Original file line number Diff line number Diff line change
Expand Up @@ -518,4 +518,4 @@ class GtfsImportForm extends React.Component<GtfsImportProps, GtfsImportState> {
}
}

export default withTranslation(['transit', 'main', 'notifications'])(GtfsImportForm);
export default withTranslation(['transit', 'notifications'])(GtfsImportForm);
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,4 @@ const GtfsImportNodesComponent: React.FunctionComponent<GtfsImportNodesComponent
);
};

export default withTranslation(['transit', 'main'])(GtfsImportNodesComponent);
export default withTranslation('transit')(GtfsImportNodesComponent);
Original file line number Diff line number Diff line change
Expand Up @@ -74,4 +74,4 @@ const GtfsImportServiceComponent: React.FunctionComponent<GtfsImportServiceCompo
);
};

export default withTranslation(['transit', 'main'])(GtfsImportServiceComponent);
export default withTranslation('main')(GtfsImportServiceComponent);
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@ const LineImportForm: React.FunctionComponent<LineImportFormProps & WithTranslat
);
};

export default withTranslation(['transit', 'main'])(LineImportForm);
export default withTranslation(['main', 'notifications'])(LineImportForm);
Original file line number Diff line number Diff line change
Expand Up @@ -323,4 +323,4 @@ class TransitNodeCollectionEdit extends React.Component<
}
}

export default withTranslation(['transit', 'main', 'notifications'])(TransitNodeCollectionEdit);
export default withTranslation(['transit', 'main', 'form', 'notifications'])(TransitNodeCollectionEdit);
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,4 @@ const NodesImportForm: React.FunctionComponent<NodeImportFormProps & WithTransla
);
};

export default withTranslation(['transit', 'main'])(NodesImportForm);
export default withTranslation(['notifications', 'main'])(NodesImportForm);
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Original file line number Diff line number Diff line change
Expand Up @@ -99,4 +99,4 @@ const TransitNodeStatistics: React.FunctionComponent<NodeStatsProps> = (props: N
);
};

export default withTranslation(['transit'])(TransitNodeStatistics);
export default withTranslation('transit')(TransitNodeStatistics);
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,4 @@ const PathsImportForm: React.FunctionComponent<PathImportFormProps & WithTransla
);
};

export default withTranslation(['transit', 'main'])(PathsImportForm);
export default withTranslation(['main', 'notifications'])(PathsImportForm);
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,4 @@ const TransitPathList: React.FunctionComponent<PathListProps> = (props: PathList
);
};

export default withTranslation(['transit', 'main', 'form', 'notifications'])(TransitPathList);
export default withTranslation('transit')(TransitPathList);
Original file line number Diff line number Diff line change
Expand Up @@ -96,4 +96,4 @@ const TransitPathNodeList: React.FunctionComponent<PathListProps> = (props: Path
);
};

export default withTranslation(['transit', 'main'])(TransitPathNodeList);
export default withTranslation('transit')(TransitPathNodeList);
Original file line number Diff line number Diff line change
Expand Up @@ -191,4 +191,4 @@ class PreferencesPanel extends SaveableObjectForm<PreferencesClass, PreferencesP
}
}

export default withTranslation(['transit', 'main', 'form'])(PreferencesPanel);
export default withTranslation('main')(PreferencesPanel);
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@ const PreferencesResetToDefaultButton: React.FunctionComponent<PreferencesResetT
);
};

export default withTranslation(['main'])(PreferencesResetToDefaultButton);
export default withTranslation('main')(PreferencesResetToDefaultButton);
Loading

0 comments on commit aa098e9

Please sign in to comment.