diff --git a/i18next/common.babel b/i18next/common.babel index 9d5ef13f3d..91a6d202ba 100644 --- a/i18next/common.babel +++ b/i18next/common.babel @@ -39490,6 +39490,138 @@ + + OrganizationName + + + + + + ar-SA + false + + + az-Latn-AZ + false + + + bg-BG + false + + + cs-CZ + false + + + de-DE + false + + + el-GR + false + + + en-US + false + + + es-ES + false + + + fi-FI + false + + + fr-FR + false + + + hy-AM + false + + + it-IT + false + + + ja-JP + false + + + ko-KR + false + + + lo-LA + false + + + lv-LV + false + + + nl-NL + false + + + pl-PL + false + + + pt-BR + false + + + pt-PT + false + + + ro-RO + false + + + ru-RU + false + + + si-SI + false + + + sk-SK + false + + + sl-SI + false + + + sr-Cyrl-RS + false + + + sr-Latn-RS + false + + + tr-TR + false + + + uk-UA + false + + + vi-VN + false + + + zh-CN + false + + + OtherLabel diff --git a/packages/client/src/Shell.jsx b/packages/client/src/Shell.jsx index 8f19285a8c..ccd26b81a0 100644 --- a/packages/client/src/Shell.jsx +++ b/packages/client/src/Shell.jsx @@ -87,8 +87,6 @@ const Shell = ({ items = [], page = "home", ...rest }) => { version, pagesWithoutNavMenu, isFrame, - - organizationName, } = rest; const theme = useTheme(); @@ -258,7 +256,7 @@ const Shell = ({ items = [], page = "home", ...rest }) => { headerText: t("Attention"), text: `${t("BarMaintenanceDescription", { targetDate: targetDate, - productName: `${organizationName} ${PRODUCT_NAME}`, + productName: `${t("Common:OrganizationName")} ${PRODUCT_NAME}`, })} ${t("BarMaintenanceDisclaimer")}`, isMaintenance: true, onAction: () => { @@ -482,7 +480,6 @@ const ShellWrapper = inject( frameConfig, isPortalDeactivate, isPortalRestoring, - organizationName, } = settingsStore; const isBase = settingsStore.theme.isBase; @@ -545,7 +542,6 @@ const ShellWrapper = inject( version, pagesWithoutNavMenu, isFrame, - organizationName, }; }, )(observer(Shell)); diff --git a/packages/client/src/components/ArticleWrapper/index.tsx b/packages/client/src/components/ArticleWrapper/index.tsx index 246d0b0b4d..036a342906 100644 --- a/packages/client/src/components/ArticleWrapper/index.tsx +++ b/packages/client/src/components/ArticleWrapper/index.tsx @@ -88,7 +88,6 @@ export default inject( currentDeviceType, standalone, isBurgerLoading, - organizationName, } = settingsStore; const { isFreeTariff, isNonProfit, isTrial, currentTariffPlanTitle } = @@ -101,7 +100,6 @@ export default inject( } = currentTariffStatusStore; return { - organizationName, onProfileClick, user, getUserRole, diff --git a/packages/client/src/components/EmptyContainer/RootFolderContainer.js b/packages/client/src/components/EmptyContainer/RootFolderContainer.js index 82c6bb97a0..e5c10e9707 100644 --- a/packages/client/src/components/EmptyContainer/RootFolderContainer.js +++ b/packages/client/src/components/EmptyContainer/RootFolderContainer.js @@ -70,7 +70,6 @@ const RootFolderContainer = (props) => { isPrivacyFolder, isDesktop, isEncryptionSupport, - organizationName, privacyInstructions, title, onCreate, @@ -121,7 +120,9 @@ const RootFolderContainer = (props) => { ? t("ArchiveEmptyScreenUser") : t("ArchiveEmptyScreen", { productName: PRODUCT_NAME }); - const privateRoomHeader = t("PrivateRoomHeader", { organizationName }); + const privateRoomHeader = t("PrivateRoomHeader", { + organizationName: t("Common:OrganizationName"), + }); const privacyIcon = ; const privateRoomDescTranslations = [ t("PrivateRoomDescriptionSafest"), @@ -259,8 +260,8 @@ const RootFolderContainer = (props) => { {!isDesktop && ( - Work in Private Room is available via {{ organizationName }} desktop - app. + Work in Private Room is available via{" "} + {{ organizationName: t("Common:OrganizationName") }} desktop app. { - const { isDesktopClient, isEncryptionSupport, organizationName, theme } = - settingsStore; + const { isDesktopClient, isEncryptionSupport, theme } = settingsStore; const { setIsSectionFilterLoading } = clientLoadingStore; @@ -400,7 +400,6 @@ export default inject( userId: userStore?.user?.id, isCollaborator: userStore?.user?.isCollaborator, isEncryptionSupport, - organizationName, privacyInstructions, title, myFolderId, diff --git a/packages/client/src/components/SmartBanner/index.js b/packages/client/src/components/SmartBanner/index.js index 9727c6c246..d2826dc9a4 100644 --- a/packages/client/src/components/SmartBanner/index.js +++ b/packages/client/src/components/SmartBanner/index.js @@ -38,8 +38,7 @@ const Wrapper = styled.div` `; const ReactSmartBanner = (props) => { - const { t, ready, isBannerVisible, setIsBannerVisible, organizationName } = - props; + const { t, ready, isBannerVisible, setIsBannerVisible } = props; const force = isIOS ? "ios" : "android"; const location = useLocation(); @@ -94,7 +93,9 @@ const ReactSmartBanner = (props) => { return isMobile && isBannerVisible && ready && isTouchDevice ? ( { ); }; -export default inject(({ settingsStore, bannerStore }) => { - const { organizationName } = settingsStore; +export default inject(({ bannerStore }) => { return { isBannerVisible: bannerStore.isBannerVisible, setIsBannerVisible: bannerStore.setIsBannerVisible, - organizationName, }; })(observer(ReactSmartBanner)); diff --git a/packages/client/src/helpers/filesUtils.js b/packages/client/src/helpers/filesUtils.js index 19122ab849..3fdafc602d 100644 --- a/packages/client/src/helpers/filesUtils.js +++ b/packages/client/src/helpers/filesUtils.js @@ -91,26 +91,6 @@ export const getRoomTypeName = (room, t) => { } }; -export const setDocumentTitle = (subTitle = null) => { - const { isAuthenticated, product: currentModule } = authStore; - const { organizationName } = settingsStore; - - let title; - if (subTitle) { - if (isAuthenticated && currentModule) { - title = subTitle + " - " + currentModule.title; - } else { - title = subTitle + " - " + organizationName; - } - } else if (currentModule && organizationName) { - title = currentModule.title + " - " + organizationName; - } else { - title = organizationName; - } - - document.title = title; -}; - export const getDefaultFileName = (format) => { switch (format) { case "docx": diff --git a/packages/client/src/helpers/utils.js b/packages/client/src/helpers/utils.js index 27557f05db..93f7091070 100644 --- a/packages/client/src/helpers/utils.js +++ b/packages/client/src/helpers/utils.js @@ -24,7 +24,7 @@ // content are licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0 // International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode -import { authStore, settingsStore } from "@docspace/shared/store"; +import { authStore } from "@docspace/shared/store"; import { getLanguage } from "@docspace/shared/utils"; import { toCommunityHostname } from "@docspace/shared/utils/common"; @@ -32,10 +32,11 @@ import { CategoryType } from "./constants"; import { FolderType, ShareAccessRights } from "@docspace/shared/enums"; import { translations } from "./autoGeneratedTranslations"; // import router from "SRC_DIR/router"; +import i18n from "../i18n"; export const setDocumentTitle = (subTitle = "") => { const { isAuthenticated, product: currentModule } = authStore; - const { organizationName } = settingsStore; + const organizationName = i18n.t("Common:OrganizationName"); let title; if (subTitle) { diff --git a/packages/client/src/pages/About/AboutContent.js b/packages/client/src/pages/About/AboutContent.js index c4dd40bed6..1c692cf881 100644 --- a/packages/client/src/pages/About/AboutContent.js +++ b/packages/client/src/pages/About/AboutContent.js @@ -101,13 +101,8 @@ const StyledAboutBody = styled.div` `; const AboutContent = (props) => { - const { - buildVersionInfo, - theme, - companyInfoSettingsData, - previewData, - organizationName, - } = props; + const { buildVersionInfo, theme, companyInfoSettingsData, previewData } = + props; const { t } = useTranslation("About"); const license = "AGPL-3.0"; const linkRepo = "https://github.com/ONLYOFFICE/DocSpace"; @@ -158,7 +153,7 @@ const AboutContent = (props) => { target="_blank" enableUserSelect > -  {organizationName} {PRODUCT_NAME}  +  {t("Common:OrganizationName")} {PRODUCT_NAME}  { }; export default inject(({ settingsStore }) => { - const { theme, companyInfoSettingsData, organizationName } = settingsStore; + const { theme, companyInfoSettingsData } = settingsStore; return { theme, companyInfoSettingsData, - organizationName, }; })(observer(AboutContent)); diff --git a/packages/client/src/pages/Bonus/index.js b/packages/client/src/pages/Bonus/index.js index 92d96e504f..73377c22b9 100644 --- a/packages/client/src/pages/Bonus/index.js +++ b/packages/client/src/pages/Bonus/index.js @@ -36,7 +36,7 @@ import StyledComponent from "./StyledComponent"; import OfficialDocumentation from "./sub-components/OfficialDocumentation"; import ContactContainer from "SRC_DIR/components/StandaloneComponents/ContactContainer"; -const Bonus = ({ standaloneInit, isInitPaymentPage, organizationName }) => { +const Bonus = ({ standaloneInit, isInitPaymentPage }) => { const { t, ready } = useTranslation("PaymentsEnterprise"); useEffect(() => { @@ -50,7 +50,7 @@ const Bonus = ({ standaloneInit, isInitPaymentPage, organizationName }) => { {t("UpgradeToProBannerInstructionHeader", { - organizationName, + organizationName: t("Common:OrganizationName"), })} {t("UpgradeToProBannerInstructionDescr")} @@ -62,12 +62,10 @@ const Bonus = ({ standaloneInit, isInitPaymentPage, organizationName }) => { ); }; -export default inject(({ settingsStore, paymentStore }) => { +export default inject(({ paymentStore }) => { const { standaloneInit, isInitPaymentPage } = paymentStore; - const { organizationName } = settingsStore; return { standaloneInit, isInitPaymentPage, - organizationName, }; })(observer(Bonus)); diff --git a/packages/client/src/pages/FormGallery/TilesView/sub-components/SubmitToGalleryTile.js b/packages/client/src/pages/FormGallery/TilesView/sub-components/SubmitToGalleryTile.js index ed191ea50e..ec900f4dfb 100644 --- a/packages/client/src/pages/FormGallery/TilesView/sub-components/SubmitToGalleryTile.js +++ b/packages/client/src/pages/FormGallery/TilesView/sub-components/SubmitToGalleryTile.js @@ -106,7 +106,6 @@ const SubmitToGalleryTile = ({ hideSubmitToGalleryTile, setSubmitToGalleryDialogVisible, currentColorScheme, - organizationName, }) => { if (!submitToGalleryTileIsVisible) return null; @@ -122,10 +121,14 @@ const SubmitToGalleryTile = ({
- {t("Common:SubmitToGalleryBlockHeader", { organizationName })} + {t("Common:SubmitToGalleryBlockHeader", { + organizationName: t("Common:OrganizationName"), + })}
- {t("Common:SubmitToGalleryBlockBody", { organizationName })} + {t("Common:SubmitToGalleryBlockBody", { + organizationName: t("Common:OrganizationName"), + })}
@@ -140,7 +143,7 @@ const SubmitToGalleryTile = ({ }; export default inject(({ settingsStore, oformsStore, dialogsStore }) => { - const { organizationName, currentColorScheme } = settingsStore; + const { currentColorScheme } = settingsStore; return { submitToGalleryTileIsVisible: oformsStore.submitToGalleryTileIsVisible, @@ -148,6 +151,5 @@ export default inject(({ settingsStore, oformsStore, dialogsStore }) => { setSubmitToGalleryDialogVisible: dialogsStore.setSubmitToGalleryDialogVisible, currentColorScheme, - organizationName, }; })(withTranslation("Common", "FormGallery")(observer(SubmitToGalleryTile))); diff --git a/packages/client/src/pages/Home/InfoPanel/Body/views/History/HistoryBlockContent/GroupList.tsx b/packages/client/src/pages/Home/InfoPanel/Body/views/History/HistoryBlockContent/GroupList.tsx index c4e51b8ea2..f52f1b2209 100644 --- a/packages/client/src/pages/Home/InfoPanel/Body/views/History/HistoryBlockContent/GroupList.tsx +++ b/packages/client/src/pages/Home/InfoPanel/Body/views/History/HistoryBlockContent/GroupList.tsx @@ -76,7 +76,7 @@ const HistoryGroupList = ({ ]; const onGroupClick = (groupId: string) => { - setSelectedFolder?.(null); + setSelectedFolder?.(t, null); setPeopleSelection?.([]); setPeopleBufferSelection?.(null); setFilesSelection?.([]); diff --git a/packages/client/src/pages/PortalSettings/Layout/Section/Header/index.js b/packages/client/src/pages/PortalSettings/Layout/Section/Header/index.js index 0e8793b079..59e302c4eb 100644 --- a/packages/client/src/pages/PortalSettings/Layout/Section/Header/index.js +++ b/packages/client/src/pages/PortalSettings/Layout/Section/Header/index.js @@ -184,7 +184,6 @@ const SectionHeaderContent = (props) => { tReady, setIsLoadedSectionHeader, isSSOAvailable, - organizationName, } = props; const navigate = useNavigate(); @@ -387,7 +386,7 @@ const SectionHeaderContent = (props) => { className="arrow-button" /> )} - {t(header, { organizationName })} + {t(header, { organizationName: t("Common:OrganizationName") })} {isNeedPaidIcon ? ( { ); }; -export default inject(({ settingsStore, currentQuotaStore, setup, common }) => { +export default inject(({ currentQuotaStore, setup, common }) => { const { isBrandingAndCustomizationAvailable, isRestoreAndAutoBackupAvailable, @@ -444,8 +443,6 @@ export default inject(({ settingsStore, currentQuotaStore, setup, common }) => { const { admins, selectorIsOpen } = setup.security.accessRight; const { isLoadedSectionHeader, setIsLoadedSectionHeader } = common; - const { organizationName } = settingsStore; - return { addUsers, removeAdmins, @@ -465,7 +462,6 @@ export default inject(({ settingsStore, currentQuotaStore, setup, common }) => { isBrandingAndCustomizationAvailable, isRestoreAndAutoBackupAvailable, isSSOAvailable, - organizationName, }; })( withLoading( diff --git a/packages/client/src/pages/PortalSettings/categories/common/Customization/welcome-page-settings.js b/packages/client/src/pages/PortalSettings/categories/common/Customization/welcome-page-settings.js index 74a199720d..7177f04738 100644 --- a/packages/client/src/pages/PortalSettings/categories/common/Customization/welcome-page-settings.js +++ b/packages/client/src/pages/PortalSettings/categories/common/Customization/welcome-page-settings.js @@ -379,7 +379,6 @@ const WelcomePageSettings = (props) => { export default inject(({ settingsStore, setup, common }) => { const { greetingSettings, - organizationName, theme, currentColorScheme, welcomePageSettingsUrl, @@ -397,7 +396,6 @@ export default inject(({ settingsStore, setup, common }) => { return { theme, greetingSettings, - organizationName, setGreetingTitle, restoreGreetingTitle, isLoaded, diff --git a/packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/index.js b/packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/index.js index de518248bd..a575ac44fe 100644 --- a/packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/index.js +++ b/packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/index.js @@ -108,7 +108,6 @@ const GoogleWorkspace = ({ getMigrationStatus, setUsers, filteredUsers, - organizationName, }) => { const [showReminder, setShowReminder] = useState(false); const [currentStep, setCurrentStep] = useState(1); @@ -236,7 +235,7 @@ const GoogleWorkspace = ({ {t("Settings:AboutDataImport", { productName: PRODUCT_NAME, - organizationName, + organizationName: t("Common:OrganizationName"), })}
@@ -253,7 +252,7 @@ const GoogleWorkspace = ({ renderTooltip, Trans, filteredUsers.length === 0, - organizationName, + t("Common:OrganizationName"), )} { const { clearCheckedAccounts, getMigrationStatus, setUsers, filteredUsers } = importAccountsStore; const { viewAs, setViewAs } = setup; - const { currentDeviceType, organizationName } = settingsStore; + const { currentDeviceType } = settingsStore; return { clearCheckedAccounts, @@ -283,6 +282,5 @@ export default inject(({ setup, settingsStore, importAccountsStore }) => { getMigrationStatus, setUsers, filteredUsers, - organizationName, }; })(withTranslation(["Common, Settings"])(observer(GoogleWorkspace))); diff --git a/packages/client/src/pages/PortalSettings/categories/data-import/NextCloudWorkspace/Stepper/index.js b/packages/client/src/pages/PortalSettings/categories/data-import/NextCloudWorkspace/Stepper/index.js index bec87365e1..695165a0a4 100644 --- a/packages/client/src/pages/PortalSettings/categories/data-import/NextCloudWorkspace/Stepper/index.js +++ b/packages/client/src/pages/PortalSettings/categories/data-import/NextCloudWorkspace/Stepper/index.js @@ -43,7 +43,6 @@ export const getStepsData = ( currentStep, setCurrentStep, isTypeSelectEmpty, - organizationName, ) => { const isSixthStep = currentStep === 6; @@ -76,7 +75,7 @@ export const getStepsData = ( title: t("Settings:SelectUsersWithEmail"), description: t("Settings:SelectUsersDescriptionNextcloud", { productName: PRODUCT_NAME, - organizationName, + organizationName: t("Common:OrganizationName"), }), component: ( { getMigrationStatus, setUsers, filteredUsers, - organizationName, } = props; const [currentStep, setCurrentStep] = useState(1); const [shouldRender, setShouldRender] = useState(false); @@ -75,7 +74,7 @@ const NextcloudWorkspace = (props) => { currentStep, setCurrentStep, filteredUsers.length === 0, - organizationName, + t("Common:OrganizationName"), ); const navigate = useNavigate(); @@ -155,7 +154,7 @@ const NextcloudWorkspace = (props) => { > {t("Settings:AboutDataImport", { productName: PRODUCT_NAME, - organizationName, + organizationName: t("Common:OrganizationName"), })} { const { clearCheckedAccounts, getMigrationStatus, setUsers, filteredUsers } = importAccountsStore; const { initSettings, viewAs, setViewAs } = setup; - const { currentDeviceType, organizationName } = settingsStore; + const { currentDeviceType } = settingsStore; return { initSettings, @@ -191,7 +190,6 @@ export default inject(({ setup, settingsStore, importAccountsStore }) => { getMigrationStatus, setUsers, filteredUsers, - organizationName, }; })( withTranslation(["Common, SMTPSettings, Settings"])( diff --git a/packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/index.js b/packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/index.js index ff35f92e59..0b7277a49f 100644 --- a/packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/index.js +++ b/packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/index.js @@ -106,7 +106,6 @@ const OnlyofficeWorkspace = ({ getMigrationStatus, setUsers, filteredUsers, - organizationName, }) => { const [showReminder, setShowReminder] = useState(false); const [currentStep, setCurrentStep] = useState(1); @@ -234,7 +233,7 @@ const OnlyofficeWorkspace = ({ {t("Settings:AboutDataImport", { productName: PRODUCT_NAME, - organizationName, + organizationName: t("Common:OrganizationName"), })}
@@ -251,7 +250,7 @@ const OnlyofficeWorkspace = ({ renderTooltip, Trans, filteredUsers.length === 0, - organizationName, + t("Common:OrganizationName"), )} { const { clearCheckedAccounts, getMigrationStatus, setUsers, filteredUsers } = importAccountsStore; const { viewAs, setViewAs } = setup; - const { currentDeviceType, organizationName } = settingsStore; + const { currentDeviceType } = settingsStore; return { clearCheckedAccounts, @@ -281,6 +280,5 @@ export default inject(({ setup, settingsStore, importAccountsStore }) => { getMigrationStatus, setUsers, filteredUsers, - organizationName, }; })(withTranslation(["Common, Settings"])(observer(OnlyofficeWorkspace))); diff --git a/packages/client/src/pages/PortalSettings/categories/data-import/index.js b/packages/client/src/pages/PortalSettings/categories/data-import/index.js index c1213ee2dc..bb302e5def 100644 --- a/packages/client/src/pages/PortalSettings/categories/data-import/index.js +++ b/packages/client/src/pages/PortalSettings/categories/data-import/index.js @@ -43,6 +43,7 @@ import NextcloudWorkspaceDarkSvgUrl from "PUBLIC_DIR/images/dark.workspace.nextc import OnlyofficeWorkspaceDarkSvgUrl from "PUBLIC_DIR/images/dark.workspace.onlyoffice.react.svg?url"; import DataImportLoader from "./sub-components/DataImportLoader"; import { PRODUCT_NAME } from "@docspace/shared/constants"; +import { setDocumentTitle } from "SRC_DIR/helpers/utils"; const DataImport = ({ t, @@ -51,10 +52,8 @@ const DataImport = ({ setServices, getMigrationList, getMigrationStatus, - setDocumentTitle, isMigrationInit, setIsMigrationInit, - organizationName, }) => { const navigate = useNavigate(); @@ -136,7 +135,7 @@ const DataImport = ({ {t("DataImportDescription", { productName: PRODUCT_NAME, - organizationName, + organizationName: t("Common:OrganizationName"), })} {t("UploadBackupData")} @@ -174,9 +173,7 @@ export default inject(({ authStore, settingsStore, importAccountsStore }) => { setIsMigrationInit, } = importAccountsStore; - const { setDocumentTitle } = authStore; - - const { organizationName, theme } = settingsStore; + const { theme } = settingsStore; return { services, @@ -184,9 +181,7 @@ export default inject(({ authStore, settingsStore, importAccountsStore }) => { getMigrationList, getMigrationStatus, theme, - setDocumentTitle, isMigrationInit, setIsMigrationInit, - organizationName, }; })(withTranslation(["Settings"])(observer(DataImport))); diff --git a/packages/client/src/pages/PortalSettings/categories/data-management/backup/manual-backup/index.js b/packages/client/src/pages/PortalSettings/categories/data-management/backup/manual-backup/index.js index 014b92ff68..83ff9a5d9b 100644 --- a/packages/client/src/pages/PortalSettings/categories/data-management/backup/manual-backup/index.js +++ b/packages/client/src/pages/PortalSettings/categories/data-management/backup/manual-backup/index.js @@ -70,7 +70,9 @@ class ManualBackup extends React.Component { this.timerId = null; - setDocumentTitle(props.t("DataBackup")); + const { t } = props; + + setDocumentTitle(t("DataBackup")); this.state = { selectedFolder: "", diff --git a/packages/client/src/pages/PortalSettings/categories/delete-data/portalDeactivation.js b/packages/client/src/pages/PortalSettings/categories/delete-data/portalDeactivation.js index 823cb08ec8..db451eab73 100644 --- a/packages/client/src/pages/PortalSettings/categories/delete-data/portalDeactivation.js +++ b/packages/client/src/pages/PortalSettings/categories/delete-data/portalDeactivation.js @@ -32,7 +32,7 @@ import { Button } from "@docspace/shared/components/button"; import { toastr } from "@docspace/shared/components/toast"; import { Link } from "@docspace/shared/components/link"; import { MainContainer, ButtonWrapper } from "./StyledDeleteData"; -import { setDocumentTitle } from "../../../../helpers/utils"; +import { setDocumentTitle } from "SRC_DIR/helpers/utils"; import { sendSuspendPortalEmail } from "@docspace/shared/api/portal"; import { isDesktop } from "@docspace/shared/utils"; import { EmployeeActivationStatus } from "@docspace/shared/enums"; diff --git a/packages/client/src/pages/PortalSettings/categories/delete-data/portalDeletion.js b/packages/client/src/pages/PortalSettings/categories/delete-data/portalDeletion.js index ab6527894f..cfeddec71c 100644 --- a/packages/client/src/pages/PortalSettings/categories/delete-data/portalDeletion.js +++ b/packages/client/src/pages/PortalSettings/categories/delete-data/portalDeletion.js @@ -31,7 +31,7 @@ import { Text } from "@docspace/shared/components/text"; import { Button } from "@docspace/shared/components/button"; import { Link } from "@docspace/shared/components/link"; import { MainContainer, ButtonWrapper } from "./StyledDeleteData"; -import { setDocumentTitle } from "../../../../helpers/utils"; +import { setDocumentTitle } from "SRC_DIR/helpers/utils"; import { DeletePortalDialog } from "SRC_DIR/components/dialogs"; import { toastr } from "@docspace/shared/components/toast"; import { diff --git a/packages/client/src/pages/PortalSettings/categories/developer-tools/Api/index.js b/packages/client/src/pages/PortalSettings/categories/developer-tools/Api/index.js index a053bd66d2..5a5849c5e5 100644 --- a/packages/client/src/pages/PortalSettings/categories/developer-tools/Api/index.js +++ b/packages/client/src/pages/PortalSettings/categories/developer-tools/Api/index.js @@ -38,6 +38,7 @@ import ApiSvgUrl from "PUBLIC_DIR/images/settings.api.svg?url"; import ApiDarkSvgUrl from "PUBLIC_DIR/images/settings.api.dark.svg?url"; import { DeviceType } from "@docspace/shared/enums"; import { PRODUCT_NAME } from "@docspace/shared/constants"; +import { setDocumentTitle } from "SRC_DIR/helpers/utils"; const EmptyContainer = styled(EmptyScreenContainer)` .ec-header { @@ -61,14 +62,7 @@ const EmptyContainer = styled(EmptyScreenContainer)` `; const Api = (props) => { - const { - t, - setDocumentTitle, - theme, - apiBasicLink, - currentDeviceType, - organizationName, - } = props; + const { t, theme, apiBasicLink, currentDeviceType } = props; const imgSrc = theme.isBase ? ApiSvgUrl : ApiDarkSvgUrl; @@ -89,7 +83,7 @@ const Api = (props) => { } descriptionText={t("ApiPageDescription", { productName: PRODUCT_NAME, - organizationName, + organizationName: t("Common:OrganizationName"), })} headerText={t("ApiPageHeader")} imageAlt={t("ApiPageHeader")} @@ -99,16 +93,12 @@ const Api = (props) => { ); }; -export default inject(({ authStore, settingsStore }) => { - const { setDocumentTitle } = authStore; - const { theme, apiBasicLink, currentDeviceType, organizationName } = - settingsStore; +export default inject(({ settingsStore }) => { + const { theme, apiBasicLink, currentDeviceType } = settingsStore; return { theme, - setDocumentTitle, apiBasicLink, currentDeviceType, - organizationName, }; })(withTranslation(["Settings", "Common"])(observer(Api))); diff --git a/packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/index.js b/packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/index.js index a97d9c530e..9d3d2b7c68 100644 --- a/packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/index.js +++ b/packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/index.js @@ -56,6 +56,7 @@ import FileSelectorImgDark from "PUBLIC_DIR/images/sdk-presets_file-selector_dar import EditorImgDark from "PUBLIC_DIR/images/sdk-presets_editor_dark.react.svg?url"; import ViewerImgDark from "PUBLIC_DIR/images/sdk-presets_viewer_dark.react.svg?url"; import CustomImgDark from "PUBLIC_DIR/images/sdk-presets_custom_dark.react.svg?url"; +import { setDocumentTitle } from "SRC_DIR/helpers/utils"; const SDKContainer = styled(Box)` @media ${tablet} { @@ -117,7 +118,7 @@ const PresetsContainer = styled.div` `; const PortalIntegration = (props) => { - const { t, setDocumentTitle, currentColorScheme, sdkLink, theme } = props; + const { t, currentColorScheme, sdkLink, theme } = props; const isSmall = useRef( (() => { @@ -242,13 +243,11 @@ const PortalIntegration = (props) => { ); }; -export default inject(({ settingsStore, authStore, publicRoomStore }) => { - const { setDocumentTitle } = authStore; +export default inject(({ settingsStore }) => { const { theme, currentColorScheme, sdkLink } = settingsStore; return { theme, - setDocumentTitle, currentColorScheme, sdkLink, }; diff --git a/packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/presets/DocSpace.js b/packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/presets/DocSpace.js index 57aada5764..4fe596871f 100644 --- a/packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/presets/DocSpace.js +++ b/packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/presets/DocSpace.js @@ -53,9 +53,10 @@ import { ControlsSection, } from "./StyledPresets"; import { PRODUCT_NAME, SDK_SCRIPT_URL } from "@docspace/shared/constants"; +import { setDocumentTitle } from "SRC_DIR/helpers/utils"; const DocSpace = (props) => { - const { t, setDocumentTitle, theme } = props; + const { t, theme } = props; setDocumentTitle(t("JavascriptSdk")); @@ -155,13 +156,11 @@ const DocSpace = (props) => { ); }; -export default inject(({ authStore, settingsStore }) => { - const { setDocumentTitle } = authStore; +export default inject(({ settingsStore }) => { const { theme } = settingsStore; return { theme, - setDocumentTitle, }; })( withTranslation([ diff --git a/packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/presets/Editor.js b/packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/presets/Editor.js index 91385e31b1..fa2c1f6a43 100644 --- a/packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/presets/Editor.js +++ b/packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/presets/Editor.js @@ -63,9 +63,10 @@ import { FilesSelectorInputWrapper, } from "./StyledPresets"; import { SDK_SCRIPT_URL } from "@docspace/shared/constants"; +import { setDocumentTitle } from "SRC_DIR/helpers/utils"; const Editor = (props) => { - const { t, setDocumentTitle, getFilePrimaryLink, theme } = props; + const { t, getFilePrimaryLink, theme } = props; setDocumentTitle(t("JavascriptSdk")); @@ -228,14 +229,12 @@ const Editor = (props) => { ); }; -export default inject(({ authStore, settingsStore, filesStore }) => { - const { setDocumentTitle } = authStore; +export default inject(({ settingsStore, filesStore }) => { const { theme } = settingsStore; const { getFilePrimaryLink } = filesStore; return { theme, - setDocumentTitle, getFilePrimaryLink, }; })( diff --git a/packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/presets/FileSelector.js b/packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/presets/FileSelector.js index 0932bba710..be3d546a27 100644 --- a/packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/presets/FileSelector.js +++ b/packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/presets/FileSelector.js @@ -78,10 +78,10 @@ import { FilesSelectorInputWrapper, } from "./StyledPresets"; import { SDK_SCRIPT_URL } from "@docspace/shared/constants"; +import { setDocumentTitle } from "SRC_DIR/helpers/utils"; const FileSelector = (props) => { - const { t, setDocumentTitle, fetchExternalLinks, theme, organizationName } = - props; + const { t, fetchExternalLinks, theme } = props; setDocumentTitle(t("JavascriptSdk")); @@ -89,7 +89,9 @@ const FileSelector = (props) => { { value: FilesSelectorFilterTypes.ALL, label: t("AllTypes") }, { value: "EditorSupportedTypes", - label: t("AllTypesSupportedByEditor", { organizationName }), + label: t("AllTypesSupportedByEditor", { + organizationName: t("Common:OrganizationName"), + }), }, { value: "SelectorTypes", label: t("SelectTypes") }, ]; @@ -436,16 +438,13 @@ const FileSelector = (props) => { ); }; -export default inject(({ authStore, settingsStore, publicRoomStore }) => { - const { setDocumentTitle } = authStore; - const { theme, organizationName } = settingsStore; +export default inject(({ settingsStore, publicRoomStore }) => { + const { theme } = settingsStore; const { fetchExternalLinks } = publicRoomStore; return { theme, - setDocumentTitle, fetchExternalLinks, - organizationName, }; })( withTranslation([ diff --git a/packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/presets/Manager.js b/packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/presets/Manager.js index fbe4773330..7825f363fe 100644 --- a/packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/presets/Manager.js +++ b/packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/presets/Manager.js @@ -90,10 +90,10 @@ import { CheckboxGroup, } from "./StyledPresets"; import { PRODUCT_NAME, SDK_SCRIPT_URL } from "@docspace/shared/constants"; +import { setDocumentTitle } from "SRC_DIR/helpers/utils"; const Manager = (props) => { - const { t, setDocumentTitle, fetchExternalLinks, theme, currentColorScheme } = - props; + const { t, fetchExternalLinks, theme, currentColorScheme } = props; const navigate = useNavigate(); setDocumentTitle(t("JavascriptSdk")); @@ -654,14 +654,12 @@ const Manager = (props) => { ); }; -export default inject(({ authStore, settingsStore, publicRoomStore }) => { - const { setDocumentTitle } = authStore; +export default inject(({ settingsStore, publicRoomStore }) => { const { theme, currentColorScheme } = settingsStore; const { fetchExternalLinks } = publicRoomStore; return { theme, - setDocumentTitle, fetchExternalLinks, currentColorScheme, }; diff --git a/packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/presets/RoomSelector.js b/packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/presets/RoomSelector.js index 4e288183c4..8ab5dc0e73 100644 --- a/packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/presets/RoomSelector.js +++ b/packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/presets/RoomSelector.js @@ -64,9 +64,10 @@ import { Container, } from "./StyledPresets"; import { SDK_SCRIPT_URL } from "@docspace/shared/constants"; +import { setDocumentTitle } from "SRC_DIR/helpers/utils"; const RoomSelector = (props) => { - const { t, setDocumentTitle, theme } = props; + const { t, theme } = props; setDocumentTitle(t("JavascriptSdk")); @@ -254,12 +255,10 @@ const RoomSelector = (props) => { }; export default inject(({ authStore, settingsStore }) => { - const { setDocumentTitle } = authStore; const { theme } = settingsStore; return { theme, - setDocumentTitle, }; })( withTranslation([ diff --git a/packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/presets/SimpleRoom.js b/packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/presets/SimpleRoom.js index 2db0a59826..912ee7f2a4 100644 --- a/packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/presets/SimpleRoom.js +++ b/packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/presets/SimpleRoom.js @@ -79,10 +79,10 @@ import { CheckboxGroup, } from "./StyledPresets"; import { SDK_SCRIPT_URL } from "@docspace/shared/constants"; +import { setDocumentTitle } from "SRC_DIR/helpers/utils"; const SimpleRoom = (props) => { - const { t, setDocumentTitle, fetchExternalLinks, currentColorScheme, theme } = - props; + const { t, fetchExternalLinks, currentColorScheme, theme } = props; const navigate = useNavigate(); setDocumentTitle(t("JavascriptSdk")); @@ -385,14 +385,12 @@ const SimpleRoom = (props) => { ); }; -export default inject(({ authStore, settingsStore, publicRoomStore }) => { - const { setDocumentTitle } = authStore; +export default inject(({ settingsStore, publicRoomStore }) => { const { theme, currentColorScheme } = settingsStore; const { fetchExternalLinks } = publicRoomStore; return { theme, - setDocumentTitle, fetchExternalLinks, currentColorScheme, }; diff --git a/packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/presets/Viewer.js b/packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/presets/Viewer.js index 6ea98a4a43..9391d0565b 100644 --- a/packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/presets/Viewer.js +++ b/packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/presets/Viewer.js @@ -65,9 +65,10 @@ import { FilesSelectorInputWrapper, } from "./StyledPresets"; import { SDK_SCRIPT_URL } from "@docspace/shared/constants"; +import { setDocumentTitle } from "SRC_DIR/helpers/utils"; const Viewer = (props) => { - const { t, setDocumentTitle, getFilePrimaryLink, theme } = props; + const { t, getFilePrimaryLink, theme } = props; setDocumentTitle(t("JavascriptSdk")); @@ -270,14 +271,12 @@ const Viewer = (props) => { ); }; -export default inject(({ authStore, settingsStore, filesStore }) => { - const { setDocumentTitle } = authStore; +export default inject(({ settingsStore, filesStore }) => { const { theme } = settingsStore; const { getFilePrimaryLink } = filesStore; return { theme, - setDocumentTitle, getFilePrimaryLink, }; })( diff --git a/packages/client/src/pages/PortalSettings/categories/developer-tools/Webhooks/index.js b/packages/client/src/pages/PortalSettings/categories/developer-tools/Webhooks/index.js index 0bad5cfe9f..6c99e51f06 100644 --- a/packages/client/src/pages/PortalSettings/categories/developer-tools/Webhooks/index.js +++ b/packages/client/src/pages/PortalSettings/categories/developer-tools/Webhooks/index.js @@ -42,6 +42,7 @@ import { useTranslation } from "react-i18next"; import { DeleteWebhookDialog } from "./sub-components/DeleteWebhookDialog"; import { toastr } from "@docspace/shared/components/toast"; +import { setDocumentTitle } from "SRC_DIR/helpers/utils"; const MainWrapper = styled.div` width: 100%; @@ -78,7 +79,6 @@ const Webhooks = (props) => { loadWebhooks, addWebhook, isWebhooksEmpty, - setDocumentTitle, currentWebhook, editWebhook, deleteWebhook, @@ -185,14 +185,12 @@ export default inject(({ webhooksStore, authStore }) => { editWebhook, deleteWebhook, } = webhooksStore; - const { setDocumentTitle } = authStore; return { state, loadWebhooks, addWebhook, isWebhooksEmpty, - setDocumentTitle, currentWebhook, editWebhook, deleteWebhook, diff --git a/packages/client/src/pages/PortalSettings/categories/developer-tools/Webhooks/sub-components/WebhookInfo.js b/packages/client/src/pages/PortalSettings/categories/developer-tools/Webhooks/sub-components/WebhookInfo.js index 653125b230..b72049b7b0 100644 --- a/packages/client/src/pages/PortalSettings/categories/developer-tools/Webhooks/sub-components/WebhookInfo.js +++ b/packages/client/src/pages/PortalSettings/categories/developer-tools/Webhooks/sub-components/WebhookInfo.js @@ -61,12 +61,15 @@ StyledGuideLink.defaultProps = { theme: Base }; const WebhookInfo = (props) => { const { t } = useTranslation(["Webhooks"]); - const { webhooksGuideUrl, organizationName } = props; + const { webhooksGuideUrl } = props; return ( - {t("WebhooksInfo", { productName: PRODUCT_NAME, organizationName })} + {t("WebhooksInfo", { + productName: PRODUCT_NAME, + organizationName: t("Common:OrganizationName"), + })} { }; export default inject(({ settingsStore }) => { - const { webhooksGuideUrl, organizationName } = settingsStore; + const { webhooksGuideUrl } = settingsStore; return { webhooksGuideUrl, - organizationName, }; })(observer(WebhookInfo)); diff --git a/packages/client/src/pages/PortalSettings/categories/integration/SMTPSettings/index.js b/packages/client/src/pages/PortalSettings/categories/integration/SMTPSettings/index.js index 43b03ce28c..e0187e6e92 100644 --- a/packages/client/src/pages/PortalSettings/categories/integration/SMTPSettings/index.js +++ b/packages/client/src/pages/PortalSettings/categories/integration/SMTPSettings/index.js @@ -38,12 +38,8 @@ import { setDocumentTitle } from "SRC_DIR/helpers/utils"; let timerId = null; const SMTPSettings = (props) => { - const { - setInitSMTPSettings, - organizationName, - currentColorScheme, - integrationSettingsUrl, - } = props; + const { setInitSMTPSettings, currentColorScheme, integrationSettingsUrl } = + props; const { t, ready } = useTranslation([ "SMTPSettings", @@ -85,7 +81,9 @@ const SMTPSettings = (props) => {
- {t("Settings:SMTPSettingsDescription", { organizationName })} + {t("Settings:SMTPSettingsDescription", { + organizationName: t("Common:OrganizationName"), + })} { }; export default inject(({ settingsStore, setup }) => { - const { organizationName, currentColorScheme, integrationSettingsUrl } = - settingsStore; + const { currentColorScheme, integrationSettingsUrl } = settingsStore; const { setInitSMTPSettings } = setup; return { setInitSMTPSettings, - organizationName, currentColorScheme, integrationSettingsUrl, }; diff --git a/packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/MobileView.js b/packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/MobileView.js index 781dd27f69..91d3af0ad6 100644 --- a/packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/MobileView.js +++ b/packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/MobileView.js @@ -39,7 +39,7 @@ const StyledWrapper = styled.div` gap: 20px; `; -const MobileView = ({ isSSOAvailable, organizationName }) => { +const MobileView = ({ isSSOAvailable }) => { const { t } = useTranslation(["SingleSignOn", "Settings"]); const navigate = useNavigate(); @@ -51,7 +51,9 @@ const MobileView = ({ isSSOAvailable, organizationName }) => { return ( { onClickLink={onClickLink} /> { serviceProviderSettings, spMetadata, isSSOAvailable, - setDocumentTitle, isInit, currentDeviceType, - organizationName, } = props; const { t } = useTranslation(["SingleSignOn", "Settings"]); const isMobileView = currentDeviceType === DeviceType.mobile; @@ -77,17 +76,16 @@ const SingleSignOn = (props) => { {isMobileView ? ( - + ) : ( <> { { export default inject( ({ authStore, settingsStore, ssoStore, currentQuotaStore }) => { - const { setDocumentTitle } = authStore; const { isSSOAvailable } = currentQuotaStore; - const { currentDeviceType, organizationName } = settingsStore; + const { currentDeviceType } = settingsStore; const { init, serviceProviderSettings, spMetadata, isInit } = ssoStore; @@ -126,10 +125,8 @@ export default inject( serviceProviderSettings, spMetadata, isSSOAvailable, - setDocumentTitle, isInit, currentDeviceType, - organizationName, }; }, )(observer(SingleSignOn)); diff --git a/packages/client/src/pages/PortalSettings/categories/integration/ThirdPartyServicesSettings/index.js b/packages/client/src/pages/PortalSettings/categories/integration/ThirdPartyServicesSettings/index.js index a3b497ca99..41502d1278 100644 --- a/packages/client/src/pages/PortalSettings/categories/integration/ThirdPartyServicesSettings/index.js +++ b/packages/client/src/pages/PortalSettings/categories/integration/ThirdPartyServicesSettings/index.js @@ -48,6 +48,7 @@ import ConsumerModalDialog from "./sub-components/consumerModalDialog"; import ThirdPartyLoader from "./sub-components/thirdPartyLoader"; import { PRODUCT_NAME } from "@docspace/shared/constants"; +import { setDocumentTitle } from "SRC_DIR/helpers/utils"; const RootContainer = styled(Box)` max-width: 700px; @@ -110,7 +111,7 @@ const RootContainer = styled(Box)` class ThirdPartyServices extends React.Component { constructor(props) { super(props); - const { t, setDocumentTitle } = props; + const { t } = props; setDocumentTitle(`${t("ThirdPartyAuthorization")}`); @@ -202,7 +203,6 @@ class ThirdPartyServices extends React.Component { theme, currentColorScheme, isThirdPartyAvailable, - organizationName, } = this.props; const { dialogVisible, isLoading } = this.state; const { onModalClose, onModalOpen, setConsumer, onChangeLoading } = this; @@ -255,7 +255,7 @@ class ThirdPartyServices extends React.Component { {t("IntegrationRequest", { productName: PRODUCT_NAME, - organizationName, + organizationName: t("Common:OrganizationName"), })}
@@ -264,9 +269,4 @@ const PrivacyPage = (props) => { ); }; -export default inject(({ settingsStore }) => { - const { organizationName } = settingsStore; - return { - organizationName, - }; -})(observer(PrivacyPage)); +export default observer(PrivacyPage); diff --git a/packages/client/src/pages/Profile/Section/Body/sub-components/file-management/index.js b/packages/client/src/pages/Profile/Section/Body/sub-components/file-management/index.js index 1b477a5674..e96aac596a 100644 --- a/packages/client/src/pages/Profile/Section/Body/sub-components/file-management/index.js +++ b/packages/client/src/pages/Profile/Section/Body/sub-components/file-management/index.js @@ -64,7 +64,6 @@ const FileManagement = ({ openEditorInSameTab, setOpenEditorInSameTab, - organizationName, }) => { const { t, ready } = useTranslation(["FilesSettings", "Common"]); @@ -168,7 +167,11 @@ const FileManagement = ({ onChange={onChangeOpenEditorInSameTab} isChecked={openEditorInSameTab} /> - {t("OpenSameTab", { organizationName })} + + {t("OpenSameTab", { + organizationName: t("Common:OrganizationName"), + })} +
)} @@ -228,68 +231,64 @@ const FileManagement = ({ ); }; -export default inject( - ({ settingsStore, userStore, filesSettingsStore, treeFoldersStore }) => { - const { organizationName } = settingsStore; - const { - storeOriginalFiles, - confirmDelete, - forcesave, +export default inject(({ userStore, filesSettingsStore, treeFoldersStore }) => { + const { + storeOriginalFiles, + confirmDelete, + forcesave, - setStoreOriginal, + setStoreOriginal, - setConfirmDelete, + setConfirmDelete, - setForceSave, + setForceSave, - favoritesSection, - recentSection, - setFavoritesSetting, - setRecentSetting, + favoritesSection, + recentSection, + setFavoritesSetting, + setRecentSetting, - keepNewFileName, - setKeepNewFileName, + keepNewFileName, + setKeepNewFileName, - setThumbnails1280x720, - thumbnails1280x720, + setThumbnails1280x720, + thumbnails1280x720, - openEditorInSameTab, - setOpenEditorInSameTab, - } = filesSettingsStore; + openEditorInSameTab, + setOpenEditorInSameTab, + } = filesSettingsStore; - const { myFolderId, commonFolderId } = treeFoldersStore; + const { myFolderId, commonFolderId } = treeFoldersStore; - return { - storeOriginalFiles, - confirmDelete, - forceSave: forcesave, + return { + storeOriginalFiles, + confirmDelete, + forceSave: forcesave, - myFolderId, - commonFolderId, - isVisitor: userStore.user.isVisitor, - favoritesSection, - recentSection, + myFolderId, + commonFolderId, + isVisitor: userStore.user.isVisitor, + favoritesSection, + recentSection, - setStoreOriginal, + setStoreOriginal, - setConfirmDelete, + setConfirmDelete, - setForceSave, + setForceSave, - setFavoritesSetting, - setRecentSetting, - myFolderId, - commonFolderId, + setFavoritesSetting, + setRecentSetting, + myFolderId, + commonFolderId, - keepNewFileName, - setKeepNewFileName, + keepNewFileName, + setKeepNewFileName, - setThumbnails1280x720, - thumbnails1280x720, + setThumbnails1280x720, + thumbnails1280x720, - openEditorInSameTab, - setOpenEditorInSameTab, - organizationName, - }; - }, -)(observer(FileManagement)); + openEditorInSameTab, + setOpenEditorInSameTab, + }; +})(observer(FileManagement)); diff --git a/packages/client/src/pages/Profile/index.js b/packages/client/src/pages/Profile/index.js index 49c8015fba..1caccb3580 100644 --- a/packages/client/src/pages/Profile/index.js +++ b/packages/client/src/pages/Profile/index.js @@ -35,6 +35,7 @@ import Dialogs from "../Home/Section/AccountsBody/Dialogs"; import withCultureNames from "SRC_DIR/HOCs/withCultureNames"; import { inject, observer } from "mobx-react"; import { withTranslation } from "react-i18next"; +import { setDocumentTitle } from "SRC_DIR/helpers/utils"; class Profile extends React.Component { componentDidMount() { @@ -42,7 +43,6 @@ class Profile extends React.Component { fetchProfile, profile, t, - setDocumentTitle, setIsEditTargetUser, @@ -147,7 +147,7 @@ export default inject( tfaStore, treeFoldersStore, }) => { - const { setDocumentTitle, language } = authStore; + const { language } = authStore; const { setIsProfileLoaded, @@ -175,7 +175,6 @@ export default inject( const { getTfaType } = tfaStore; return { - setDocumentTitle, language, fetchProfile, profile, diff --git a/packages/client/src/pages/Sdk/index.js b/packages/client/src/pages/Sdk/index.js index 438c0213be..1159ab8b00 100644 --- a/packages/client/src/pages/Sdk/index.js +++ b/packages/client/src/pages/Sdk/index.js @@ -56,7 +56,6 @@ const Sdk = ({ fetchExternalLinks, getFilePrimaryLink, getFilesSettings, - organizationName, }) => { const [isDataReady, setIsDataReady] = useState(false); @@ -86,7 +85,9 @@ const Sdk = ({ type: t("Files:Forms").toLowerCase(), }), EditorSupportedTypes: t("Common:SelectTypeFiles", { - type: t("AllTypesAvailableForEditing", { organizationName }), + type: t("AllTypesAvailableForEditing", { + organizationName: t("Common:OrganizationName"), + }), }), }; @@ -315,14 +316,8 @@ export default inject( filesStore, }) => { const { login, logout } = authStore; - const { - theme, - setFrameConfig, - frameConfig, - getSettings, - isLoaded, - organizationName, - } = settingsStore; + const { theme, setFrameConfig, frameConfig, getSettings, isLoaded } = + settingsStore; const { loadCurrentUser, user } = userStore; const { updateProfileCulture } = peopleStore.targetUserStore; const { getIcon, getRoomsIcon, getFilesSettings } = filesSettingsStore; @@ -345,7 +340,6 @@ export default inject( fetchExternalLinks, getFilePrimaryLink, getFilesSettings, - organizationName, }; }, )( diff --git a/packages/client/src/pages/VersionHistory/index.js b/packages/client/src/pages/VersionHistory/index.js index 8c5fb6a211..450fb467fa 100644 --- a/packages/client/src/pages/VersionHistory/index.js +++ b/packages/client/src/pages/VersionHistory/index.js @@ -31,7 +31,6 @@ import { SectionHeaderSkeleton } from "@docspace/shared/skeletons/sections"; import { withTranslation } from "react-i18next"; import { SectionHeaderContent, SectionBodyContent } from "./Section"; -//import { setDocumentTitle } from "@docspace/client/src/helpers/filesUtils"; import { inject, observer } from "mobx-react"; import SectionWrapper from "SRC_DIR/components/Section"; class PureVersionHistory extends React.Component { diff --git a/packages/client/src/store/SelectedFolderStore.ts b/packages/client/src/store/SelectedFolderStore.ts index 83339ed365..ce1f7a8c1c 100644 --- a/packages/client/src/store/SelectedFolderStore.ts +++ b/packages/client/src/store/SelectedFolderStore.ts @@ -38,6 +38,7 @@ import type { Nullable, TCreatedBy, TPathParts, + TTranslation, } from "@docspace/shared/types"; import { TFolder, TFolderSecurity } from "@docspace/shared/api/files/types"; import { TLogo, TRoomSecurity } from "@docspace/shared/api/rooms/types"; @@ -304,9 +305,10 @@ class SelectedFolderStore { if (!("providerKey" in selectedFolder)) this.providerKey = null; }; - setSelectedFolder: (selectedFolder: TSetSelectedFolder | null) => void = ( - selectedFolder, - ) => { + setSelectedFolder: ( + t: TTranslation, + selectedFolder: TSetSelectedFolder | null, + ) => void = (selectedFolder) => { const socketHelper = this.settingsStore?.socketHelper; this.toDefault(); diff --git a/packages/doceditor/src/hooks/useEditorEvents.ts b/packages/doceditor/src/hooks/useEditorEvents.ts index ef9830a805..1ad0cc5761 100644 --- a/packages/doceditor/src/hooks/useEditorEvents.ts +++ b/packages/doceditor/src/hooks/useEditorEvents.ts @@ -558,6 +558,7 @@ const useEditorEvents = ({ setTimeout(() => { docSaved ? setDocumentTitle( + t, docTitle, config?.document.fileType ?? "", documentReady, @@ -565,6 +566,7 @@ const useEditorEvents = ({ setDocTitle, ) : setDocumentTitle( + t, `*${docTitle}`, config?.document.fileType ?? "", documentReady, @@ -573,7 +575,14 @@ const useEditorEvents = ({ ); }, 500); }, - [config?.document.fileType, docSaved, docTitle, documentReady, successAuth], + [ + t, + config?.document.fileType, + docSaved, + docTitle, + documentReady, + successAuth, + ], ); const onMetaChange = React.useCallback( @@ -583,6 +592,7 @@ const useEditorEvents = ({ if (newTitle && newTitle !== docTitle) { setDocumentTitle( + t, newTitle, config?.document.fileType ?? "", documentReady, @@ -592,7 +602,7 @@ const useEditorEvents = ({ setDocTitle(newTitle); } }, - [config?.document.fileType, docTitle, documentReady, successAuth], + [t, config?.document.fileType, docTitle, documentReady, successAuth], ); const onMakeActionLink = React.useCallback((event: object) => { diff --git a/packages/doceditor/src/hooks/useInit.ts b/packages/doceditor/src/hooks/useInit.ts index 29f22119ba..ea5fcb248a 100644 --- a/packages/doceditor/src/hooks/useInit.ts +++ b/packages/doceditor/src/hooks/useInit.ts @@ -54,13 +54,14 @@ const useInit = ({ if (!config) return; setDocumentTitle( + t, config.document.title, config.document.fileType, documentReady, successAuth ?? false, setDocTitle, ); - }, [config, documentReady, fileInfo, setDocTitle, successAuth]); + }, [t, config, documentReady, fileInfo, setDocTitle, successAuth]); React.useEffect(() => { if (config && IS_DESKTOP_EDITOR && user && fileInfo?.id) { diff --git a/packages/doceditor/src/utils/index.ts b/packages/doceditor/src/utils/index.ts index 61b67eebdf..ffef1ef49f 100644 --- a/packages/doceditor/src/utils/index.ts +++ b/packages/doceditor/src/utils/index.ts @@ -30,11 +30,7 @@ import { request } from "@docspace/shared/api/client"; import { convertFile } from "@docspace/shared/api/files"; import { TEditHistory } from "@docspace/shared/api/files/types"; import { FolderType } from "@docspace/shared/enums"; - -import type { IInitialConfig } from "@/types"; - -import { IS_VIEW } from "./constants"; -import { BRAND_NAME } from "@docspace/shared/constants"; +import { TTranslation } from "@docspace/shared/types"; export const getBackUrl = ( rootFolderType: FolderType, @@ -155,13 +151,14 @@ export const checkIfFirstSymbolInStringIsRtl = (str: string | null) => { }; export const setDocumentTitle = ( + t: TTranslation, subTitle: string | null = null, fileType: string, documentReady: boolean, successAuth: boolean, callback?: (value: string) => void, ) => { - const organizationName = BRAND_NAME; //TODO: Replace to API variant + const organizationName = t("Common:OrganizationName"); const moduleTitle = "Documents"; //TODO: Replace to API variant let newSubTitle = subTitle; diff --git a/packages/management/src/categories/backup/index.tsx b/packages/management/src/categories/backup/index.tsx index cee96e4b78..d0036466c0 100644 --- a/packages/management/src/categories/backup/index.tsx +++ b/packages/management/src/categories/backup/index.tsx @@ -27,15 +27,12 @@ import React, { useEffect } from "react"; import { useTranslation } from "react-i18next"; -import { useStore } from "SRC_DIR/store"; import BackupPage from "client/BackupPage"; +import { setDocumentTitle } from "SRC_DIR/utils"; const Backup = () => { const { t } = useTranslation(["Settings"]); - const { authStore } = useStore(); - const { setDocumentTitle } = authStore; - useEffect(() => { setDocumentTitle(t("Backup")); }, []); diff --git a/packages/management/src/categories/branding/index.tsx b/packages/management/src/categories/branding/index.tsx index 871ffd18c7..fa7ff2cbea 100644 --- a/packages/management/src/categories/branding/index.tsx +++ b/packages/management/src/categories/branding/index.tsx @@ -29,13 +29,11 @@ import { useTranslation } from "react-i18next"; import { useStore } from "SRC_DIR/store"; import BrandingPage from "client/BrandingPage"; +import { setDocumentTitle } from "SRC_DIR/utils"; const Branding = () => { const { t } = useTranslation(["Settings"]); - const { authStore } = useStore(); - const { setDocumentTitle } = authStore; - useEffect(() => { setDocumentTitle(t("Branding")); }, []); diff --git a/packages/management/src/categories/restore/index.tsx b/packages/management/src/categories/restore/index.tsx index a2fbd4247d..f2584b3397 100644 --- a/packages/management/src/categories/restore/index.tsx +++ b/packages/management/src/categories/restore/index.tsx @@ -27,15 +27,12 @@ import React, { useEffect } from "react"; import { useTranslation } from "react-i18next"; -import { useStore } from "SRC_DIR/store"; +import { setDocumentTitle } from "SRC_DIR/utils"; import RestorePage from "client/RestorePage"; const Restore = () => { const { t } = useTranslation(["Settings"]); - const { authStore } = useStore(); - const { setDocumentTitle } = authStore; - useEffect(() => { setDocumentTitle(t("RestoreBackup")); }, []); diff --git a/packages/management/src/categories/spaces/index.tsx b/packages/management/src/categories/spaces/index.tsx index bfe0ee20e5..e3a88f3e8d 100644 --- a/packages/management/src/categories/spaces/index.tsx +++ b/packages/management/src/categories/spaces/index.tsx @@ -37,6 +37,7 @@ import CreatePortalDialog from "./sub-components/dialogs/CreatePortalDialog"; import DeletePortalDialog from "./sub-components/dialogs/DeletePortalDialog"; import SpaceCreatedDialog from "./sub-components/dialogs/SpaceCreatedDialog"; import { SpacesLoader } from "./sub-components/SpacesLoader"; +import { setDocumentTitle } from "SRC_DIR/utils"; const Spaces = () => { const { t } = useTranslation(["Management", "Common", "Settings"]); @@ -50,7 +51,7 @@ const Spaces = () => { deletePortalDialogVisible, spaceCreatedDialogVisible, } = spacesStore; - const { setDocumentTitle } = authStore; + const { portals } = settingsStore; React.useEffect(() => { diff --git a/packages/management/src/utils/index.ts b/packages/management/src/utils/index.ts index 8440013457..2103a92477 100644 --- a/packages/management/src/utils/index.ts +++ b/packages/management/src/utils/index.ts @@ -26,6 +26,7 @@ import { settingsTree } from "./settingsTree"; import { translations } from "../autoGeneratedTranslations"; +import i18n from "../i18n"; export const getItemByLink = (path: string) => { const arrayPath = path.split("/"); @@ -87,3 +88,25 @@ export function loadLanguagePath(homepage: string, fixedNS = null) { return path; }; } + +export const setDocumentTitle = (subTitle = null) => { + let title; + + // const currentModule = this.settingsStore?.product; + const organizationName = i18n.t("Common:OrganizationName"); + + if (subTitle) { + title = `${subTitle} - ${organizationName}`; + // if (this.isAuthenticated && currentModule) { + // title = `${subTitle} - ${currentModule.title}`; + // } else { + // title = `${subTitle} - ${organizationName}`; + // } + // } else if ( organizationName) { + // title = `${currentModule.title} - ${organizationName}`; + } else { + title = organizationName; + } + + document.title = title ?? ""; +}; diff --git a/packages/shared/components/article/Article.types.ts b/packages/shared/components/article/Article.types.ts index 5c40d5f071..12a71e76a7 100644 --- a/packages/shared/components/article/Article.types.ts +++ b/packages/shared/components/article/Article.types.ts @@ -71,7 +71,6 @@ export interface ArticleZendeskProps { export interface ArticleAppsProps { showText: boolean; withDevTools: boolean; - organizationName: string; } export interface ArticleDevToolsBarProps { diff --git a/packages/shared/components/article/index.tsx b/packages/shared/components/article/index.tsx index bde168408c..f2d15c510d 100644 --- a/packages/shared/components/article/index.tsx +++ b/packages/shared/components/article/index.tsx @@ -109,7 +109,6 @@ const Article = ({ chatDisplayName, zendeskKey, showProgress, - organizationName, user, getActions, onProfileClick, @@ -293,11 +292,7 @@ const Article = ({ /> )} {!hideAppsBlock && ( - + )} {!isMobile && isLiveChatAvailable && ( { }; const ArticleApps = React.memo( - ({ showText, withDevTools, organizationName }: ArticleAppsProps) => { - const { t } = useTranslation(["Translations"]); + ({ showText, withDevTools }: ArticleAppsProps) => { + const { t } = useTranslation(["Translations", "Common"]); const theme = useTheme(); const baseUrl = getLink(); @@ -79,7 +79,9 @@ const ArticleApps = React.memo( size={32} isFill hoverColor={theme.filesArticleBody.downloadAppList.winHoverColor} - title={t("Common:MobileWin", { organizationName })} + title={t("Common:MobileWin", { + organizationName: t("Common:OrganizationName"), + })} /> window.open(desktopLink)} @@ -87,7 +89,9 @@ const ArticleApps = React.memo( size={32} isFill hoverColor={theme.filesArticleBody.downloadAppList.macHoverColor} - title={t("Common:MobileMac", { organizationName })} + title={t("Common:MobileMac", { + organizationName: t("Common:OrganizationName"), + })} /> window.open(desktopLink)} @@ -95,7 +99,9 @@ const ArticleApps = React.memo( size={32} isFill hoverColor={theme.filesArticleBody.downloadAppList.linuxHoverColor} - title={t("Common:MobileLinux", { organizationName })} + title={t("Common:MobileLinux", { + organizationName: t("Common:OrganizationName"), + })} /> window.open(androidLink)} @@ -105,7 +111,9 @@ const ArticleApps = React.memo( hoverColor={ theme.filesArticleBody.downloadAppList.androidHoverColor } - title={t("Common:MobileAndroid", { organizationName })} + title={t("Common:MobileAndroid", { + organizationName: t("Common:OrganizationName"), + })} /> window.open(iosLink)} @@ -113,7 +121,9 @@ const ArticleApps = React.memo( size={32} isFill hoverColor={theme.filesArticleBody.downloadAppList.iosHoverColor} - title={t("Common:MobileIos", { organizationName })} + title={t("Common:MobileIos", { + organizationName: t("Common:OrganizationName"), + })} />
diff --git a/packages/shared/components/toast/sub-components/Toastr.tsx b/packages/shared/components/toast/sub-components/Toastr.tsx index 1b81431d10..696a9fb137 100644 --- a/packages/shared/components/toast/sub-components/Toastr.tsx +++ b/packages/shared/components/toast/sub-components/Toastr.tsx @@ -206,6 +206,8 @@ function error( message = data; } + console.error(message); + return notify( ToastType.error, message, diff --git a/packages/shared/store/AuthStore.ts b/packages/shared/store/AuthStore.ts index 095865928f..a7dea4f35a 100644 --- a/packages/shared/store/AuthStore.ts +++ b/packages/shared/store/AuthStore.ts @@ -471,28 +471,6 @@ class AuthStore { ); } - setDocumentTitle = (subTitle = null) => { - let title; - - // const currentModule = this.settingsStore?.product; - const organizationName = this.settingsStore?.organizationName; - - if (subTitle) { - title = `${subTitle} - ${organizationName}`; - // if (this.isAuthenticated && currentModule) { - // title = `${subTitle} - ${currentModule.title}`; - // } else { - // title = `${subTitle} - ${organizationName}`; - // } - // } else if ( organizationName) { - // title = `${currentModule.title} - ${organizationName}`; - } else { - title = organizationName; - } - - document.title = title ?? ""; - }; - setProductVersion = (version: string) => { this.version = version; }; diff --git a/packages/shared/store/SettingsStore.ts b/packages/shared/store/SettingsStore.ts index 54086c965e..a85c2b88d4 100644 --- a/packages/shared/store/SettingsStore.ts +++ b/packages/shared/store/SettingsStore.ts @@ -157,8 +157,6 @@ class SettingsStore { timePattern: "h:mm tt", }; - organizationName = BRAND_NAME; - greetingSettings = "Web Office Applications"; enableAdmMess = false; diff --git a/public/locales/ar-SA/Common.json b/public/locales/ar-SA/Common.json index 6dbea37be4..efa3b1b065 100644 --- a/public/locales/ar-SA/Common.json +++ b/public/locales/ar-SA/Common.json @@ -283,6 +283,7 @@ "OKButton": "موافق", "Or": "أو", "orContinueWith": "أو الاستمرار مع", + "OrganizationName": "ONLYOFFICE", "OtherLabel": "أخرى", "OtherOperations": "عمليات أخرى", "OverwriteDescription": "سيحل الملف الجديد محل الملف الحالي كإصدار جديد.", diff --git a/public/locales/az/Common.json b/public/locales/az/Common.json index d28444ce89..649980d3ad 100644 --- a/public/locales/az/Common.json +++ b/public/locales/az/Common.json @@ -284,6 +284,7 @@ "OKButton": "OK", "Or": "və ya", "orContinueWith": "və ya ilə davam edin", + "OrganizationName": "ONLYOFFICE", "OtherLabel": "Digər", "OtherOperations": "Digər əməliyyatlar", "OverwriteDescription": "Fayl, versiyası ilə eyni adı olan fayla əlavə olunacaq. ", diff --git a/public/locales/bg/Common.json b/public/locales/bg/Common.json index 27d86f1c43..0845bf7237 100644 --- a/public/locales/bg/Common.json +++ b/public/locales/bg/Common.json @@ -284,6 +284,7 @@ "OKButton": "OK", "Or": "или", "orContinueWith": "или продължете с", + "OrganizationName": "ONLYOFFICE", "OtherLabel": "Други", "OtherOperations": "Други операции", "OverwriteDescription": "Файлът ще бъде добавен към файла със същото име като версия.", diff --git a/public/locales/cs/Common.json b/public/locales/cs/Common.json index 08843168d8..3c36a5e31a 100644 --- a/public/locales/cs/Common.json +++ b/public/locales/cs/Common.json @@ -284,6 +284,7 @@ "OKButton": "OK", "Or": "nebo", "orContinueWith": "nebo pokračovat pomocí", + "OrganizationName": "ONLYOFFICE", "OtherLabel": "Ostatní", "OtherOperations": "Další operace", "OverwriteDescription": "Soubor bude přidán do souboru se stejným názvem jako verze.", diff --git a/public/locales/de/Common.json b/public/locales/de/Common.json index bf3b7d47c4..d1c4ef274e 100644 --- a/public/locales/de/Common.json +++ b/public/locales/de/Common.json @@ -283,6 +283,7 @@ "OKButton": "OK", "Or": "oder", "orContinueWith": "oder weiter mit", + "OrganizationName": "ONLYOFFICE", "OtherLabel": "Sonstiges", "OtherOperations": "Andere Vorgänge", "OverwriteDescription": "Die Datei wird mit einer neuen Version ersetzt.", diff --git a/public/locales/el-GR/Common.json b/public/locales/el-GR/Common.json index c5c416f162..97c30a8604 100644 --- a/public/locales/el-GR/Common.json +++ b/public/locales/el-GR/Common.json @@ -284,6 +284,7 @@ "OKButton": "Εντάξει", "Or": "ή", "orContinueWith": "ή συνεχίστε με", + "OrganizationName": "ONLYOFFICE", "OtherLabel": "Άλλο", "OtherOperations": "Άλλες λειτουργίες", "OverwriteDescription": "Το νέο αρχείο θα αντικαταστήσει το υπάρχον ως νέα έκδοση.", diff --git a/public/locales/en/Common.json b/public/locales/en/Common.json index 101f3a77db..2d4543e313 100644 --- a/public/locales/en/Common.json +++ b/public/locales/en/Common.json @@ -298,6 +298,7 @@ "OKButton": "OK", "Or": "or", "orContinueWith": "or continue with", + "OrganizationName": "ONLYOFFICE", "OtherLabel": "Other", "OtherOperations": "Other operations", "OverwriteDescription": "The new file will replace the existing one as a new version.", diff --git a/public/locales/es/Common.json b/public/locales/es/Common.json index 8079a04ca7..aa67c59586 100644 --- a/public/locales/es/Common.json +++ b/public/locales/es/Common.json @@ -284,6 +284,7 @@ "OKButton": "OK", "Or": "o", "orContinueWith": "o continuar con", + "OrganizationName": "ONLYOFFICE", "OtherLabel": "Otro", "OtherOperations": "Otras operaciones", "OverwriteDescription": "El nuevo archivo sustituirá al existente como una nueva versión.", diff --git a/public/locales/fi/Common.json b/public/locales/fi/Common.json index c192745044..32abce0ac5 100644 --- a/public/locales/fi/Common.json +++ b/public/locales/fi/Common.json @@ -284,6 +284,7 @@ "OKButton": "OK", "Or": "tai", "orContinueWith": "tai jatka", + "OrganizationName": "ONLYOFFICE", "OtherLabel": "Muu", "OtherOperations": "Muut toiminnot", "OverwriteDescription": "Tiedosto lisätään tiedostoon samalla nimellä versiona.", diff --git a/public/locales/fr/Common.json b/public/locales/fr/Common.json index ac45ffafe7..526cfbbc66 100644 --- a/public/locales/fr/Common.json +++ b/public/locales/fr/Common.json @@ -284,6 +284,7 @@ "OKButton": "OK", "Or": "ou", "orContinueWith": "ou continuez avec", + "OrganizationName": "ONLYOFFICE", "OtherLabel": "Autre", "OtherOperations": "Autres opérations", "OverwriteDescription": "Le nouveau fichier remplacera le fichier existant en tant que nouvelle version.", diff --git a/public/locales/hy-AM/Common.json b/public/locales/hy-AM/Common.json index 4ae260d6e7..b7656d6fbf 100644 --- a/public/locales/hy-AM/Common.json +++ b/public/locales/hy-AM/Common.json @@ -283,6 +283,7 @@ "OKButton": "Լավ", "Or": "կամ", "orContinueWith": "կամ շարունակել", + "OrganizationName": "ONLYOFFICE", "OtherLabel": "Այլ", "OtherOperations": "Այլ տարբերակներ", "OverwriteDescription": "Նոր ֆայլը որպես նոր տարբերակ կփոխարինի գոյություն ունեցողին։", diff --git a/public/locales/it/Common.json b/public/locales/it/Common.json index 278e637ab7..efd09e9e97 100644 --- a/public/locales/it/Common.json +++ b/public/locales/it/Common.json @@ -284,6 +284,7 @@ "OKButton": "OK", "Or": "o", "orContinueWith": "o continua con", + "OrganizationName": "ONLYOFFICE", "OtherLabel": "Altro", "OtherOperations": "Altre operazioni", "OverwriteDescription": "Il nuovo file sostituisce quello già esistente come una versione nuova.", diff --git a/public/locales/ja-JP/Common.json b/public/locales/ja-JP/Common.json index 2b61537c81..8c21355e9e 100644 --- a/public/locales/ja-JP/Common.json +++ b/public/locales/ja-JP/Common.json @@ -284,6 +284,7 @@ "OKButton": "大丈夫", "Or": "または", "orContinueWith": "あるいは", + "OrganizationName": "ONLYOFFICE", "OtherLabel": "その他", "OtherOperations": "他の操作", "OverwriteDescription": "このファイルは、同名のファイルにバージョンが追加されます。", diff --git a/public/locales/ko-KR/Common.json b/public/locales/ko-KR/Common.json index 812ab8cb48..6af72b9937 100644 --- a/public/locales/ko-KR/Common.json +++ b/public/locales/ko-KR/Common.json @@ -284,6 +284,7 @@ "OKButton": "확인", "Or": "또는", "orContinueWith": "또는 다음을 이용:", + "OrganizationName": "ONLYOFFICE", "OtherLabel": "기타", "OtherOperations": "다른 작업", "OverwriteDescription": "파일이 같은 이름의 파일에 추가됩니다.", diff --git a/public/locales/lo-LA/Common.json b/public/locales/lo-LA/Common.json index 3f7f9381fc..53a55ae6f7 100644 --- a/public/locales/lo-LA/Common.json +++ b/public/locales/lo-LA/Common.json @@ -218,6 +218,7 @@ "OkButton": "ຕົກລົງ", "OKButton": "ຕົກລົງ", "Or": "ຫຼື", + "OrganizationName": "ONLYOFFICE", "OtherLabel": "ອື່ນໆ", "OtherOperations": "ອື່ນໆ ການດໍາເນີນງານ", "OverwriteDescription": "ໄຟລ໌໌ທີ່ມີຢູ່ແລ້ວຈະຖືກແທນດ້ວຍໄຟລ໌ໃໝ່.", diff --git a/public/locales/lv/Common.json b/public/locales/lv/Common.json index 1e6c7ffc57..768ca7e6dc 100644 --- a/public/locales/lv/Common.json +++ b/public/locales/lv/Common.json @@ -284,6 +284,7 @@ "OKButton": "Labi", "Or": "vai", "orContinueWith": "vai turpināt ar", + "OrganizationName": "ONLYOFFICE", "OtherLabel": "Citi", "OtherOperations": "Citas darbības", "OverwriteDescription": "Fails tiks pievienots failam ar tādu pašu nosaukumu kā versijai.", diff --git a/public/locales/nl/Common.json b/public/locales/nl/Common.json index e4cdf81c96..1f0cd48139 100644 --- a/public/locales/nl/Common.json +++ b/public/locales/nl/Common.json @@ -284,6 +284,7 @@ "OKButton": "OK", "Or": "of", "orContinueWith": "of ga verder met", + "OrganizationName": "ONLYOFFICE", "OtherLabel": "Overig", "OtherOperations": "Andere bewerkingen", "OverwriteDescription": "Het bestand zal worden toegevoegd aan het bestand met dezelfde naam als een versie.", diff --git a/public/locales/pl/Common.json b/public/locales/pl/Common.json index 5a93b7aca5..6cf18c5b48 100644 --- a/public/locales/pl/Common.json +++ b/public/locales/pl/Common.json @@ -284,6 +284,7 @@ "OKButton": "OK", "Or": "lub", "orContinueWith": "lub kontynuuj z", + "OrganizationName": "ONLYOFFICE", "OtherLabel": "Inny", "OtherOperations": "Inne działania", "OverwriteDescription": "Nowy plik zastąpi istniejący jako jego nowa wersja.", diff --git a/public/locales/pt-BR/Common.json b/public/locales/pt-BR/Common.json index 5e93d368d9..f0398026b8 100644 --- a/public/locales/pt-BR/Common.json +++ b/public/locales/pt-BR/Common.json @@ -284,6 +284,7 @@ "OKButton": "OK", "Or": "ou", "orContinueWith": "ou continuar com", + "OrganizationName": "ONLYOFFICE", "OtherLabel": "Outro", "OtherOperations": "Outras operações", "OverwriteDescription": "O arquivo será adicionado ao arquivo com o mesmo nome como uma versão.", diff --git a/public/locales/pt/Common.json b/public/locales/pt/Common.json index f0454ba2fd..09d6dc2cb5 100644 --- a/public/locales/pt/Common.json +++ b/public/locales/pt/Common.json @@ -284,6 +284,7 @@ "OKButton": "OK", "Or": "ou", "orContinueWith": "ou continuar com", + "OrganizationName": "ONLYOFFICE", "OtherLabel": "Outros", "OtherOperations": "Outras operações", "OverwriteDescription": "O novo ficheiro irá substituir o existente como uma nova versão.", diff --git a/public/locales/ro/Common.json b/public/locales/ro/Common.json index be3fbe2279..323794ff46 100644 --- a/public/locales/ro/Common.json +++ b/public/locales/ro/Common.json @@ -284,6 +284,7 @@ "OKButton": "OK", "Or": "sau", "orContinueWith": "sau continuați cu", + "OrganizationName": "ONLYOFFICE", "OtherLabel": "Altă", "OtherOperations": "Alte operațiuni", "OverwriteDescription": "Fișierul va fi ajutat ca o versiune a fișierului cu același nume.", diff --git a/public/locales/ru/Common.json b/public/locales/ru/Common.json index d05cfb81a5..2df8b9b310 100644 --- a/public/locales/ru/Common.json +++ b/public/locales/ru/Common.json @@ -285,6 +285,7 @@ "OKButton": "ОК", "Or": "или", "orContinueWith": "или продолжить с", + "OrganizationName": "ONLYOFFICE", "OtherLabel": "Другое", "OtherOperations": "Другие операции", "OverwriteDescription": "Новый файл заменит существующий файл как новая версия.", diff --git a/public/locales/si/Common.json b/public/locales/si/Common.json index 7fc12600a0..b922e698cf 100644 --- a/public/locales/si/Common.json +++ b/public/locales/si/Common.json @@ -279,6 +279,7 @@ "OKButton": "හරි", "Or": "හෝ", "orContinueWith": "හෝ මෙය සමඟ ඉදිරියට", + "OrganizationName": "ONLYOFFICE", "OtherLabel": "වෙනත්", "OtherOperations": "වෙනත් මෙහෙයුම්", "OverwriteDescription": "නව ගොනුව පවතින ගොනුවෙහි නව අනුවාදයක් ලෙස ප්‍රතිස්ථාපනය කෙරෙනු ඇත.", diff --git a/public/locales/sk/Common.json b/public/locales/sk/Common.json index 686b8a86c6..1ddfcdd12a 100644 --- a/public/locales/sk/Common.json +++ b/public/locales/sk/Common.json @@ -284,6 +284,7 @@ "OKButton": "OK", "Or": "alebo", "orContinueWith": "alebo pokračujte s", + "OrganizationName": "ONLYOFFICE", "OtherLabel": "Ostatné", "OtherOperations": "Ďalšie operácie", "OverwriteDescription": "Súbor bude pridaný do súboru s rovnakým názvom ako verzia.", diff --git a/public/locales/sl/Common.json b/public/locales/sl/Common.json index dc62b29de7..6c23c9a7c0 100644 --- a/public/locales/sl/Common.json +++ b/public/locales/sl/Common.json @@ -284,6 +284,7 @@ "OKButton": "V redu", "Or": "ali", "orContinueWith": "ali nadaljujte z", + "OrganizationName": "ONLYOFFICE", "OtherLabel": "Drugo", "OtherOperations": "Druge operacije", "OverwriteDescription": "Datoteka bo dodana datoteki z istim imenom kot različica.", diff --git a/public/locales/sr-Cyrl-RS/Common.json b/public/locales/sr-Cyrl-RS/Common.json index fc9bce85fb..c396a7da5c 100644 --- a/public/locales/sr-Cyrl-RS/Common.json +++ b/public/locales/sr-Cyrl-RS/Common.json @@ -288,6 +288,7 @@ "OKButton": "OK", "Or": "или", "orContinueWith": "или настави са", + "OrganizationName": "ONLYOFFICE", "OtherLabel": "Друго", "OtherOperations": "Друге операције", "OverwriteDescription": "Нова датотека ће заменити постојећу као нова верзија.", diff --git a/public/locales/sr-Latn-RS/Common.json b/public/locales/sr-Latn-RS/Common.json index 8da2900f1f..28de97b923 100644 --- a/public/locales/sr-Latn-RS/Common.json +++ b/public/locales/sr-Latn-RS/Common.json @@ -288,6 +288,7 @@ "OKButton": "OK", "Or": "ili", "orContinueWith": "ili nastavi sa", + "OrganizationName": "ONLYOFFICE", "OtherLabel": "Drugo", "OtherOperations": "Druge operacije", "OverwriteDescription": "Nova datoteka će zameniti postojeću kao nova verzija.", diff --git a/public/locales/tr/Common.json b/public/locales/tr/Common.json index 4399650ed7..a8756b06ec 100644 --- a/public/locales/tr/Common.json +++ b/public/locales/tr/Common.json @@ -284,6 +284,7 @@ "OKButton": "Tamam", "Or": "veya", "orContinueWith": "veya şununla devam edin", + "OrganizationName": "ONLYOFFICE", "OtherLabel": "Diğer", "OtherOperations": "Diğer İşlemler", "OverwriteDescription": "Dosya, aynı ada sahip dosyaya bir versiyon olarak eklenecektir.", diff --git a/public/locales/uk-UA/Common.json b/public/locales/uk-UA/Common.json index 61c90d1e52..ba9a796686 100644 --- a/public/locales/uk-UA/Common.json +++ b/public/locales/uk-UA/Common.json @@ -284,6 +284,7 @@ "OKButton": "OK", "Or": "або", "orContinueWith": "або продовжте з", + "OrganizationName": "ONLYOFFICE", "OtherLabel": "Інше", "OtherOperations": "Інші операції", "OverwriteDescription": "Файл буде додано до файлу з таким же іменем, як версія.", diff --git a/public/locales/vi/Common.json b/public/locales/vi/Common.json index 14d33bbc9f..c21de9f263 100644 --- a/public/locales/vi/Common.json +++ b/public/locales/vi/Common.json @@ -284,6 +284,7 @@ "OKButton": "OK", "Or": "hoặc", "orContinueWith": "hoặc tiếp tục với", + "OrganizationName": "ONLYOFFICE", "OtherLabel": "Khác", "OtherOperations": "Hoạt động khác", "OverwriteDescription": " Tệp sẽ được thêm vào tệp có cùng tên như một phiên bản.", diff --git a/public/locales/zh-CN/Common.json b/public/locales/zh-CN/Common.json index fa7557fe5b..6dab4c7af8 100644 --- a/public/locales/zh-CN/Common.json +++ b/public/locales/zh-CN/Common.json @@ -280,6 +280,7 @@ "OKButton": "确定", "Or": "或", "orContinueWith": "或选择", + "OrganizationName": "ONLYOFFICE", "OtherLabel": "其他", "OtherOperations": "其他操作", "OverwriteDescription": "文件与同名文件将作为不同版本存在。",