From 4b96f5c99ed79ef6367464d40d337f0a856cbaaf Mon Sep 17 00:00:00 2001 From: gopienkonikita Date: Mon, 17 Jun 2024 13:37:06 +0300 Subject: [PATCH] Web: VDR: fixed merge --- .../locales/en/CreateEditRoomDialog.json | 2 -- .../CreateEditRoomDialog/data/index.js | 23 +------------------ packages/client/src/helpers/filesUtils.js | 2 +- .../src/pages/Home/Section/Filter/index.js | 2 +- .../components/room-type/RoomType.utils.ts | 4 +++- public/locales/en/Common.json | 4 +++- 6 files changed, 9 insertions(+), 28 deletions(-) diff --git a/packages/client/public/locales/en/CreateEditRoomDialog.json b/packages/client/public/locales/en/CreateEditRoomDialog.json index c70ebc4720..6fb4e78567 100644 --- a/packages/client/public/locales/en/CreateEditRoomDialog.json +++ b/packages/client/public/locales/en/CreateEditRoomDialog.json @@ -11,7 +11,6 @@ "MakeRoomPrivateTitle": "Make the Room Private", "PeopleSelectorInfo": "Only a room admin or a {{productName}} admin can become the owner of the room", "PublicRoomBarDescription": "This room is available to anyone with the link. External users will have View Only permission for all the files.", - "VirtualDataRoomDescription": "Use VDR for advanced file security and transparency while filling and signing documents step-by-step. Set watermarks, automatically index and track all content, restrict downloading and copying.", "PublicRoomSystemFoldersDescription": "System folders store copies of forms at different stages of completion. Forms that are being filled are stored in the In progress folder, and completed forms are stored in the Complete folder.", "PublicRoomSystemFoldersTitle": "System Folders", "RoomEditing": "Room editing", @@ -34,5 +33,4 @@ "AddWatermarksToDocuments": "Add watermarks to documents", "AddWatermarksToDocumentsDescription": "Protect all documents in this room with watermarks. If a document already contains one, it will not be replaced.", "FilesOlderThan": "Files older than:" - "ThirdPartyStorageRoomAdminNoStorageAlert": "To connect a third-party storage, you need to add the corresponding service in the Integration section of DocSpace settings. Contact DocSpace owner or administrator to enable the integration." } diff --git a/packages/client/src/components/dialogs/CreateEditRoomDialog/data/index.js b/packages/client/src/components/dialogs/CreateEditRoomDialog/data/index.js index 7f1b85b6ad..02b1bfa630 100644 --- a/packages/client/src/components/dialogs/CreateEditRoomDialog/data/index.js +++ b/packages/client/src/components/dialogs/CreateEditRoomDialog/data/index.js @@ -26,27 +26,6 @@ import { RoomsType } from "@docspace/shared/enums"; -export const getRoomTypeDescriptionTranslation = (roomType = 1, t) => { - switch (roomType) { - case RoomsType.FillingFormsRoom: - return t("CreateEditRoomDialog:FillingFormsRoomDescription"); - case RoomsType.EditingRoom: - return t("CreateEditRoomDialog:CollaborationRoomDescription"); - case RoomsType.ReviewRoom: - return t("CreateEditRoomDialog:ReviewRoomDescription"); - case RoomsType.ReadOnlyRoom: - return t("CreateEditRoomDialog:ViewOnlyRoomDescription"); - case RoomsType.CustomRoom: - return t("CreateEditRoomDialog:CustomRoomDescription"); - case RoomsType.PublicRoom: - return t("CreateEditRoomDialog:PublicRoomDescription"); - case RoomsType.VirtualDataRoom: - return t("CreateEditRoomDialog:VirtualDataRoomDescription"); - case RoomsType.FormRoom: - return t("CreateEditRoomDialog:FormFilingRoomDescription"); - } -}; - export const getRoomTypeDefaultTagTranslation = (roomType = 1, t) => { switch (roomType) { case RoomsType.FillingFormsRoom: @@ -62,7 +41,7 @@ export const getRoomTypeDefaultTagTranslation = (roomType = 1, t) => { case RoomsType.PublicRoom: return t("Common:PublicRoom"); case RoomsType.VirtualDataRoom: - return t("Files:VirtualDataRoom"); + return t("Common:VirtualDataRoom"); case RoomsType.FormRoom: return t("Common:FormRoom"); } diff --git a/packages/client/src/helpers/filesUtils.js b/packages/client/src/helpers/filesUtils.js index 9a192b1d2e..44f256ebaa 100644 --- a/packages/client/src/helpers/filesUtils.js +++ b/packages/client/src/helpers/filesUtils.js @@ -88,7 +88,7 @@ export const getDefaultRoomName = (room, t) => { return t("Common:PublicRoom"); case RoomsType.VirtualDataRoom: - return t("Files:VirtualDataRoom"); + return t("Common:VirtualDataRoom"); case RoomsType.FormRoom: return t("Common:FormRoom"); } diff --git a/packages/client/src/pages/Home/Section/Filter/index.js b/packages/client/src/pages/Home/Section/Filter/index.js index 907cd525b1..2146661f66 100644 --- a/packages/client/src/pages/Home/Section/Filter/index.js +++ b/packages/client/src/pages/Home/Section/Filter/index.js @@ -1624,7 +1624,7 @@ const SectionFilterContent = ({ id: "filter_type-virtual-data", key: RoomsType.VirtualDataRoom, group: FilterGroups.roomFilterType, - label: t("VirtualDataRoom"), + label: t("Common:VirtualDataRoom"), }; case RoomsType.CustomRoom: default: diff --git a/packages/shared/components/room-type/RoomType.utils.ts b/packages/shared/components/room-type/RoomType.utils.ts index f61150a171..bb0d3e6c4b 100644 --- a/packages/shared/components/room-type/RoomType.utils.ts +++ b/packages/shared/components/room-type/RoomType.utils.ts @@ -19,7 +19,7 @@ export const getRoomTypeTitleTranslation = ( case RoomsType.PublicRoom: return t("Common:PublicRoom"); case RoomsType.VirtualDataRoom: - return t("Files:VirtualDataRoom"); + return t("Common:VirtualDataRoom"); case RoomsType.FormRoom: return t("Common:FormFilingRoomTitle"); default: @@ -44,6 +44,8 @@ export const getRoomTypeDescriptionTranslation = ( return t("Common:CustomRoomDescription"); case RoomsType.PublicRoom: return t("Common:PublicRoomDescription"); + case RoomsType.VirtualDataRoom: + return t("Common:VirtualDataRoomDescription"); case RoomsType.FormRoom: return t("Common:FormFilingRoomDescription"); default: diff --git a/public/locales/en/Common.json b/public/locales/en/Common.json index ff6e8dc4d2..71ac303e79 100644 --- a/public/locales/en/Common.json +++ b/public/locales/en/Common.json @@ -486,5 +486,7 @@ "OverwriteDescription": "The new file will replace the existing one as a new version.", "OverwriteTitle": "Overwrite with version update", "SkipDescription": "No file will be copied. The original file will be retained in the destination folder.", - "SkipTitle": "Skip" + "SkipTitle": "Skip", + "VirtualDataRoom": "Virtual Data Room", + "VirtualDataRoomDescription": "Use VDR for advanced file security and transparency while filling and signing documents step-by-step. Set watermarks, automatically index and track all content, restrict downloading and copying." }