Merge pull request #153 from open-schools/feature/SCHOOL-814/antd-int…

…ernationalization Translate antd into Russian
open-schools · Jul 19, 2024 · 94e6184 · 94e6184
2 parents e496387 + 0915ffc
commit 94e6184
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 20 deletions.
diff --git a/apps/schools/domains/user/components/profile/profileEdit/index.tsx b/apps/schools/domains/user/components/profile/profileEdit/index.tsx
@@ -63,7 +63,7 @@ export function ProfileEdit() {
                             required={true}
                             label={
                                 <span>
-                                        <span className={styles.requiredMark}>*</span> Ф.И.О.
+                                    <span className={styles.requiredMark}>*</span> Ф.И.О.
                                 </span>
                             }
                             name={USER_NAME}
@@ -78,7 +78,7 @@ export function ProfileEdit() {
                             required={true}
                             label={
                                 <span>
-                                        <span className={styles.requiredMark}>*</span> Email сотрудника
+                                    <span className={styles.requiredMark}>*</span> Email сотрудника
                                 </span>
                             }
                             name={USER_EMAIL}

diff --git a/apps/schools/domains/user/components/profile/profileInfo/index.tsx b/apps/schools/domains/user/components/profile/profileInfo/index.tsx
@@ -40,11 +40,7 @@ export function ProfileInfo() {
                 ) : (
                     results.data?.results.map((employee) => (
                         <div key={employee.id} className={styles.organizationContainer}>
-                            <Field
-                                fieldName={'Организация:'}
-                                fieldValue={employee.organization__name}
-                                type={'right'}
-                            />
+                            <Field fieldName={'Организация:'} fieldValue={employee.organization__name} type={'right'} />
                             <Field
                                 fieldName={'Должность:'}
                                 fieldValue={employee.position}
@@ -55,7 +51,12 @@ export function ProfileInfo() {
                     ))
                 )}
 
-                <Button className={styles.editButton} type='schoolDefaultAuto' block onClick={() => router.push(RoutePath[AppRoutes.USER_EDIT])}>
+                <Button
+                    className={styles.editButton}
+                    type='schoolDefaultAuto'
+                    block
+                    onClick={() => router.push(RoutePath[AppRoutes.USER_EDIT])}
+                >
                     Редактировать профиль
                 </Button>
             </Col>

diff --git a/apps/schools/pages/_app.tsx b/apps/schools/pages/_app.tsx
@@ -10,7 +10,8 @@ import Head from 'next/head'
 import { OrganizationProvider } from '@domains/organization/providers/organizationProvider'
 import { BaseLayout } from '@domains/common/components/containers/BaseLayoutComponents/BaseLayout'
 import { LayoutContextProvider } from '@domains/user/providers/baseLayoutProvider'
-import { message } from 'antd'
+import { ConfigProvider, message } from 'antd'
+import ru_RU from 'antd/lib/locale/ru_RU'
 import { EventBusProvider } from '@domains/common/providers/eventBusProvider'
 import { AppRoutes, RoutePath } from '@domains/common/constants/routerEnums'
 
@@ -49,17 +50,19 @@ function MyApp({ Component, pageProps }: CustomAppProps): JSX.Element {
             <Provider store={store}>
                 <EventBusProvider>
                     <AuthProvider>
-                        <LayoutContextProvider>
-                            <OrganizationProvider>
-                                <Head>
-                                    <title>Открытые школы</title>
-                                    <link rel='icon' href='/icons/logo.svg' sizes='any' />
-                                </Head>
-                                <LayoutComponent>
-                                    <Component {...pageProps} />
-                                </LayoutComponent>
-                            </OrganizationProvider>
-                        </LayoutContextProvider>
+                        <ConfigProvider locale={ru_RU}>
+                            <LayoutContextProvider>
+                                <OrganizationProvider>
+                                    <Head>
+                                        <title>Открытые школы</title>
+                                        <link rel='icon' href='/icons/logo.svg' sizes='any' />
+                                    </Head>
+                                    <LayoutComponent>
+                                        <Component {...pageProps} />
+                                    </LayoutComponent>
+                                </OrganizationProvider>
+                            </LayoutContextProvider>
+                        </ConfigProvider>
                     </AuthProvider>
                 </EventBusProvider>
             </Provider>