Web.Common: replaced changeLanguage function, removed connect HOC
This commit is contained in:
parent
77f88297ed
commit
42d9258d99
@ -1,26 +1,21 @@
|
|||||||
import React, { useEffect } from 'react';
|
import React, { useEffect } from 'react';
|
||||||
import { connect } from "react-redux";
|
|
||||||
import ErrorContainer from '../../../components/ErrorContainer';
|
import ErrorContainer from '../../../components/ErrorContainer';
|
||||||
import { useTranslation } from 'react-i18next';
|
import { useTranslation } from 'react-i18next';
|
||||||
import i18n from './i18n';
|
import i18n from './i18n';
|
||||||
|
import { changeLanguage } from '../../../utils';
|
||||||
|
|
||||||
const Error404Container = ({language}) => {
|
const Error404Container = () => {
|
||||||
const { t } = useTranslation('translation', { i18n });
|
const { t } = useTranslation('translation', { i18n });
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
i18n.changeLanguage(language);
|
changeLanguage(i18n);
|
||||||
}, [language]);
|
}, []);
|
||||||
|
|
||||||
return <ErrorContainer headerText={t("Error401Text")} />;
|
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;
|
export default Error401;
|
||||||
|
|
||||||
|
@ -1,26 +1,20 @@
|
|||||||
import React, { useEffect } from 'react';
|
import React, { useEffect } from 'react';
|
||||||
import { connect } from "react-redux";
|
|
||||||
import ErrorContainer from '../../../components/ErrorContainer';
|
import ErrorContainer from '../../../components/ErrorContainer';
|
||||||
import { useTranslation } from 'react-i18next';
|
import { useTranslation } from 'react-i18next';
|
||||||
import i18n from './i18n';
|
import i18n from './i18n';
|
||||||
|
import { changeLanguage } from '../../../utils';
|
||||||
|
|
||||||
const Error404Container = ({language}) => {
|
const Error404Container = () => {
|
||||||
const { t } = useTranslation('translation', { i18n });
|
const { t } = useTranslation('translation', { i18n });
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
i18n.changeLanguage(language);
|
changeLanguage(i18n);
|
||||||
}, [language]);
|
}, []);
|
||||||
|
|
||||||
return <ErrorContainer headerText={t("Error404Text")} />;
|
return <ErrorContainer headerText={t("Error404Text")} />;
|
||||||
};
|
};
|
||||||
|
|
||||||
function mapStateToProps(state) {
|
const Error404 = Error404Container;
|
||||||
return {
|
|
||||||
language: state.auth.user.cultureName || state.auth.settings.culture,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
const Error404 = connect(mapStateToProps)(Error404Container);
|
|
||||||
|
|
||||||
export default Error404;
|
export default Error404;
|
||||||
|
|
||||||
|
@ -1,26 +1,20 @@
|
|||||||
import React, { useEffect } from 'react';
|
import React, { useEffect } from 'react';
|
||||||
import { connect } from "react-redux";
|
|
||||||
import ErrorContainer from '../../../components/ErrorContainer';
|
import ErrorContainer from '../../../components/ErrorContainer';
|
||||||
import { useTranslation } from 'react-i18next';
|
import { useTranslation } from 'react-i18next';
|
||||||
import i18n from './i18n';
|
import i18n from './i18n';
|
||||||
|
import { changeLanguage } from '../../../utils';
|
||||||
|
|
||||||
const Error520Container = ({language}) => {
|
const Error520Container = () => {
|
||||||
const { t } = useTranslation('translation', { i18n });
|
const { t } = useTranslation('translation', { i18n });
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
i18n.changeLanguage(language);
|
changeLanguage(i18n);
|
||||||
}, [language]);
|
}, []);
|
||||||
|
|
||||||
return <ErrorContainer headerText={t("Error520Text")} />;
|
return <ErrorContainer headerText={t("Error520Text")} />;
|
||||||
};
|
};
|
||||||
|
|
||||||
function mapStateToProps(state) {
|
const Error404 = Error520Container;
|
||||||
return {
|
|
||||||
language: state.auth.user.cultureName || state.auth.settings.culture,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
const Error404 = connect(mapStateToProps)(Error520Container);
|
|
||||||
|
|
||||||
export default Error404;
|
export default Error404;
|
||||||
|
|
||||||
|
@ -1,15 +1,15 @@
|
|||||||
import React, { useEffect } from "react";
|
import React, { useEffect } from "react";
|
||||||
import { connect } from "react-redux";
|
|
||||||
import ErrorContainer from '../../../components/ErrorContainer';
|
import ErrorContainer from '../../../components/ErrorContainer';
|
||||||
import { useTranslation } from "react-i18next";
|
import { useTranslation } from "react-i18next";
|
||||||
import i18n from "./i18n";
|
import i18n from "./i18n";
|
||||||
|
import { changeLanguage } from '../../../utils';
|
||||||
|
|
||||||
const ComingSoonContainer = ({ language }) => {
|
const ComingSoonContainer = () => {
|
||||||
const { t } = useTranslation("translation", { i18n });
|
const { t } = useTranslation("translation", { i18n });
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
i18n.changeLanguage(language);
|
changeLanguage(i18n);
|
||||||
}, [language]);
|
}, []);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<ErrorContainer
|
<ErrorContainer
|
||||||
@ -21,12 +21,6 @@ const ComingSoonContainer = ({ language }) => {
|
|||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
function mapStateToProps(state) {
|
const ComingSoon = ComingSoonContainer;
|
||||||
return {
|
|
||||||
language: state.auth.user.cultureName || state.auth.settings.culture
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
const ComingSoon = connect(mapStateToProps)(ComingSoonContainer);
|
|
||||||
|
|
||||||
export default ComingSoon;
|
export default ComingSoon;
|
||||||
|
@ -1,25 +1,19 @@
|
|||||||
import React, { useEffect } from 'react';
|
import React, { useEffect } from 'react';
|
||||||
import { connect } from "react-redux";
|
|
||||||
import ErrorContainer from '../../../components/ErrorContainer';
|
import ErrorContainer from '../../../components/ErrorContainer';
|
||||||
import { useTranslation } from 'react-i18next';
|
import { useTranslation } from 'react-i18next';
|
||||||
import i18n from './i18n';
|
import i18n from './i18n';
|
||||||
|
import { changeLanguage } from '../../../utils';
|
||||||
|
|
||||||
const ErrorOfflineContainer = ({language}) => {
|
const ErrorOfflineContainer = () => {
|
||||||
const { t } = useTranslation('translation', { i18n });
|
const { t } = useTranslation('translation', { i18n });
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
i18n.changeLanguage(language);
|
changeLanguage(i18n);
|
||||||
}, [language]);
|
}, []);
|
||||||
|
|
||||||
return <ErrorContainer headerText={t("ErrorOfflineText")} />;
|
return <ErrorContainer headerText={t("ErrorOfflineText")} />;
|
||||||
};
|
};
|
||||||
|
|
||||||
function mapStateToProps(state) {
|
const Offline = ErrorOfflineContainer;
|
||||||
return {
|
|
||||||
language: state.auth.user.cultureName || state.auth.settings.culture,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
const Offline = connect(mapStateToProps)(ErrorOfflineContainer);
|
|
||||||
|
|
||||||
export default Offline;
|
export default Offline;
|
||||||
|
Loading…
Reference in New Issue
Block a user