IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Web.Common: replaced changeLanguage function, removed connect HOC

Browse Source
This commit is contained in:
Daniil Senkiv 2020-02-05 10:58:57 +03:00
parent 77f88297ed
commit 42d9258d99
5 changed files with 25 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
web/ASC.Web.Common/src/pages/errors/401/index.js
View File

@ -1,26 +1,21 @@
import React, { useEffect } from 'react';
import { connect } from "react-redux";
import ErrorContainer from '../../../components/ErrorContainer';
import { useTranslation } from 'react-i18next';
import i18n from './i18n';
import { changeLanguage } from '../../../utils';
const Error404Container = ({language}) => {
const Error404Container = () => {
const { t } = useTranslation('translation', { i18n });
useEffect(() => {
i18n.changeLanguage(language);
}, [language]);
changeLanguage(i18n);
}, []);
return <ErrorContainer headerText={t("Error401Text")} />;
};
function mapStateToProps(state) {
return {
language: state.auth.user.cultureName || state.auth.settings.culture,
};
}
const Error401 = connect(mapStateToProps)(Error404Container);
const Error401 = Error404Container;
export default Error401;

16
web/ASC.Web.Common/src/pages/errors/404/index.js
View File

@ -1,26 +1,20 @@
import React, { useEffect } from 'react';
import { connect } from "react-redux";
import ErrorContainer from '../../../components/ErrorContainer';
import { useTranslation } from 'react-i18next';
import i18n from './i18n';
import { changeLanguage } from '../../../utils';
const Error404Container = ({language}) => {
const Error404Container = () => {
const { t } = useTranslation('translation', { i18n });
useEffect(() => {
i18n.changeLanguage(language);
}, [language]);
changeLanguage(i18n);
}, []);
return <ErrorContainer headerText={t("Error404Text")} />;
};
function mapStateToProps(state) {
return {
language: state.auth.user.cultureName || state.auth.settings.culture,
};
}
const Error404 = connect(mapStateToProps)(Error404Container);
const Error404 = Error404Container;
export default Error404;

16
web/ASC.Web.Common/src/pages/errors/520/index.js
View File

@ -1,26 +1,20 @@
import React, { useEffect } from 'react';
import { connect } from "react-redux";
import ErrorContainer from '../../../components/ErrorContainer';
import { useTranslation } from 'react-i18next';
import i18n from './i18n';
import { changeLanguage } from '../../../utils';
const Error520Container = ({language}) => {
const Error520Container = () => {
const { t } = useTranslation('translation', { i18n });
useEffect(() => {
i18n.changeLanguage(language);
}, [language]);
changeLanguage(i18n);
}, []);
return <ErrorContainer headerText={t("Error520Text")} />;
};
function mapStateToProps(state) {
return {
language: state.auth.user.cultureName || state.auth.settings.culture,
};
}
const Error404 = connect(mapStateToProps)(Error520Container);
const Error404 = Error520Container;
export default Error404;

16
web/ASC.Web.Common/src/pages/errors/comingsoon/index.js
View File

@ -1,15 +1,15 @@
import React, { useEffect } from "react";
import { connect } from "react-redux";
import ErrorContainer from '../../../components/ErrorContainer';
import { useTranslation } from "react-i18next";
import i18n from "./i18n";
import { changeLanguage } from '../../../utils';
const ComingSoonContainer = ({ language }) => {
const ComingSoonContainer = () => {
const { t } = useTranslation("translation", { i18n });
useEffect(() => {
i18n.changeLanguage(language);
}, [language]);
changeLanguage(i18n);
}, []);
return (
<ErrorContainer
@ -21,12 +21,6 @@ const ComingSoonContainer = ({ language }) => {
);
};
function mapStateToProps(state) {
return {
language: state.auth.user.cultureName || state.auth.settings.culture
};
}
const ComingSoon = connect(mapStateToProps)(ComingSoonContainer);
const ComingSoon = ComingSoonContainer;
export default ComingSoon;

16
web/ASC.Web.Common/src/pages/errors/offline/index.js
View File

@ -1,25 +1,19 @@
import React, { useEffect } from 'react';
import { connect } from "react-redux";
import ErrorContainer from '../../../components/ErrorContainer';
import { useTranslation } from 'react-i18next';
import i18n from './i18n';
import { changeLanguage } from '../../../utils';
const ErrorOfflineContainer = ({language}) => {
const ErrorOfflineContainer = () => {
const { t } = useTranslation('translation', { i18n });
useEffect(() => {
i18n.changeLanguage(language);
}, [language]);
changeLanguage(i18n);
}, []);
return <ErrorContainer headerText={t("ErrorOfflineText")} />;
};
function mapStateToProps(state) {
return {
language: state.auth.user.cultureName || state.auth.settings.culture,
};
}
const Offline = connect(mapStateToProps)(ErrorOfflineContainer);
const Offline = ErrorOfflineContainer;
export default Offline;