People.Client: ChangePasswordDialog: changed redux to localStorage for storing language value

This commit is contained in:
Daniil Senkiv 2020-01-21 09:44:21 +03:00
parent 2b961dd144
commit 5f486e0c01
2 changed files with 10 additions and 17 deletions

View File

@ -1,6 +1,8 @@
import i18n from "i18next";
import Backend from "i18next-xhr-backend";
import config from "../../../../package.json";
import { constants } from 'asc-web-common';
const { LANGUAGE } = constants;
const newInstance = i18n.createInstance();
@ -8,7 +10,7 @@ if (process.env.NODE_ENV === "production") {
newInstance
.use(Backend)
.init({
lng: 'en',
lng: localStorage.getItem(LANGUAGE) || 'en',
fallbackLng: "en",
interpolation: {
@ -39,7 +41,7 @@ if (process.env.NODE_ENV === "production") {
newInstance.init({
resources: resources,
lng: 'en',
lng: localStorage.getItem(LANGUAGE) || 'en',
fallbackLng: "en",
debug: true,

View File

@ -1,7 +1,5 @@
import React from "react";
import { connect } from "react-redux";
import PropTypes from "prop-types";
import { withRouter } from "react-router";
import {
toastr,
ModalDialog,
@ -11,20 +9,19 @@ import {
} from "asc-web-components";
import { withTranslation, Trans } from "react-i18next";
import i18n from "./i18n";
import { api } from "asc-web-common";
import { api, utils } from "asc-web-common";
const { sendInstructionsToChangePassword } = api.people;
const { changeLanguage } = utils;
class ChangePasswordDialogComponent extends React.Component {
constructor(props) {
super(props);
const { language } = props;
constructor() {
super();
this.state = {
isRequestRunning: false
};
i18n.changeLanguage(language);
changeLanguage(i18n);
}
onSendPasswordChangeInstructions = () => {
const { email, onClose } = this.props;
@ -91,10 +88,4 @@ ChangePasswordDialog.propTypes = {
email: PropTypes.string.isRequired,
};
function mapStateToProps(state) {
return {
language: state.auth.user.cultureName || state.auth.settings.culture,
};
}
export default connect(mapStateToProps, {})(withRouter(ChangePasswordDialog));
export default ChangePasswordDialog;