Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ensure we initialize the i18nProvider with the locale specified on Admin #3723

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 0 additions & 23 deletions packages/react-admin/src/Admin.ts

This file was deleted.

38 changes: 38 additions & 0 deletions packages/react-admin/src/Admin.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
import React, { FunctionComponent } from 'react';
import { CoreAdmin } from 'ra-core';
import {
Layout as DefaultLayout,
Loading,
Login,
Logout,
NotFound,
} from 'ra-ui-materialui';

import defaultI18nProvider from './defaultI18nProvider';
import { AdminProps } from 'ra-core/esm/CoreAdmin';

const Admin: FunctionComponent<AdminProps> = ({
locale,
i18nProvider,
...props
}) => {
const finalI18nProvider = i18nProvider || defaultI18nProvider(locale);

return (
<CoreAdmin
locale={locale}
i18nProvider={finalI18nProvider}
{...props}
/>
);
};

Admin.defaultProps = {
appLayout: DefaultLayout,
catchAll: NotFound,
loading: Loading,
loginPage: Login,
logoutButton: Logout,
};

export default Admin;