Merge branch 'feature/translations' of https://github.com/ONLYOFFICE/AppServer into feature/translations

packages/asc-web-common/components/PageLayout/index.js

@@ -1,7 +1,6 @@
 import React from "react";
 import PropTypes from "prop-types";
 import Backdrop from "@appserver/components/backdrop";
-//import ProgressBar from "@appserver/components/progress-bar";
 import { size } from "@appserver/components/utils/device";
 import { Provider } from "@appserver/components/utils/context";
 import { isMobile } from "react-device-detect";
@@ -22,8 +21,6 @@ import FloatingButton from "../FloatingButton";
 import { inject, observer } from "mobx-react";
 import { SelectableGroup } from "react-selectable-fast";
 import styled from "styled-components";
-import { I18nextProvider } from "react-i18next";
-import i18n from "./i18n";
 
 const StyledSelectableGroup = styled(SelectableGroup)`
   display: contents;
@@ -440,23 +437,19 @@ class PageLayout extends React.Component {
       );
     };
 
-    return (
-      <I18nextProvider i18n={i18n}>
-        {isMobile || !uploadFiles ? (
-          renderPageLayout()
-        ) : (
-          <StyledSelectableGroup
-            dragging={dragging}
-            enableDeselect
-            resetOnStart
-            allowClickWithoutSelected={false}
-            duringSelection={this.duringSelection}
-            ignoreList={[".not-selectable", "draggable"]}
-          >
-            {renderPageLayout()}
-          </StyledSelectableGroup>
-        )}
-      </I18nextProvider>
+    return isMobile || !uploadFiles ? (
+      renderPageLayout()
+    ) : (
+      <StyledSelectableGroup
+        dragging={dragging}
+        enableDeselect
+        resetOnStart
+        allowClickWithoutSelected={false}
+        duringSelection={this.duringSelection}
+        ignoreList={[".not-selectable", "draggable"]}
+      >
+        {renderPageLayout()}
+      </StyledSelectableGroup>
     );
   }
 }

products/ASC.Files/Client/src/pages/Settings/index.js

@@ -77,7 +77,7 @@ const PureSettings = ({
           {(!isLoadedSettingsTree && isLoading) || isLoading ? (
             <Loaders.SectionHeader />
           ) : (
-            <SectionHeaderContent title={t(`${title}`)} />
+            <SectionHeaderContent title={title} />
           )}
         </PageLayout.SectionHeader>