Added message about successful upload
This commit is contained in:
parent
ef9b4d52e9
commit
d338f546e0
@ -1,50 +1,37 @@
|
||||
import i18n from "i18next";
|
||||
import Backend from "i18next-xhr-backend";
|
||||
import en from "./locales/en/translation.json";
|
||||
import ru from "./locales/ru/translation.json";
|
||||
import { constants } from 'asc-web-common';
|
||||
const { LANGUAGE } = constants;
|
||||
|
||||
const {LANGUAGE} = constants;
|
||||
|
||||
const newInstance = i18n.createInstance();
|
||||
|
||||
if (process.env.NODE_ENV === "production") {
|
||||
newInstance
|
||||
.use(Backend)
|
||||
.init({
|
||||
lng: localStorage.getItem(LANGUAGE) || 'en',
|
||||
fallbackLng: "en",
|
||||
|
||||
interpolation: {
|
||||
escapeValue: false, // not needed for react as it escapes by default
|
||||
},
|
||||
|
||||
react: {
|
||||
useSuspense: false
|
||||
},
|
||||
backend: {
|
||||
loadPath: `/locales/Home/{{lng}}/{{ns}}.json`
|
||||
}
|
||||
});
|
||||
} else if (process.env.NODE_ENV === "development") {
|
||||
|
||||
const resources = {
|
||||
const resources = {
|
||||
en: {
|
||||
translation: require("./locales/en/translation.json")
|
||||
translation: en//require("./locales/en/translation.json")
|
||||
},
|
||||
ru: {
|
||||
translation: ru//require("./locales/ru/translation.json")
|
||||
}
|
||||
};
|
||||
};
|
||||
|
||||
newInstance.init({
|
||||
newInstance.init({
|
||||
resources: resources,
|
||||
lng: localStorage.getItem(LANGUAGE) || 'en',
|
||||
fallbackLng: "en",
|
||||
debug: true,
|
||||
|
||||
interpolation: {
|
||||
escapeValue: false, // not needed for react as it escapes by default
|
||||
format: function (value, format) {
|
||||
if (format === 'lowercase') return value.toLowerCase();
|
||||
return value;
|
||||
}
|
||||
},
|
||||
|
||||
react: {
|
||||
useSuspense: false
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
export default newInstance;
|
@ -95,7 +95,9 @@ class Body extends Component {
|
||||
|
||||
hasErrorEmail: false,
|
||||
hasErrorPass: false,
|
||||
hasErrorLicense: false
|
||||
hasErrorLicense: false,
|
||||
|
||||
successfullyMessage: null
|
||||
}
|
||||
|
||||
document.title = t('wizardTitle');
|
||||
@ -320,6 +322,10 @@ class Body extends Component {
|
||||
fd.append("files", file );
|
||||
|
||||
setLicense(wizardToken, fd)
|
||||
.then(res => this.setState({
|
||||
visibleModal: true,
|
||||
successfullyMessage: res.message
|
||||
}))
|
||||
.catch( e => this.setState({
|
||||
errorLoading: true,
|
||||
errorMessage: e,
|
||||
@ -356,7 +362,7 @@ class Body extends Component {
|
||||
hasErrorEmail,
|
||||
hasErrorPass,
|
||||
hasErrorLicense,
|
||||
hasErrorReadLicense
|
||||
successfullyMessage
|
||||
} = this.state;
|
||||
|
||||
console.log('wizard render');
|
||||
@ -376,6 +382,7 @@ class Body extends Component {
|
||||
errorMessage={errorMessage}
|
||||
emailOwner={changeEmail ? changeEmail : emailOwner}
|
||||
settings={emailSettings}
|
||||
successfullyMessage={successfullyMessage}
|
||||
onEmailChangeHandler={this.onEmailChangeHandler}
|
||||
onSaveEmailHandler={this.onSaveEmailHandler}
|
||||
onCloseModal={this.onCloseModal}
|
||||
|
@ -37,5 +37,6 @@
|
||||
"errorInitWizard": "The service is currently unavailable, please try again later.",
|
||||
"errorInitWizardButton": "Try again",
|
||||
|
||||
"generatePassword": "Generate password"
|
||||
"generatePassword": "Generate password",
|
||||
"successfullyUpload": "Uploaded successfully."
|
||||
}
|
@ -37,5 +37,6 @@
|
||||
"errorInitWizard": "В данный момент сервис недоступен, попробуйте позже.",
|
||||
"errorInitWizardButton": "Попробовать снова",
|
||||
|
||||
"generatePassword": "Сгенерировать пароль"
|
||||
"generatePassword": "Сгенерировать пароль",
|
||||
"successfullyUpload": "Успешно загружено."
|
||||
}
|
@ -32,6 +32,7 @@ const ModalContainer = ({
|
||||
errorMessage,
|
||||
emailOwner,
|
||||
settings,
|
||||
successfullyMessage,
|
||||
onEmailChangeHandler,
|
||||
onSaveEmailHandler,
|
||||
onCloseModal
|
||||
@ -41,13 +42,17 @@ const ModalContainer = ({
|
||||
|
||||
const visible = errorLoading ? errorLoading : visibleModal;
|
||||
|
||||
if(errorLoading) {
|
||||
header = t('errorLicenseTitle');
|
||||
if(errorLoading || ( successfullyMessage && visibleModal )) {
|
||||
header = successfullyMessage ? t('successfullyUpload') : t('errorLicenseTitle');
|
||||
content = <BodyContainer>
|
||||
{errorMessage ? errorMessage: t('errorLicenseBody')}
|
||||
{successfullyMessage
|
||||
? successfullyMessage
|
||||
: errorMessage
|
||||
? errorMessage
|
||||
: t('errorLicenseBody')}
|
||||
</BodyContainer>;
|
||||
|
||||
} else if( visibleModal ) {
|
||||
} else if( visibleModal && !successfullyMessage) {
|
||||
header = t('changeEmailTitle');
|
||||
|
||||
content = <EmailInput
|
||||
|
Loading…
Reference in New Issue
Block a user