itizawa 4 лет назад
Родитель
Сommit
07037f3db5
2 измененных файлов с 4 добавлено и 2 удалено
  1. 3 1
      src/client/js/components/InstallerForm.jsx
  2. 1 1
      src/client/js/nologin.jsx

+ 3 - 1
src/client/js/components/InstallerForm.jsx

@@ -22,7 +22,8 @@ class InstallerForm extends React.Component {
   }
 
   componentWillMount() {
-    this.changeLanguage(localeMetadatas[0]);
+    const meta = localeMetadatas.find(v => v.id === this.props.defaultLanguage);
+    this.setState({ selectedLang: meta });
   }
 
   // checkUserName(event) {
@@ -198,6 +199,7 @@ InstallerForm.propTypes = {
   name: PropTypes.string,
   email: PropTypes.string,
   csrf: PropTypes.string,
+  defaultLanguage: PropTypes.string,
 };
 
 export default withTranslation()(InstallerForm);

+ 1 - 1
src/client/js/nologin.jsx

@@ -21,7 +21,7 @@ if (installerFormElem) {
   const csrf = installerFormElem.dataset.csrf;
   ReactDOM.render(
     <I18nextProvider i18n={i18n}>
-      <InstallerForm userName={userName} name={name} email={email} csrf={csrf} />
+      <InstallerForm userName={userName} name={name} email={email} csrf={csrf} defaultLanguage={i18n.language} />
     </I18nextProvider>,
     installerFormElem,
   );