Web: Files: SelectedFolder: Fixed translation.

products/ASC.Files/Client/src/components/panels/SelectedFolder/i18n.js

@@ -2,23 +2,14 @@ import i18n from "i18next";
 import Backend from "i18next-http-backend";
 import { LANGUAGE } from "@appserver/common/constants";
 import config from "../../../../package.json";
-const homepage = config.homepage;
-
-//import LanguageDetector from "i18next-browser-languagedetector";
-// not like to use this?
-// have a look at the Quick start guide
-// for passing in lng and translations on init
-
-const languages = ["en", "ru"];
+import { loadLanguagePath } from "@appserver/common/utils";
 
 const newInstance = i18n.createInstance();
 
 newInstance.use(Backend).init({
   lng: localStorage.getItem(LANGUAGE) || "en",
-  supportedLngs: languages,
-  whitelist: languages,
   fallbackLng: "en",
-  load: "languageOnly",
+  load: "all",
   //debug: true,
 
   interpolation: {
@@ -30,10 +21,10 @@ newInstance.use(Backend).init({
   },
 
   backend: {
-    loadPath: `${homepage}/locales/{{lng}}/SelectedFolder.json`,
+    loadPath: loadLanguagePath(config.homepage, "SelectedFolder"),
   },
 
-  ns: ["SelectedFolder"],
+  ns: ["SelectedFolder", "Common"],
   defaultNS: "SelectedFolder",
 
   react: {

products/ASC.Files/Client/src/components/panels/SelectedFolder/index.js

@@ -191,7 +191,6 @@ class SelectedFolder extends React.PureComponent {
     const {
       expandedKeys,
       filter,
-
       t,
       name,
       onClickInput,
@@ -251,7 +250,9 @@ class SelectedFolder extends React.PureComponent {
                 ) : (
                   <div key="loader" className="panel-loader-wrapper">
                     <Loader type="oval" size="16px" className="panel-loader" />
-                    <Text as="span">{t("LoadingLabel")}</Text>
+                    <Text as="span">{`${t("Common:LoadingProcessing")} ${t(
+                      "Common:LoadingDescription"
+                    )}`}</Text>
                   </div>
                 )}
               </ModalDialog.Body>
@@ -267,12 +268,14 @@ SelectedFolder.propTypes = {
   onClickInput: PropTypes.func.isRequired,
   onSelectFolder: PropTypes.func.isRequired,
   onClose: PropTypes.func.isRequired,
+  isPanelVisible: PropTypes.bool.isRequired,
 };
 
 SelectedFolder.defaultProps = {
   isThirdParty: false,
   isCommonWithoutProvider: false,
   withoutTopLevelFolder: false,
+  isDisabled: false,
   folderList: "",
   folderPath: "",
 };
@@ -288,7 +291,7 @@ const SelectedFolderWrapper = inject(
       fetchTreeFolders,
     };
   }
-)(observer(withTranslation("SelectedFolder")(SelectedFolder)));
+)(observer(withTranslation(["SelectedFolder", "Common"])(SelectedFolder)));
 
 class SelectedFolderModal extends React.Component {
   static getCommonThirdPartyList = async () => {