From 0b87ee61f8f39b2a4d539b102cb971a313adff80 Mon Sep 17 00:00:00 2001 From: Elyor Djalilov Date: Fri, 2 Aug 2024 15:35:28 +0500 Subject: [PATCH 01/16] Web: Client: Profile: File management. added toggler for display file extension --- .../public/locales/en/FilesSettings.json | 1 + .../sub-components/file-management/index.js | 23 +++++++++++++++++++ .../client/src/store/FilesSettingsStore.js | 6 +++++ 3 files changed, 30 insertions(+) diff --git a/packages/client/public/locales/en/FilesSettings.json b/packages/client/public/locales/en/FilesSettings.json index 2eceec68b1..6505b3071a 100644 --- a/packages/client/public/locales/en/FilesSettings.json +++ b/packages/client/public/locales/en/FilesSettings.json @@ -4,6 +4,7 @@ "DisplayNotification": "Display notification when moving items to Trash", "DisplayRecent": "Display Recent", "DisplayTemplates": "Display Templates", + "DisplayFileExtension": "Display file extension next to file name", "IntermediateVersion": "Keep all saved intermediate versions", "KeepIntermediateVersion": "Keep intermediate versions when editing", "OpenSameTab": "Open {{organizationName}} editor in same tab", 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 e96aac596a..4362dd906e 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,6 +64,9 @@ const FileManagement = ({ openEditorInSameTab, setOpenEditorInSameTab, + + displayFileExtension, + setDisplayFileExtension, }) => { const { t, ready } = useTranslation(["FilesSettings", "Common"]); @@ -90,6 +93,10 @@ const FileManagement = ({ setKeepNewFileName(!keepNewFileName); }, [setKeepNewFileName, keepNewFileName]); + const onChangeDisplayFileExtension = React.useCallback(() => { + setDisplayFileExtension(!displayFileExtension); + }, [setDisplayFileExtension, displayFileExtension]); + const onChangeOpenEditorInSameTab = React.useCallback(() => { setOpenEditorInSameTab(!openEditorInSameTab); }, [setOpenEditorInSameTab, openEditorInSameTab]); @@ -174,6 +181,16 @@ const FileManagement = ({ )} + {!isVisitor && ( +
+ + {t("DisplayFileExtension")} +
+ )} {/* @@ -256,6 +273,9 @@ export default inject(({ userStore, filesSettingsStore, treeFoldersStore }) => { openEditorInSameTab, setOpenEditorInSameTab, + + displayFileExtension, + setDisplayFileExtension, } = filesSettingsStore; const { myFolderId, commonFolderId } = treeFoldersStore; @@ -290,5 +310,8 @@ export default inject(({ userStore, filesSettingsStore, treeFoldersStore }) => { openEditorInSameTab, setOpenEditorInSameTab, + + displayFileExtension, + setDisplayFileExtension, }; })(observer(FileManagement)); diff --git a/packages/client/src/store/FilesSettingsStore.js b/packages/client/src/store/FilesSettingsStore.js index f13fb75904..c94e99d200 100644 --- a/packages/client/src/store/FilesSettingsStore.js +++ b/packages/client/src/store/FilesSettingsStore.js @@ -71,6 +71,7 @@ class FilesSettingsStore { chunkUploadSize = 1024 * 1023; // 1024 * 1023; //~0.999mb maxUploadThreadCount = 15; maxUploadFilesCount = 5; + displayFileExtension = null; settingsIsLoaded = false; @@ -214,6 +215,11 @@ class FilesSettingsStore { .then((res) => this.setFilesSetting("keepNewFileName", res)); }; + setDisplayFileExtension = (data) => { + this.setFilesSetting("displayFileExtension", data ? true : false); + console.log("need backend"); + }; + setOpenEditorInSameTab = (data) => { api.files .changeOpenEditorInSameTab(data) From 23f4c31993c1c79e2bec6e084e899ccd996009e4 Mon Sep 17 00:00:00 2001 From: Elyor Djalilov Date: Fri, 2 Aug 2024 19:36:13 +0500 Subject: [PATCH 02/16] Web: Shared: API: added enableDisplayFileExtension --- packages/client/src/store/FilesSettingsStore.js | 5 +++-- packages/shared/api/files/index.ts | 11 +++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/packages/client/src/store/FilesSettingsStore.js b/packages/client/src/store/FilesSettingsStore.js index c94e99d200..2490902092 100644 --- a/packages/client/src/store/FilesSettingsStore.js +++ b/packages/client/src/store/FilesSettingsStore.js @@ -216,8 +216,9 @@ class FilesSettingsStore { }; setDisplayFileExtension = (data) => { - this.setFilesSetting("displayFileExtension", data ? true : false); - console.log("need backend"); + api.files + .enableDisplayFileExtension(data) + .then((res) => this.setFilesSetting("displayFileExtension", res)); }; setOpenEditorInSameTab = (data) => { diff --git a/packages/shared/api/files/index.ts b/packages/shared/api/files/index.ts index 0b47a253ca..55b2c1b9ce 100644 --- a/packages/shared/api/files/index.ts +++ b/packages/shared/api/files/index.ts @@ -931,6 +931,17 @@ export async function changeKeepNewFileName(val: boolean) { return res; } +export async function enableDisplayFileExtension(val: boolean) { + const data = { set: val }; + const res = (await request({ + method: "put", + url: "files/displayfileextension", + data, + })) as boolean; + + return res; +} + export async function changeOpenEditorInSameTab(val: boolean) { const data = { set: val }; const res = (await request({ From 4681d18d284f1857e3c40439268dd0fb7da24d03 Mon Sep 17 00:00:00 2001 From: Elyor Djalilov Date: Tue, 6 Aug 2024 11:08:36 +0500 Subject: [PATCH 03/16] Web: Client: Home: Section: added file extension --- packages/client/src/HOCs/withContent.js | 3 +++ .../src/pages/Home/Section/Body/TableView/StyledTable.js | 4 ++++ .../Section/Body/TableView/sub-components/FileNameCell.js | 6 +++++- .../pages/Home/Section/Body/TilesView/FilesTileContent.js | 8 ++++++++ packages/shared/themes/base.ts | 1 + packages/shared/themes/dark.ts | 1 + 6 files changed, 22 insertions(+), 1 deletion(-) diff --git a/packages/client/src/HOCs/withContent.js b/packages/client/src/HOCs/withContent.js index 46fd55b691..9259893c31 100644 --- a/packages/client/src/HOCs/withContent.js +++ b/packages/client/src/HOCs/withContent.js @@ -151,6 +151,7 @@ export default function withContent(WrappedContent) { uploadDataStore, publicRoomStore, userStore, + filesSettingsStore, }, { item }, ) => { @@ -170,6 +171,7 @@ export default function withContent(WrappedContent) { } = filesStore; const { isPublicRoom, publicRoomKey } = publicRoomStore; + const { displayFileExtension } = filesSettingsStore; const { clearActiveOperations, fileCopyAs } = uploadDataStore; const { isRecycleBinFolder, isPrivacyFolder, isArchiveFolder } = @@ -218,6 +220,7 @@ export default function withContent(WrappedContent) { setCreatedItem, isPublicRoom, publicRoomKey, + displayFileExtension, }; }, )(observer(WithContent)); diff --git a/packages/client/src/pages/Home/Section/Body/TableView/StyledTable.js b/packages/client/src/pages/Home/Section/Body/TableView/StyledTable.js index e1d424da6b..b1e5a8a0f0 100644 --- a/packages/client/src/pages/Home/Section/Body/TableView/StyledTable.js +++ b/packages/client/src/pages/Home/Section/Body/TableView/StyledTable.js @@ -203,6 +203,10 @@ const StyledTableRow = styled(TableRow)` padding-inline: 0 8px; } + .item-file-exst { + color: ${(props) => props.theme.filesSection.tableView.fileExstColor}; + } + ${(props) => props.isHighlight && css` diff --git a/packages/client/src/pages/Home/Section/Body/TableView/sub-components/FileNameCell.js b/packages/client/src/pages/Home/Section/Body/TableView/sub-components/FileNameCell.js index d06ef91e2f..66d9fcb2f1 100644 --- a/packages/client/src/pages/Home/Section/Body/TableView/sub-components/FileNameCell.js +++ b/packages/client/src/pages/Home/Section/Body/TableView/sub-components/FileNameCell.js @@ -40,8 +40,9 @@ const FileNameCell = ({ theme, t, inProgress, + displayFileExtension, }) => { - const { title, viewAccessibility } = item; + const { title, viewAccessibility, fileExst } = item; const onChange = (e) => { onContentSelect && onContentSelect(e.target.checked, item); @@ -87,6 +88,9 @@ const FileNameCell = ({ dir="auto" > {titleWithoutExt} + {displayFileExtension && ( + {fileExst} + )} ); diff --git a/packages/client/src/pages/Home/Section/Body/TilesView/FilesTileContent.js b/packages/client/src/pages/Home/Section/Body/TilesView/FilesTileContent.js index 8c61397e51..c542b569ba 100644 --- a/packages/client/src/pages/Home/Section/Body/TilesView/FilesTileContent.js +++ b/packages/client/src/pages/Home/Section/Body/TilesView/FilesTileContent.js @@ -92,6 +92,10 @@ const SimpleFilesTileContent = styled(TileContent)` -webkit-box-orient: vertical; } + .item-file-exst { + color: ${(props) => props.theme.filesSection.tableView.fileExstColor}; + } + ${({ isRooms }) => isRooms && css` @@ -117,6 +121,7 @@ const FilesTileContent = ({ theme, isRooms, currentDeviceType, + displayFileExtension, }) => { const { fileExst, title, viewAccessibility } = item; @@ -142,6 +147,9 @@ const FilesTileContent = ({ isTextOverflow > {titleWithoutExt} + {displayFileExtension && ( + {fileExst} + )} diff --git a/packages/shared/themes/base.ts b/packages/shared/themes/base.ts index 1f8f3105b3..1c5a763ba3 100644 --- a/packages/shared/themes/base.ts +++ b/packages/shared/themes/base.ts @@ -2292,6 +2292,7 @@ export const getBaseTheme = () => { linkColor: black, textColor: gray, }, + fileExstColor: "#a3a9ae", row: { checkboxChecked: `linear-gradient(to right, #f3f4f4 24px, ${grayLightMid} 24px)`, diff --git a/packages/shared/themes/dark.ts b/packages/shared/themes/dark.ts index b60d6f0123..fabb4440bb 100644 --- a/packages/shared/themes/dark.ts +++ b/packages/shared/themes/dark.ts @@ -2264,6 +2264,7 @@ const Dark: TTheme = { linkColor: grayMaxLight, textColor: "#858585", }, + fileExstColor: "#a3a9ae", row: { checkboxChecked: `linear-gradient(to right, ${black} 24px, #474747 24px)`, From 2bc02522a57b50a815a56f059641e031a2fae901 Mon Sep 17 00:00:00 2001 From: Elyor Djalilov Date: Fri, 9 Aug 2024 16:31:57 +0500 Subject: [PATCH 04/16] Web: Client: Home: Section: added file extension for row view and fix tile view --- .../Section/Body/RowsView/FilesRowContent.js | 54 ++++++++++++++----- .../Section/Body/TableView/StyledTable.js | 6 ++- .../Home/Section/Body/TableView/TableRow.js | 2 + .../TableView/sub-components/FileNameCell.js | 15 ++++-- .../Body/TilesView/FilesTileContent.js | 26 +++++---- 5 files changed, 75 insertions(+), 28 deletions(-) diff --git a/packages/client/src/pages/Home/Section/Body/RowsView/FilesRowContent.js b/packages/client/src/pages/Home/Section/Body/RowsView/FilesRowContent.js index d543b9b381..52e890ad59 100644 --- a/packages/client/src/pages/Home/Section/Body/RowsView/FilesRowContent.js +++ b/packages/client/src/pages/Home/Section/Body/RowsView/FilesRowContent.js @@ -64,6 +64,10 @@ const SimpleFilesRowContent = styled(RowContent)` } } + .rowMainContainer { + margin-inline-end: ${(props) => props.displayFileExtension && "0px"}; + } + .row_update-text { overflow: hidden; text-overflow: ellipsis; @@ -91,7 +95,7 @@ const SimpleFilesRowContent = styled(RowContent)` .row-content-link { padding-block: 12px 0; - padding-inline: 0 12px; + padding-inline: ${(props) => !props.displayFileExtension && "0px 12px"}; margin-top: ${(props) => props.theme.interfaceDirection === "rtl" ? "-14px" : "-12px"}; } @@ -99,12 +103,17 @@ const SimpleFilesRowContent = styled(RowContent)` @media ${tablet} { .row-main-container-wrapper { display: flex; - justify-content: space-between; + align-items: center; max-width: inherit; } + .mainIcons { + margin-bottom: ${(props) => props.displayFileExtension && "4px"}; + } + .badges { flex-direction: row-reverse; + padding-inline: ${(props) => props.displayFileExtension && "0px 12px"}; } .tablet-badge { @@ -143,6 +152,10 @@ const SimpleFilesRowContent = styled(RowContent)` margin: 0; } + .mainIcons { + margin-bottom: ${(props) => props.displayFileExtension && "0px"}; + } + .can-convert { margin: 0 1px; } @@ -173,6 +186,7 @@ const FilesRowContent = ({ isDefaultRoomsQuotaSet, isStatisticsAvailable, showStorageInfo, + displayFileExtension, }) => { const { contentLength, @@ -232,20 +246,21 @@ const FilesRowContent = ({ } }; - const additionalComponent = () => { - if (isRooms) return getRoomTypeName(item.roomType, t); + // const additionalComponent = () => { + // if (isRooms) return getRoomTypeName(item.roomType, t); - if (!fileExst && !contentLength && !providerKey) - return `${foldersCount} ${t("Translations:Folders")} | ${filesCount} ${t( - "Translations:Files", - )}`; + // if (!fileExst && !contentLength && !providerKey) + // return `${foldersCount} ${t("Translations:Folders")} | ${filesCount} ${t( + // "Translations:Files", + // )}`; - if (fileExst) return `${fileExst.toUpperCase().replace(/^\./, "")}`; + // if (fileExst) return `${fileExst.toUpperCase().replace(/^\./, "")}`; - return ""; - }; + // return ""; + // }; + + // const additionalInfo = additionalComponent(); - const additionalInfo = additionalComponent(); const mainInfo = contentComponent(); return ( @@ -255,6 +270,7 @@ const FilesRowContent = ({ isMobile={!isTablet()} isFile={fileExst || contentLength} sideColor={theme.filesSection.rowView.sideColor} + displayFileExtension={displayFileExtension} > {badgesComponent} {!isRoom && !isRooms && quickButtons} + {displayFileExtension && ( + + {fileExst} + + )} {mainInfo && ( @@ -287,7 +313,7 @@ const FilesRowContent = ({ )} - {additionalInfo && ( + {/* {additionalInfo && ( {additionalInfo} - )} + )} */} ); diff --git a/packages/client/src/pages/Home/Section/Body/TableView/StyledTable.js b/packages/client/src/pages/Home/Section/Body/TableView/StyledTable.js index bf06ea6306..f1d918d43a 100644 --- a/packages/client/src/pages/Home/Section/Body/TableView/StyledTable.js +++ b/packages/client/src/pages/Home/Section/Body/TableView/StyledTable.js @@ -204,11 +204,13 @@ const StyledTableRow = styled(TableRow)` .item-file-name { padding-block: 14px; - padding-inline: 0 8px; + padding-inline: ${(props) => + props.displayFileExtension ? "0px" : "0 8px"}; } .item-file-exst { - color: ${(props) => props.theme.filesSection.tableView.fileExstColor}; + padding-inline: 0 8px; + margin-bottom: 1px; } ${(props) => diff --git a/packages/client/src/pages/Home/Section/Body/TableView/TableRow.js b/packages/client/src/pages/Home/Section/Body/TableView/TableRow.js index 0b00b54524..4798a552db 100644 --- a/packages/client/src/pages/Home/Section/Body/TableView/TableRow.js +++ b/packages/client/src/pages/Home/Section/Body/TableView/TableRow.js @@ -72,6 +72,7 @@ const FilesTableRow = (props) => { badgeUrl, isRecentTab, canDrag, + displayFileExtension, } = props; const { acceptBackground, background } = theme.dragAndDrop; @@ -174,6 +175,7 @@ const FilesTableRow = (props) => { contextOptions={item.contextOptions} getContextModel={getContextModel} showHotkeyBorder={showHotkeyBorder} + displayFileExtension={displayFileExtension} title={ item.isFolder ? t("Translations:TitleShowFolderActions") diff --git a/packages/client/src/pages/Home/Section/Body/TableView/sub-components/FileNameCell.js b/packages/client/src/pages/Home/Section/Body/TableView/sub-components/FileNameCell.js index 66d9fcb2f1..c4dd49fe25 100644 --- a/packages/client/src/pages/Home/Section/Body/TableView/sub-components/FileNameCell.js +++ b/packages/client/src/pages/Home/Section/Body/TableView/sub-components/FileNameCell.js @@ -26,6 +26,7 @@ import React from "react"; import { Link } from "@docspace/shared/components/link"; +import { Text } from "@docspace/shared/components/text"; import { Checkbox } from "@docspace/shared/components/checkbox"; import { TableCell } from "@docspace/shared/components/table"; import { Loader } from "@docspace/shared/components/loader"; @@ -88,10 +89,18 @@ const FileNameCell = ({ dir="auto" > {titleWithoutExt} - {displayFileExtension && ( - {fileExst} - )} + + {displayFileExtension && ( + + {fileExst} + + )} ); }; diff --git a/packages/client/src/pages/Home/Section/Body/TilesView/FilesTileContent.js b/packages/client/src/pages/Home/Section/Body/TilesView/FilesTileContent.js index c542b569ba..f5ff0ca001 100644 --- a/packages/client/src/pages/Home/Section/Body/TilesView/FilesTileContent.js +++ b/packages/client/src/pages/Home/Section/Body/TilesView/FilesTileContent.js @@ -30,6 +30,7 @@ import { withTranslation } from "react-i18next"; import styled, { css } from "styled-components"; import { Link } from "@docspace/shared/components/link"; +import { Text } from "@docspace/shared/components/text"; import TileContent from "./sub-components/TileContent"; import withContent from "../../../../../HOCs/withContent"; @@ -42,7 +43,8 @@ const SimpleFilesTileContent = styled(TileContent)` .row-main-container { height: auto; max-width: 100%; - align-self: flex-end; + display: flex; + align-items: flex-end; } .main-icons { @@ -84,16 +86,15 @@ const SimpleFilesTileContent = styled(TileContent)` .item-file-name { max-height: 100%; line-height: 20px; - + max-width: 100px; overflow: hidden; text-overflow: ellipsis; - -webkit-line-clamp: 2; - display: -webkit-box; - -webkit-box-orient: vertical; + white-space: nowrap; + display: block; } .item-file-exst { - color: ${(props) => props.theme.filesSection.tableView.fileExstColor}; + margin-bottom: 1px; } ${({ isRooms }) => @@ -147,10 +148,17 @@ const FilesTileContent = ({ isTextOverflow > {titleWithoutExt} - {displayFileExtension && ( - {fileExst} - )} + {displayFileExtension && ( + + {fileExst} + + )} ); From 02eb12b3451cf75210240823e6722190d097fb84 Mon Sep 17 00:00:00 2001 From: Elyor Djalilov Date: Wed, 21 Aug 2024 21:16:34 +0500 Subject: [PATCH 05/16] Web: Client: Section: Body. fix display file extension --- .../Section/Body/RowsView/FilesRowContent.js | 35 +++++-------------- .../Section/Body/TableView/StyledTable.js | 6 ++-- .../TableView/sub-components/FileNameCell.js | 14 ++------ .../Body/TilesView/FilesTileContent.js | 22 +++++------- 4 files changed, 22 insertions(+), 55 deletions(-) diff --git a/packages/client/src/pages/Home/Section/Body/RowsView/FilesRowContent.js b/packages/client/src/pages/Home/Section/Body/RowsView/FilesRowContent.js index 52e890ad59..c06171f0ca 100644 --- a/packages/client/src/pages/Home/Section/Body/RowsView/FilesRowContent.js +++ b/packages/client/src/pages/Home/Section/Body/RowsView/FilesRowContent.js @@ -64,10 +64,6 @@ const SimpleFilesRowContent = styled(RowContent)` } } - .rowMainContainer { - margin-inline-end: ${(props) => props.displayFileExtension && "0px"}; - } - .row_update-text { overflow: hidden; text-overflow: ellipsis; @@ -95,25 +91,24 @@ const SimpleFilesRowContent = styled(RowContent)` .row-content-link { padding-block: 12px 0; - padding-inline: ${(props) => !props.displayFileExtension && "0px 12px"}; + padding-inline: 0 12px; margin-top: ${(props) => props.theme.interfaceDirection === "rtl" ? "-14px" : "-12px"}; } + .item-file-exst { + color: ${(props) => props.theme.filesSection.tableView.fileExstColor}; + } + @media ${tablet} { .row-main-container-wrapper { display: flex; - align-items: center; + justify-content: space-between; max-width: inherit; } - .mainIcons { - margin-bottom: ${(props) => props.displayFileExtension && "4px"}; - } - .badges { flex-direction: row-reverse; - padding-inline: ${(props) => props.displayFileExtension && "0px 12px"}; } .tablet-badge { @@ -152,10 +147,6 @@ const SimpleFilesRowContent = styled(RowContent)` margin: 0; } - .mainIcons { - margin-bottom: ${(props) => props.displayFileExtension && "0px"}; - } - .can-convert { margin: 0 1px; } @@ -270,7 +261,6 @@ const FilesRowContent = ({ isMobile={!isTablet()} isFile={fileExst || contentLength} sideColor={theme.filesSection.rowView.sideColor} - displayFileExtension={displayFileExtension} > {titleWithoutExt} + {displayFileExtension && ( + {fileExst} + )}
{badgesComponent} {!isRoom && !isRooms && quickButtons} - {displayFileExtension && ( - - {fileExst} - - )}
{mainInfo && ( diff --git a/packages/client/src/pages/Home/Section/Body/TableView/StyledTable.js b/packages/client/src/pages/Home/Section/Body/TableView/StyledTable.js index e16871417f..0f633034e5 100644 --- a/packages/client/src/pages/Home/Section/Body/TableView/StyledTable.js +++ b/packages/client/src/pages/Home/Section/Body/TableView/StyledTable.js @@ -202,13 +202,11 @@ const StyledTableRow = styled(TableRow)` .item-file-name { padding-block: 14px; - padding-inline: ${(props) => - props.displayFileExtension ? "0px" : "0 8px"}; + padding-inline: 0 8px; } .item-file-exst { - padding-inline: 0 8px; - margin-bottom: 1px; + color: ${(props) => props.theme.filesSection.tableView.fileExstColor}; } ${(props) => diff --git a/packages/client/src/pages/Home/Section/Body/TableView/sub-components/FileNameCell.js b/packages/client/src/pages/Home/Section/Body/TableView/sub-components/FileNameCell.js index c4dd49fe25..fdacbd2ca0 100644 --- a/packages/client/src/pages/Home/Section/Body/TableView/sub-components/FileNameCell.js +++ b/packages/client/src/pages/Home/Section/Body/TableView/sub-components/FileNameCell.js @@ -89,18 +89,10 @@ const FileNameCell = ({ dir="auto" > {titleWithoutExt} + {displayFileExtension && ( + {fileExst} + )} - - {displayFileExtension && ( - - {fileExst} - - )} ); }; diff --git a/packages/client/src/pages/Home/Section/Body/TilesView/FilesTileContent.js b/packages/client/src/pages/Home/Section/Body/TilesView/FilesTileContent.js index f5ff0ca001..7ff82134ee 100644 --- a/packages/client/src/pages/Home/Section/Body/TilesView/FilesTileContent.js +++ b/packages/client/src/pages/Home/Section/Body/TilesView/FilesTileContent.js @@ -86,15 +86,16 @@ const SimpleFilesTileContent = styled(TileContent)` .item-file-name { max-height: 100%; line-height: 20px; - max-width: 100px; + overflow: hidden; text-overflow: ellipsis; - white-space: nowrap; - display: block; + -webkit-line-clamp: 2; + display: -webkit-box; + -webkit-box-orient: vertical; } .item-file-exst { - margin-bottom: 1px; + color: ${(props) => props.theme.filesSection.tableView.fileExstColor}; } ${({ isRooms }) => @@ -148,17 +149,10 @@ const FilesTileContent = ({ isTextOverflow > {titleWithoutExt} + {displayFileExtension && ( + {fileExst} + )} - {displayFileExtension && ( - - {fileExst} - - )} ); From 14e762581efb5c7247688b4bde8692f107ac6fd8 Mon Sep 17 00:00:00 2001 From: Aleksandr Lushkin Date: Wed, 28 Aug 2024 12:59:48 +0200 Subject: [PATCH 06/16] Client: Shared: Fix filename with extension in RTL --- .../src/pages/Home/Section/Body/TilesView/FilesTileContent.js | 2 ++ packages/shared/components/text/Text.styled.ts | 2 ++ 2 files changed, 4 insertions(+) diff --git a/packages/client/src/pages/Home/Section/Body/TilesView/FilesTileContent.js b/packages/client/src/pages/Home/Section/Body/TilesView/FilesTileContent.js index 7ff82134ee..ecb5b7a27f 100644 --- a/packages/client/src/pages/Home/Section/Body/TilesView/FilesTileContent.js +++ b/packages/client/src/pages/Home/Section/Body/TilesView/FilesTileContent.js @@ -92,6 +92,7 @@ const SimpleFilesTileContent = styled(TileContent)` -webkit-line-clamp: 2; display: -webkit-box; -webkit-box-orient: vertical; + text-align: start; } .item-file-exst { @@ -147,6 +148,7 @@ const FilesTileContent = ({ {...linkStyles} color={theme.filesSection.tilesView.color} isTextOverflow + dir="auto" > {titleWithoutExt} {displayFileExtension && ( diff --git a/packages/shared/components/text/Text.styled.ts b/packages/shared/components/text/Text.styled.ts index 428dd39778..467f53a720 100644 --- a/packages/shared/components/text/Text.styled.ts +++ b/packages/shared/components/text/Text.styled.ts @@ -85,6 +85,8 @@ export const StyledAutoDirSpan = styled.span` pointer-events: none; width: inherit; max-width: inherit; + -webkit-line-clamp: inherit; + -webkit-box-orient: inherit; `; export default StyledText; From 862b342d1ff4624c0b848cddd6214317d0cd91e5 Mon Sep 17 00:00:00 2001 From: Aleksandr Lushkin Date: Wed, 28 Aug 2024 13:20:41 +0200 Subject: [PATCH 07/16] Client: FilesSettingsStore: Add error handling to setDisplayFileExtension --- packages/client/src/store/FilesSettingsStore.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/client/src/store/FilesSettingsStore.js b/packages/client/src/store/FilesSettingsStore.js index 2490902092..051f3b3e46 100644 --- a/packages/client/src/store/FilesSettingsStore.js +++ b/packages/client/src/store/FilesSettingsStore.js @@ -44,6 +44,8 @@ import { getIconPathByFolderType, isPublicPreview, } from "@docspace/shared/utils/common"; +import { toastr } from "@docspace/shared/components/toast"; + class FilesSettingsStore { thirdPartyStore; treeFoldersStore; @@ -218,7 +220,8 @@ class FilesSettingsStore { setDisplayFileExtension = (data) => { api.files .enableDisplayFileExtension(data) - .then((res) => this.setFilesSetting("displayFileExtension", res)); + .then((res) => this.setFilesSetting("displayFileExtension", res)) + .catch((e) => toastr.error(e)); }; setOpenEditorInSameTab = (data) => { From b8110914c3ef74c83b1d69fd3f5cc22d9a6bd343 Mon Sep 17 00:00:00 2001 From: Aleksandr Lushkin Date: Wed, 28 Aug 2024 14:10:18 +0200 Subject: [PATCH 08/16] Client: InfoPanel: ItemTitle: Display file extension depending on settings. Fix truncation --- .../Home/InfoPanel/Body/styles/common.js | 9 ++++++++ .../sub-components/ItemTitle/Rooms/index.js | 23 ++++++++++++++++--- 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/packages/client/src/pages/Home/InfoPanel/Body/styles/common.js b/packages/client/src/pages/Home/InfoPanel/Body/styles/common.js index 099337881c..25d5ed069c 100644 --- a/packages/client/src/pages/Home/InfoPanel/Body/styles/common.js +++ b/packages/client/src/pages/Home/InfoPanel/Body/styles/common.js @@ -110,8 +110,17 @@ const StyledTitle = styled.div` line-height: 22px; max-height: 44px; margin: 0 8px; + overflow: hidden; text-overflow: ellipsis; + -webkit-line-clamp: 2; + display: -webkit-box; + -webkit-box-orient: vertical; + text-align: start; + } + + .file-extension { + color: ${(props) => props.theme.filesSection.tableView.fileExstColor}; } .free-label { diff --git a/packages/client/src/pages/Home/InfoPanel/Body/sub-components/ItemTitle/Rooms/index.js b/packages/client/src/pages/Home/InfoPanel/Body/sub-components/ItemTitle/Rooms/index.js index 8731e1039b..fbba512aeb 100644 --- a/packages/client/src/pages/Home/InfoPanel/Body/sub-components/ItemTitle/Rooms/index.js +++ b/packages/client/src/pages/Home/InfoPanel/Body/sub-components/ItemTitle/Rooms/index.js @@ -27,6 +27,7 @@ import { useRef } from "react"; import { withTranslation } from "react-i18next"; +import { getTitleWithoutExtension } from "@docspace/shared/utils"; import { Text } from "@docspace/shared/components/text"; import { inject, observer } from "mobx-react"; import PersonPlusReactSvgUrl from "PUBLIC_DIR/images/person+.react.svg?url"; @@ -56,6 +57,7 @@ const RoomsItemHeader = ({ showSearchBlock, setShowSearchBlock, roomType, + displayFileExtension, }) => { const itemTitleRef = useRef(); @@ -75,6 +77,13 @@ const RoomsItemHeader = ({ const badgeUrl = showPlanetIcon ? Planet12ReactSvgUrl : null; const isRoomMembersPanel = selection?.isRoom && roomsView === "info_members"; + const isFile = !!selection.fileExst; + let title = selection.title; + + if (isFile) { + title = getTitleWithoutExtension(selection, false); + } + const onSelectItem = () => { setSelection([]); setBufferSelection(selection); @@ -107,7 +116,7 @@ const RoomsItemHeader = ({
- - {selection.title} + + {title} + {isFile && displayFileExtension && ( + {selection.fileExst} + )}
@@ -161,6 +173,7 @@ export default inject( selectedFolderStore, filesStore, infoPanelStore, + filesSettingsStore, }) => { const { infoPanelSelection, @@ -170,6 +183,8 @@ export default inject( setShowSearchBlock, } = infoPanelStore; + const { displayFileExtension } = filesSettingsStore; + const selection = infoPanelSelection.length > 1 ? null : infoPanelSelection; const isArchive = selection?.rootFolderType === FolderType.Archive; @@ -195,6 +210,8 @@ export default inject( isArchive, isShared: selection?.shared, roomType, + + displayFileExtension, }; }, )( From 72303ef08a181ffc4e2e78cf41effd9f16fd6c45 Mon Sep 17 00:00:00 2001 From: Elyor Djalilov Date: Thu, 29 Aug 2024 13:51:30 +0500 Subject: [PATCH 09/16] Web: Client: Data Import: fix styles --- .../categories/data-import/StyledDataImport.ts | 4 ++++ .../AccountsTable/RowView/index.tsx | 18 ++---------------- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/packages/client/src/pages/PortalSettings/categories/data-import/StyledDataImport.ts b/packages/client/src/pages/PortalSettings/categories/data-import/StyledDataImport.ts index 284b2ce0a0..b483bdeab0 100644 --- a/packages/client/src/pages/PortalSettings/categories/data-import/StyledDataImport.ts +++ b/packages/client/src/pages/PortalSettings/categories/data-import/StyledDataImport.ts @@ -77,6 +77,10 @@ export const WorkspacesContainer = styled.div` justify-content: space-between; cursor: pointer; + .link { + color: ${globalColors.lightBlueMain}; + } + &:hover { border-color: ${globalColors.lightBlueMain}; } diff --git a/packages/client/src/pages/PortalSettings/categories/data-import/components/SelectUsersStep/AccountsTable/RowView/index.tsx b/packages/client/src/pages/PortalSettings/categories/data-import/components/SelectUsersStep/AccountsTable/RowView/index.tsx index 1043b6150d..307f0fffd5 100644 --- a/packages/client/src/pages/PortalSettings/categories/data-import/components/SelectUsersStep/AccountsTable/RowView/index.tsx +++ b/packages/client/src/pages/PortalSettings/categories/data-import/components/SelectUsersStep/AccountsTable/RowView/index.tsx @@ -50,14 +50,7 @@ const StyledRowContainer = styled(RowContainer)` height: 61px; position: sticky; z-index: 201; - ${(props) => - props.theme.interfaceDirection === "rtl" - ? css` - margin-right: -16px; - ` - : css` - margin-left: -16px; - `} + margin-inline-end: -16px; width: 100%; margin-top: 20px; @@ -71,14 +64,7 @@ const StyledRowContainer = styled(RowContainer)` } .table-container_group-menu-checkbox { - ${(props) => - props.theme.interfaceDirection === "rtl" - ? css` - margin-right: 8px; - ` - : css` - margin-left: 8px; - `} + margin-inline-end: 8px; } .table-container_group-menu-separator { From 5be445082f935c445eeff66b1e43dbe1b613faf2 Mon Sep 17 00:00:00 2001 From: Maria-Sukhova Date: Thu, 29 Aug 2024 14:10:07 +0300 Subject: [PATCH 10/16] added translations --- i18next/client.babel | 132 +++++++++ i18next/common.babel | 264 ++++++++++++++++++ .../client/public/locales/de/Confirm.json | 3 +- packages/client/public/locales/de/Files.json | 1 + .../client/public/locales/de/MainBar.json | 1 + .../client/public/locales/es/Confirm.json | 3 +- packages/client/public/locales/es/Files.json | 1 + .../client/public/locales/fr/Confirm.json | 3 +- packages/client/public/locales/fr/Files.json | 1 + .../client/public/locales/hy-AM/Confirm.json | 3 +- .../client/public/locales/hy-AM/Files.json | 1 + .../client/public/locales/it/Confirm.json | 3 +- packages/client/public/locales/it/Files.json | 1 + .../client/public/locales/ja-JP/Confirm.json | 3 +- .../client/public/locales/ja-JP/Files.json | 1 + .../client/public/locales/pt-BR/Confirm.json | 3 +- .../client/public/locales/pt-BR/Files.json | 1 + .../client/public/locales/ro/Confirm.json | 3 +- packages/client/public/locales/ro/Files.json | 1 + .../client/public/locales/ru/Confirm.json | 3 +- packages/client/public/locales/ru/Files.json | 1 + .../client/public/locales/zh-CN/Confirm.json | 3 +- .../client/public/locales/zh-CN/Files.json | 1 + public/locales/ar-SA/Common.json | 1 + public/locales/az/Common.json | 1 + public/locales/bg/Common.json | 1 + public/locales/cs/Common.json | 1 + public/locales/de/Common.json | 3 + public/locales/el-GR/Common.json | 1 + public/locales/en/Common.json | 4 +- public/locales/es/Common.json | 3 + public/locales/fi/Common.json | 1 + public/locales/fr/Common.json | 3 + public/locales/hy-AM/Common.json | 3 + public/locales/it/Common.json | 3 + public/locales/ja-JP/Common.json | 3 + public/locales/ko-KR/Common.json | 1 + public/locales/lv/Common.json | 1 + public/locales/nl/Common.json | 1 + public/locales/pl/Common.json | 1 + public/locales/pt-BR/Common.json | 3 + public/locales/pt/Common.json | 1 + public/locales/ro/Common.json | 3 + public/locales/ru/Common.json | 3 + public/locales/sk/Common.json | 1 + public/locales/sl/Common.json | 1 + public/locales/sr-Cyrl-RS/Common.json | 1 + public/locales/sr-Latn-RS/Common.json | 1 + public/locales/tr/Common.json | 1 + public/locales/uk-UA/Common.json | 1 + public/locales/vi/Common.json | 1 + public/locales/zh-CN/Common.json | 3 + 52 files changed, 477 insertions(+), 12 deletions(-) diff --git a/i18next/client.babel b/i18next/client.babel index 60f7893cef..de2936f997 100644 --- a/i18next/client.babel +++ b/i18next/client.babel @@ -43326,6 +43326,138 @@ + + LastActivity + + + + + + 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 + + + LeaveRoomDescription diff --git a/i18next/common.babel b/i18next/common.babel index 392e59f5be..7649892003 100644 --- a/i18next/common.babel +++ b/i18next/common.babel @@ -32362,6 +32362,138 @@ + + LastActivityDate + + + + + + 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 + + + LastModifiedDate @@ -52426,6 +52558,138 @@ + + RoomSpaceQuotaExceeded + + + + + + 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 + + + SameEmail diff --git a/packages/client/public/locales/de/Confirm.json b/packages/client/public/locales/de/Confirm.json index be8761f888..f660208e36 100644 --- a/packages/client/public/locales/de/Confirm.json +++ b/packages/client/public/locales/de/Confirm.json @@ -30,5 +30,6 @@ "SignUp": "Anmelden", "SuccessDeactivate": "Ihr Konto wurde erfolgreich deaktiviert. In 10 Sekunden werden Sie auf die <1>Seite weitergeleitet.", "SuccessReactivate": "Ihr Konto wurde erfolgreich wieder aktiviert. In 10 Sekunden werden Sie zum <1>Portal weitergeleitet.", - "SuccessRemoved": "Ihr Konto wurde erfolgreich entfernt. In 10 Sekunden werden Sie auf die <1>Seite weitergeleitet." + "SuccessRemoved": "Ihr Konto wurde erfolgreich entfernt. In 10 Sekunden werden Sie auf die <1>Seite weitergeleitet.", + "TermsAndConditions": "Indem Sie fortfahren, bestätigen Sie, dass Sie unsere <1>Allgemeinen Geschäftsbedingungen und <2>Datenschutzerklärung verstanden haben und damit einverstanden sind." } diff --git a/packages/client/public/locales/de/Files.json b/packages/client/public/locales/de/Files.json index 51bd87f036..a73f55d754 100644 --- a/packages/client/public/locales/de/Files.json +++ b/packages/client/public/locales/de/Files.json @@ -84,6 +84,7 @@ "GoToPersonal": "Zu Dokumente", "Images": "Bilder", "InviteUsersInRoom": "Benutzer in den Raum einladen", + "LastActivity": "Letzte Aktivität", "LeaveRoomDescription": "Sie sind verantwortlich für diesen Raum. Sie müssen die Rolle des Verantwortlichen auf einen anderen Benutzer übertragen, bevor Sie den Raum verlassen.", "LeaveTheRoom": "Raum verlassen", "LeftAndAppointNewOwner": "Sie haben den Raum verlassen und einen neuen Verantwortlichen ernannt", diff --git a/packages/client/public/locales/de/MainBar.json b/packages/client/public/locales/de/MainBar.json index 97c8aff7c6..5520ee3d89 100644 --- a/packages/client/public/locales/de/MainBar.json +++ b/packages/client/public/locales/de/MainBar.json @@ -19,6 +19,7 @@ "StorageAndRoomLimitHeader": "Das Limit für Speicherplatz und Anzahl der Räume ist erreicht", "StorageAndUserHeader": "Limits für Speicherplatz und Admins/Power-User werden bald überschritten sein.", "StorageAndUserTariffLimitHeader": "Das Limit für Speicherplatz und Anzahl der Administratoren/Power-User ist erreicht", + "StorageLimitHeader": "Das Speicherplatzlimit ist erreicht: {{currentValue}} / {{maxValue}}", "StorageQuotaHeader": "Das Speicherplatzlimit wird bald überschritten: {{currentValue}} / {{maxValue}}", "TenantCustomQuotaDescription": "Sie können unnötige Dateien entfernen oder die Quote in den <1>Speicherverwaltungseinstellungen ändern", "UserQuotaHeader": "Die Anzahl der Admins/Power-User wird bald überschritten sein: {{currentValue}} / {{maxValue}}.", diff --git a/packages/client/public/locales/es/Confirm.json b/packages/client/public/locales/es/Confirm.json index 4ce9916f11..6e3fc7acca 100644 --- a/packages/client/public/locales/es/Confirm.json +++ b/packages/client/public/locales/es/Confirm.json @@ -30,5 +30,6 @@ "SignUp": "Registrarse", "SuccessDeactivate": "Su cuenta se ha desactivado correctamente. En 10 segundos será redirigido al <1>sitio.", "SuccessReactivate": "Su cuenta se ha reactivado correctamente. En 10 segundos será redirigido al <1>portal.", - "SuccessRemoved": "Su cuenta ha sido eliminada correctamente. En 10 segundos será redirigido a <1>site." + "SuccessRemoved": "Su cuenta ha sido eliminada correctamente. En 10 segundos será redirigido a <1>site.", + "TermsAndConditions": "Al continuar, usted entiende y acepta nuestros <1>Términos y condiciones y <2>Declaración de privacidad." } diff --git a/packages/client/public/locales/es/Files.json b/packages/client/public/locales/es/Files.json index 77dc35fd35..d16006aa48 100644 --- a/packages/client/public/locales/es/Files.json +++ b/packages/client/public/locales/es/Files.json @@ -84,6 +84,7 @@ "GoToPersonal": "Ir a Documentos", "Images": "Imágenes", "InviteUsersInRoom": "Invitar usuarios a la sala", + "LastActivity": "Última actividad", "LeaveRoomDescription": "Usted es el propietario de esta sala. Antes de salir de la sala, debe transferir el rol de propietario a otro usuario.", "LeaveTheRoom": "Salir de la sala", "LeftAndAppointNewOwner": "Ha salido de la sala y ha asignado un nuevo propietario", diff --git a/packages/client/public/locales/fr/Confirm.json b/packages/client/public/locales/fr/Confirm.json index dbbb70c183..d01e3ab60c 100644 --- a/packages/client/public/locales/fr/Confirm.json +++ b/packages/client/public/locales/fr/Confirm.json @@ -30,5 +30,6 @@ "SignUp": "S'inscrire", "SuccessDeactivate": "Votre compte a été désactivé avec succès. Dans 10 secondes, vous serez redirigé vers le <1>site.", "SuccessReactivate": "Votre compte a été réactivé avec succès. Dans 10 secondes, vous serez redirigé vers le <1>portail.", - "SuccessRemoved": "Votre compte a été supprimé avec succès. Dans 10 secondes, vous serez redirigé vers le <1>site." + "SuccessRemoved": "Votre compte a été supprimé avec succès. Dans 10 secondes, vous serez redirigé vers le <1>site.", + "TermsAndConditions": "En continuant, vous comprenez et acceptez nos <1>Termes et conditions et notre <2>Déclaration de confidentialité." } diff --git a/packages/client/public/locales/fr/Files.json b/packages/client/public/locales/fr/Files.json index 136c6aa8ca..153674eea0 100644 --- a/packages/client/public/locales/fr/Files.json +++ b/packages/client/public/locales/fr/Files.json @@ -84,6 +84,7 @@ "GoToPersonal": "Aller dans Documents", "Images": "Images", "InviteUsersInRoom": "Inviter des utilisateurs dans la salle", + "LastActivity": "Dernière activité", "LeaveRoomDescription": "Vous êtes le propriétaire de cette salle. Avant de quitter la salle, vous devez transférer le rôle du propriétaire à un autre utilisateur.", "LeaveTheRoom": "Quitter la salle", "LeftAndAppointNewOwner": "Vous avez quitté la salle et choisi un nouveau propriétaire", diff --git a/packages/client/public/locales/hy-AM/Confirm.json b/packages/client/public/locales/hy-AM/Confirm.json index f18c4638c2..5bda72213c 100644 --- a/packages/client/public/locales/hy-AM/Confirm.json +++ b/packages/client/public/locales/hy-AM/Confirm.json @@ -30,5 +30,6 @@ "SignUp": "Գրանցվեք", "SuccessDeactivate": "Ձեր հաշիվը հաջողությամբ ապաակտիվացվել է: 10 վայրկյանից դուք կվերահղվեք <1>կայք:", "SuccessReactivate": "Ձեր հաշիվը հաջողությամբ վերագործարկվել է: 10 վայրկյանից դուք կվերահղվեք <1>պորտալ", - "SuccessRemoved": "Ձեր հաշիվը հաջողությամբ հեռացվել է: 10 վայրկյանից դուք կվերահղվեք <1>կայք:" + "SuccessRemoved": "Ձեր հաշիվը հաջողությամբ հեռացվել է: 10 վայրկյանից դուք կվերահղվեք <1>կայք:", + "TermsAndConditions": "Շարունակելով՝ դուք հասկանում և ընդունում եք մեր <1>պայմանները, դրույթները և <2>Գաղտնիության հայտարարությունը:" } diff --git a/packages/client/public/locales/hy-AM/Files.json b/packages/client/public/locales/hy-AM/Files.json index 9770169120..1ae84e21a1 100644 --- a/packages/client/public/locales/hy-AM/Files.json +++ b/packages/client/public/locales/hy-AM/Files.json @@ -84,6 +84,7 @@ "GoToPersonal": "Գնալ Փաստաթղթերը", "Images": "Պատկերներ", "InviteUsersInRoom": "Հրավիրել օգտվողներին սենյակ", + "LastActivity": "Վերջին գործողությունը", "LeaveRoomDescription": "Դուք այս սենյակի սեփականատերն եք: Նախքան սենյակից դուրս գալը, դուք պետք է սեփականատիրոջ դերը փոխանցեք մեկ այլ օգտատիրոջ:", "LeaveTheRoom": "Լքել սենյակը", "LeftAndAppointNewOwner": "Դուք դուրս եք եկել սենյակից և նոր սեփականատեր եք նշանակել", diff --git a/packages/client/public/locales/it/Confirm.json b/packages/client/public/locales/it/Confirm.json index 6ee96a1a0a..7fbf4b6017 100644 --- a/packages/client/public/locales/it/Confirm.json +++ b/packages/client/public/locales/it/Confirm.json @@ -30,5 +30,6 @@ "SignUp": "Iscriviti", "SuccessDeactivate": "Il tuo account è stato disattivato con successo. In 10 secondi verrai reindirizzato al <1>sito.", "SuccessReactivate": "Il tuo account è stato riattivato con successo. In 10 secondi verrai reindirizzato al <1>portale.", - "SuccessRemoved": "Il tuo account è stato rimosso con successo. In 10 secondi verrai reindirizzato al <1>sito." + "SuccessRemoved": "Il tuo account è stato rimosso con successo. In 10 secondi verrai reindirizzato al <1>sito.", + "TermsAndConditions": "Continuando, comprendi e accetti i nostri <1>Termini e condizioni e l'<2>Informativa sulla privacy." } diff --git a/packages/client/public/locales/it/Files.json b/packages/client/public/locales/it/Files.json index b08c467ea5..5e0d9c68d6 100644 --- a/packages/client/public/locales/it/Files.json +++ b/packages/client/public/locales/it/Files.json @@ -84,6 +84,7 @@ "GoToPersonal": "Vai a I Documenti", "Images": "Immagini", "InviteUsersInRoom": "Invita gli utenti nella stanza", + "LastActivity": "Ultima attività", "LeaveRoomDescription": "Sei il proprietario di questa stanza. Prima di lasciare la stanza, devi trasferire il ruolo di proprietario a un altro utente.", "LeaveTheRoom": "Lascia la stanza", "LeftAndAppointNewOwner": "Hai lasciato la stanza e hai nominato un nuovo proprietario", diff --git a/packages/client/public/locales/ja-JP/Confirm.json b/packages/client/public/locales/ja-JP/Confirm.json index 34b58d23d8..0b2c99158d 100644 --- a/packages/client/public/locales/ja-JP/Confirm.json +++ b/packages/client/public/locales/ja-JP/Confirm.json @@ -30,5 +30,6 @@ "SignUp": "サインアップ", "SuccessDeactivate": "お客様のアカウントは正常に無効化されました。10秒後に<1>サイトにリダイレクトされます。", "SuccessReactivate": "あなたのアカウントは正常に再有効化されました。10秒後に<1>ポータルにリダイレクトされます。", - "SuccessRemoved": "お客様のアカウントは正常に削除されました。10秒後に<1>siteにリダイレクトされます。" + "SuccessRemoved": "お客様のアカウントは正常に削除されました。10秒後に<1>siteにリダイレクトされます。", + "TermsAndConditions": "続行することで、<1>利用規約と<2>個人情報保護方針を理解し、同意したことになります。" } diff --git a/packages/client/public/locales/ja-JP/Files.json b/packages/client/public/locales/ja-JP/Files.json index 2b7690aacf..68d09d4708 100644 --- a/packages/client/public/locales/ja-JP/Files.json +++ b/packages/client/public/locales/ja-JP/Files.json @@ -84,6 +84,7 @@ "GoToPersonal": "文書」へ", "Images": "画像", "InviteUsersInRoom": "新しいユーザーを招待する", + "LastActivity": "最終アクティビティ", "LeaveRoomDescription": "あなたはこのルームの所有者です。退室する前に、所有者の役割を他のユーザーに譲渡する必要があります。", "LeaveTheRoom": "退室する", "LeftAndAppointNewOwner": "あなた退室し、新しい所有者を任命しました。", diff --git a/packages/client/public/locales/pt-BR/Confirm.json b/packages/client/public/locales/pt-BR/Confirm.json index 0cef08e616..1a109f55ea 100644 --- a/packages/client/public/locales/pt-BR/Confirm.json +++ b/packages/client/public/locales/pt-BR/Confirm.json @@ -30,5 +30,6 @@ "SignUp": "Inscrever-se", "SuccessDeactivate": "Sua conta foi desativada com sucesso. Em 10 segundos você será redirecionado para o <1>site.", "SuccessReactivate": "Sua conta foi reativada com sucesso. Em 10 segundos você será redirecionado para o <1>portal.", - "SuccessRemoved": "Sua conta foi removida com sucesso. Em 10 segundos você será redirecionado para o <1>site." + "SuccessRemoved": "Sua conta foi removida com sucesso. Em 10 segundos você será redirecionado para o <1>site.", + "TermsAndConditions": "Ao continuar, você entende e concorda com nossos <1>Termos e condições e <2>Declaração de privacidade." } diff --git a/packages/client/public/locales/pt-BR/Files.json b/packages/client/public/locales/pt-BR/Files.json index 90dc77b270..5c5f74633c 100644 --- a/packages/client/public/locales/pt-BR/Files.json +++ b/packages/client/public/locales/pt-BR/Files.json @@ -84,6 +84,7 @@ "GoToPersonal": "Ir para Documentos", "Images": "Imagens", "InviteUsersInRoom": "Convidar usuários na sala", + "LastActivity": "Última atividade", "LeaveRoomDescription": "Você é o dono desta sala. Antes de sair da sala, você deve transferir a função de proprietário para outro usuário.", "LeaveTheRoom": "Saia da sala", "LeftAndAppointNewOwner": "Você saiu da sala e nomeou um novo proprietário", diff --git a/packages/client/public/locales/ro/Confirm.json b/packages/client/public/locales/ro/Confirm.json index 9979fdd205..bb284db42e 100644 --- a/packages/client/public/locales/ro/Confirm.json +++ b/packages/client/public/locales/ro/Confirm.json @@ -30,5 +30,6 @@ "SignUp": "Conectare", "SuccessDeactivate": "Contul dvs a fost dezactivat cu succes. Veţi fi redirecţionat în 10 secunde către <1>site-ul.", "SuccessReactivate": "Contul dvs a fost reactivat cu succes. Veți fi redirecționat către <1>portal după 10 secunde.", - "SuccessRemoved": "Contul dvs a fost eliminat cu succes. Veţi fi redirecţionat în 10 secunde către <1>site-ul." + "SuccessRemoved": "Contul dvs a fost eliminat cu succes. Veţi fi redirecţionat în 10 secunde către <1>site-ul.", + "TermsAndConditions": "Dacă continuați, acceptați că sunteți de acord cu <1>Termenii si conditiile de utilizare și <2>Politica de confidentialitate a companiei." } diff --git a/packages/client/public/locales/ro/Files.json b/packages/client/public/locales/ro/Files.json index 84c6307648..3ab7307c3d 100644 --- a/packages/client/public/locales/ro/Files.json +++ b/packages/client/public/locales/ro/Files.json @@ -84,6 +84,7 @@ "GoToPersonal": "Salt la Documentele", "Images": "Imagini", "InviteUsersInRoom": "Invită utilizatori în sala", + "LastActivity": "Ultima activitate", "LeaveRoomDescription": "Sunteți proprietarul acestei săli. Înainte de a părăsi sala, trebuie să atribuiți rolul de proprietar unui alt utilizator.", "LeaveTheRoom": "Părăsește sala", "LeftAndAppointNewOwner": "Dvs ați părăsit sala și ați desemnat un nou proprietar", diff --git a/packages/client/public/locales/ru/Confirm.json b/packages/client/public/locales/ru/Confirm.json index 3f1ece4089..583e73ceda 100644 --- a/packages/client/public/locales/ru/Confirm.json +++ b/packages/client/public/locales/ru/Confirm.json @@ -30,5 +30,6 @@ "SignUp": "Зарегистрироваться", "SuccessDeactivate": "Ваш аккаунт успешно деактивирован. Через 10 секунд вы будете перенаправлены на <1>сайт.", "SuccessReactivate": "Ваша учетная запись успешно повторно активирована. Через 10 секунд вы будете перенаправлены на <1>портал.", - "SuccessRemoved": "Ваш аккаунт успешно удален. Через 10 секунд вы будете перенаправлены на <1>site." + "SuccessRemoved": "Ваш аккаунт успешно удален. Через 10 секунд вы будете перенаправлены на <1>site.", + "TermsAndConditions": "Продолжая, вы соглашаетесь с тем, что понимаете и принимаете наши <1>Условия использования и <2>Положение о конфиденциальности." } diff --git a/packages/client/public/locales/ru/Files.json b/packages/client/public/locales/ru/Files.json index edf3147bce..c3e0e963a3 100644 --- a/packages/client/public/locales/ru/Files.json +++ b/packages/client/public/locales/ru/Files.json @@ -84,6 +84,7 @@ "GoToPersonal": "Перейти к Документам", "Images": "Изображения", "InviteUsersInRoom": "Пригласить пользователей в комнату", + "LastActivity": "Последняя активность", "LeaveRoomDescription": "Вы являетесь новым владельцем комнаты. Перед тем, как покинуть комнату, вы должны передать роль владельца другому пользователю.", "LeaveTheRoom": "Покинуть комнату", "LeftAndAppointNewOwner": "Вы покинули комнату и назначили нового владельца", diff --git a/packages/client/public/locales/zh-CN/Confirm.json b/packages/client/public/locales/zh-CN/Confirm.json index cebcd803cf..221822eea3 100644 --- a/packages/client/public/locales/zh-CN/Confirm.json +++ b/packages/client/public/locales/zh-CN/Confirm.json @@ -30,5 +30,6 @@ "SignUp": "注册", "SuccessDeactivate": "您的账户已成功停用。10 秒后您将被重定向至<1>站点。", "SuccessReactivate": "您的账户已成功重新启用。10 秒后您将被重定向至<1>门户。", - "SuccessRemoved": "您的账户已删除成功。10 秒钟后，您将被重新转到<1>site。" + "SuccessRemoved": "您的账户已删除成功。10 秒钟后，您将被重新转到<1>site。", + "TermsAndConditions": "继续操作即表示您已理解并同意我们的<1>服务条款和<2>隐私声明。" } diff --git a/packages/client/public/locales/zh-CN/Files.json b/packages/client/public/locales/zh-CN/Files.json index 3ebc3a6d69..2f7d63a7de 100644 --- a/packages/client/public/locales/zh-CN/Files.json +++ b/packages/client/public/locales/zh-CN/Files.json @@ -84,6 +84,7 @@ "GoToPersonal": "转到我的文档", "Images": "图像", "InviteUsersInRoom": "邀请用户进入房间", + "LastActivity": "上次活动", "LeaveRoomDescription": "您是房间的所有者。退出房间之前，您必须将所有者的角色转移给其他用户。", "LeaveTheRoom": "退出房间", "LeftAndAppointNewOwner": "您已退出房间并指定了新的所有者", diff --git a/public/locales/ar-SA/Common.json b/public/locales/ar-SA/Common.json index c6ee3e3fdc..e62a77972a 100644 --- a/public/locales/ar-SA/Common.json +++ b/public/locales/ar-SA/Common.json @@ -394,6 +394,7 @@ "RoomAdmin": "مسؤول الغرفة", "RoomList": "قائمة الغرف", "Rooms": "غرف", + "RoomSpaceQuotaExceeded": "({{size}}) تم تجاوز حصة مساحة الغرفة", "SameEmail": "لا يمكنك استخدام نفس عنوان البريد الإلكتروني", "SaveButton": "حفظ", "SaveHereButton": "احفظ هنا", diff --git a/public/locales/az/Common.json b/public/locales/az/Common.json index 546ee81dc5..08575fe7e4 100644 --- a/public/locales/az/Common.json +++ b/public/locales/az/Common.json @@ -394,6 +394,7 @@ "RoomAdmin": "Otaq admini", "RoomList": "Otaq siyahısı", "Rooms": "Otaqlar", + "RoomSpaceQuotaExceeded": "Otaq sahəsi kvota limitini keçib ({{size}})", "SameEmail": "Eyni elektron poçtu istifadəd edə bilməzsiniz", "SaveButton": "Yadda saxlayın", "SaveHereButton": "Burada yadda saxlayın", diff --git a/public/locales/bg/Common.json b/public/locales/bg/Common.json index 10d26880c5..0f725ff420 100644 --- a/public/locales/bg/Common.json +++ b/public/locales/bg/Common.json @@ -394,6 +394,7 @@ "RoomAdmin": "Администратор на стаята", "RoomList": "Списък със стаи", "Rooms": "Стаи", + "RoomSpaceQuotaExceeded": "Квотата за пространство в стаята е надвишена ({{size}})", "SameEmail": "Не може да използвате същия имейл", "SaveButton": "Запази", "SaveHereButton": "Запази тук", diff --git a/public/locales/cs/Common.json b/public/locales/cs/Common.json index 5ff931f73c..b0d3ccfda2 100644 --- a/public/locales/cs/Common.json +++ b/public/locales/cs/Common.json @@ -394,6 +394,7 @@ "RoomAdmin": "Administrátor místnosti", "RoomList": "Seznam místností", "Rooms": "Místnosti", + "RoomSpaceQuotaExceeded": "Překročení kvóty místa v místnosti ({{size}})", "SameEmail": "Nelze použít stejný e-mail", "SaveButton": "Uložit", "SaveHereButton": "Uložit zde", diff --git a/public/locales/de/Common.json b/public/locales/de/Common.json index e8d2dd78ed..9ff3206214 100644 --- a/public/locales/de/Common.json +++ b/public/locales/de/Common.json @@ -52,6 +52,7 @@ "ComingSoon": "Kommt demnächst", "Comment": "Kommentieren", "Comments": "Kommentare", + "Commercial": "Kommerziell", "Common": "Allgemeine", "CommonFiles": "Gemeinsame Dateien", "CompanyName": "Name des Unternehmens", @@ -243,6 +244,7 @@ "InviteUsers": "Benutzer einladen", "Kilobyte": "KB", "Language": "Sprache", + "LastActivityDate": "Datum der letzten Aktivität", "LastModifiedDate": "Zuletzt geändertes Datum", "LastName": "Familienname", "LatePayment": "Verspätete Zahlung", @@ -395,6 +397,7 @@ "RoomAdmin": "Raumverwaltung", "RoomList": "Raumliste", "Rooms": "Raum", + "RoomSpaceQuotaExceeded": "Raumkontingent überschritten ({{size}})", "SameEmail": "Dasselbe E-Mail darf nicht benutzt werden", "SaveButton": "Speichern", "SaveHereButton": "Hier speichern", diff --git a/public/locales/el-GR/Common.json b/public/locales/el-GR/Common.json index 17f7ad4a4d..ca1157ad65 100644 --- a/public/locales/el-GR/Common.json +++ b/public/locales/el-GR/Common.json @@ -394,6 +394,7 @@ "RoomAdmin": "Διαχειριστής δωματίου", "RoomList": "Λίστα δωματίων", "Rooms": "Δωμάτια", + "RoomSpaceQuotaExceeded": "Υπέρβαση της ποσόστωσης χώρου δωματίου ({{size}})", "SameEmail": "Δεν μπορείτε να χρησιμοποιήσετε το ίδιο email", "SaveButton": "Αποθήκευση", "SaveHereButton": "Αποθήκευση εδώ", diff --git a/public/locales/en/Common.json b/public/locales/en/Common.json index 30b0a1c4bb..58fb14cca9 100644 --- a/public/locales/en/Common.json +++ b/public/locales/en/Common.json @@ -397,6 +397,7 @@ "RoomAdmin": "Room admin", "RoomList": "Room list", "Rooms": "Rooms", + "RoomSpaceQuotaExceeded": "Room space quota exceeded ({{size}}).", "SameEmail": "You can't use the same email address", "SaveButton": "Save", "SaveHereButton": "Save here", @@ -516,6 +517,5 @@ "Website": "Website", "Yes": "Yes", "Yesterday": "Yesterday", - "You": "You", - "RoomSpaceQuotaExceeded": "Room space quota exceeded ({{size}})." + "You": "You" } diff --git a/public/locales/es/Common.json b/public/locales/es/Common.json index 908e0d3f06..494e322017 100644 --- a/public/locales/es/Common.json +++ b/public/locales/es/Common.json @@ -52,6 +52,7 @@ "ComingSoon": "Próximamente", "Comment": "Comentario", "Comments": "Comentarios", + "Commercial": "Comercial", "Common": "Documentos comunes", "CommonFiles": "Archivos comunes", "CompanyName": "Nombre de empresa", @@ -243,6 +244,7 @@ "InviteUsers": "Invitar a usuarios", "Kilobyte": "KB", "Language": "Idioma", + "LastActivityDate": "Fecha de la última actividad", "LastModifiedDate": "Fecha de actualización", "LastName": "Apellido", "LatePayment": "Pago atrasado", @@ -395,6 +397,7 @@ "RoomAdmin": "Administrador de la sala", "RoomList": "Lista de las salas", "Rooms": "Salas", + "RoomSpaceQuotaExceeded": "Se ha superado la cuota de espacio de la sala ({{size}})", "SameEmail": "No se puede utilizar el mismo email", "SaveButton": "Guardar", "SaveHereButton": "Guardar aquí", diff --git a/public/locales/fi/Common.json b/public/locales/fi/Common.json index 1cace3d4b0..4dab22a5bc 100644 --- a/public/locales/fi/Common.json +++ b/public/locales/fi/Common.json @@ -394,6 +394,7 @@ "RoomAdmin": "Huoneen järjestelmänvalvoja", "RoomList": "Huonelista", "Rooms": "Huoneet", + "RoomSpaceQuotaExceeded": "Huonetilakiintiö ylitetty ({{size}})", "SameEmail": "Et voi käyttää samaa sähköpostiosoitetta", "SaveButton": "Tallenna", "SaveHereButton": "Tallenna tähän", diff --git a/public/locales/fr/Common.json b/public/locales/fr/Common.json index 8852e6795d..bfc3c4a76a 100644 --- a/public/locales/fr/Common.json +++ b/public/locales/fr/Common.json @@ -52,6 +52,7 @@ "ComingSoon": "Bientôt disponible", "Comment": "Commentaire", "Comments": "Commentaires", + "Commercial": "Commerciale", "Common": "Commun", "CommonFiles": "Fichiers communs", "CompanyName": "Nom de l'entreprise", @@ -243,6 +244,7 @@ "InviteUsers": "Inviter les utilisateurs", "Kilobyte": "Ko", "Language": "Langue", + "LastActivityDate": "Date de la dernière activité", "LastModifiedDate": "Modifié", "LastName": "Nom", "LatePayment": "Retard de paiement", @@ -395,6 +397,7 @@ "RoomAdmin": "Administrateur de salle", "RoomList": "Liste de salles", "Rooms": "Salles", + "RoomSpaceQuotaExceeded": "Le quota de stockage pour la salle est dépassé ({{size}})", "SameEmail": "Vous ne pouvez pas utiliser la même adresse e-mail", "SaveButton": "Enregistrer", "SaveHereButton": "Sauvegarder ici", diff --git a/public/locales/hy-AM/Common.json b/public/locales/hy-AM/Common.json index da3bf8466a..1dc6034f07 100644 --- a/public/locales/hy-AM/Common.json +++ b/public/locales/hy-AM/Common.json @@ -52,6 +52,7 @@ "ComingSoon": "Շուտով", "Comment": "Մեկնաբանություն", "Comments": "Մեկնաբանություններ", + "Commercial": "Կոմերցիոն", "Common": "Ընդհանուր", "CommonFiles": "Ընդհանուր ֆայլեր", "CompanyName": "Ընկերության անվանում", @@ -242,6 +243,7 @@ "InviteUsers": "Հրավիրեք օգտվողներին", "Kilobyte": "ԿԲ", "Language": "Լեզու", + "LastActivityDate": "Վերջին գործողության ամսաթիվը", "LastModifiedDate": "Վերջին փոփոխության ամսաթիվը", "LastName": "Վերջին անունը", "LatePayment": "Վերջին վճարումը", @@ -394,6 +396,7 @@ "RoomAdmin": "Սենյակի ադմին", "RoomList": "Սենյակների ցուցակ", "Rooms": "Սենյակներ", + "RoomSpaceQuotaExceeded": "Սենյակի տարածքի չափաբաժինը գերազանցվել է ({{size}})", "SameEmail": "Դուք չեք կարող օգտագործել նույն էլփոստի հասցեն", "SaveButton": "Պահպանել", "SaveHereButton": "Պահպանեք այստեղ", diff --git a/public/locales/it/Common.json b/public/locales/it/Common.json index 6c6fb0614c..8c28abab13 100644 --- a/public/locales/it/Common.json +++ b/public/locales/it/Common.json @@ -52,6 +52,7 @@ "ComingSoon": "Prossimamente", "Comment": "Commento", "Comments": "Commenti", + "Commercial": "Commerciale", "Common": "Comune", "CommonFiles": "File comuni", "CompanyName": "Nome azienda", @@ -243,6 +244,7 @@ "InviteUsers": "Invita gli utenti", "Kilobyte": "KB", "Language": "Lingua", + "LastActivityDate": "Data dell'ultima attività", "LastModifiedDate": "Data ultima modifica", "LastName": "Cognome", "LatePayment": "Pagamento in ritardo", @@ -395,6 +397,7 @@ "RoomAdmin": "Amministratore della stanza", "RoomList": "Elenco delle stanze", "Rooms": "Stanze", + "RoomSpaceQuotaExceeded": "È stata superata la quota di spazio delle stanza ({{size}})", "SameEmail": "Non puoi usare la stessa email", "SaveButton": "Salva", "SaveHereButton": "Salvare qui", diff --git a/public/locales/ja-JP/Common.json b/public/locales/ja-JP/Common.json index 5a079f0d56..6130af31f1 100644 --- a/public/locales/ja-JP/Common.json +++ b/public/locales/ja-JP/Common.json @@ -52,6 +52,7 @@ "ComingSoon": "近日公開", "Comment": "コメント", "Comments": "コメント", + "Commercial": "商用", "Common": "共通", "CommonFiles": "共通のファイル", "CompanyName": "企業名", @@ -243,6 +244,7 @@ "InviteUsers": "ユーザーを招待する", "Kilobyte": "KB", "Language": "言語", + "LastActivityDate": "最終アクティビティ日", "LastModifiedDate": "変更日", "LastName": "姓", "LatePayment": "延滞料", @@ -395,6 +397,7 @@ "RoomAdmin": "ルームの管理者", "RoomList": "ルーム一覧", "Rooms": "ルーム", + "RoomSpaceQuotaExceeded": "ルームの容量制限を超えています({{size}})", "SameEmail": "同じメールを使用することはできません", "SaveButton": "保存", "SaveHereButton": "ここで保存", diff --git a/public/locales/ko-KR/Common.json b/public/locales/ko-KR/Common.json index 5141073f88..fd8dc094ca 100644 --- a/public/locales/ko-KR/Common.json +++ b/public/locales/ko-KR/Common.json @@ -394,6 +394,7 @@ "RoomAdmin": "방 관리자", "RoomList": "방 목록", "Rooms": "방", + "RoomSpaceQuotaExceeded": "방 공간 할당량을 초과했습니다({{size}})", "SameEmail": "같은 이메일을 사용할 수 없습니다", "SaveButton": "저장", "SaveHereButton": "여기에 저장", diff --git a/public/locales/lv/Common.json b/public/locales/lv/Common.json index a47a8e187c..79d0ca907e 100644 --- a/public/locales/lv/Common.json +++ b/public/locales/lv/Common.json @@ -394,6 +394,7 @@ "RoomAdmin": "Telpas administrators", "RoomList": "Telpu saraksts", "Rooms": "Telpas", + "RoomSpaceQuotaExceeded": "Pārsniegta telpas vietas kvota ({{size}})", "SameEmail": "Jūs nevarat izmantot to pašu e-pastu", "SaveButton": "Saglabāt", "SaveHereButton": "Saglabāt šeit", diff --git a/public/locales/nl/Common.json b/public/locales/nl/Common.json index d1e7dd1b01..60a894c3c9 100644 --- a/public/locales/nl/Common.json +++ b/public/locales/nl/Common.json @@ -394,6 +394,7 @@ "RoomAdmin": "Kamer beheerder", "RoomList": "Kamerlijst", "Rooms": "Kamers", + "RoomSpaceQuotaExceeded": "Kamer ruimte quota overschreden ({{size}})", "SameEmail": "U kunt niet hetzelfde e-mailadres gebruiken", "SaveButton": "Opslaan", "SaveHereButton": "Hier opslaan", diff --git a/public/locales/pl/Common.json b/public/locales/pl/Common.json index 19af657b05..94b5faac93 100644 --- a/public/locales/pl/Common.json +++ b/public/locales/pl/Common.json @@ -394,6 +394,7 @@ "RoomAdmin": "Administrator pokoju", "RoomList": "Lista pokoi", "Rooms": "Pokoje", + "RoomSpaceQuotaExceeded": "Przekroczono limit pamięci pokoju ({{size}})", "SameEmail": "Nie można użyć tego samego adresu e-mail", "SaveButton": "Zapisz", "SaveHereButton": "Zapisz tutaj", diff --git a/public/locales/pt-BR/Common.json b/public/locales/pt-BR/Common.json index a6ddd6ff9c..8fd505c1e5 100644 --- a/public/locales/pt-BR/Common.json +++ b/public/locales/pt-BR/Common.json @@ -52,6 +52,7 @@ "ComingSoon": "Em breve", "Comment": "Comentário", "Comments": "Comentários", + "Commercial": "Comercial", "Common": "Comum", "CommonFiles": "Arquivos comuns", "CompanyName": "Nome da empresa", @@ -242,6 +243,7 @@ "InviteUsers": "Convidar usuários", "Kilobyte": "KB", "Language": "Idioma", + "LastActivityDate": "Data da última atividade", "LastModifiedDate": "Data da última modificação", "LastName": "Sobrenome", "LatePayment": "Atraso no pagamento", @@ -394,6 +396,7 @@ "RoomAdmin": "Administrador da sala", "RoomList": "Lista de salas", "Rooms": "Salas", + "RoomSpaceQuotaExceeded": "Cota de espaço da sala excedida ({{size}})", "SameEmail": "Você não pode usar o mesmo e-mail", "SaveButton": "Salvar", "SaveHereButton": "Salvar aqui", diff --git a/public/locales/pt/Common.json b/public/locales/pt/Common.json index 594fa72e4b..42f72ef974 100644 --- a/public/locales/pt/Common.json +++ b/public/locales/pt/Common.json @@ -394,6 +394,7 @@ "RoomAdmin": "Administrador de Salas", "RoomList": "Lista de Salas", "Rooms": "Salas", + "RoomSpaceQuotaExceeded": "Cota de espaço da sala excedida ({{size}})", "SameEmail": "Não pode usar o mesmo e-mail", "SaveButton": "Guardar", "SaveHereButton": "Guardar aqui", diff --git a/public/locales/ro/Common.json b/public/locales/ro/Common.json index 7082021e92..5054b5b072 100644 --- a/public/locales/ro/Common.json +++ b/public/locales/ro/Common.json @@ -52,6 +52,7 @@ "ComingSoon": "În curând", "Comment": "Comentariu", "Comments": "Comentarii", + "Commercial": "Comerț", "Common": "În comun", "CommonFiles": "Fișiere comune", "CompanyName": "Numele companiei", @@ -242,6 +243,7 @@ "InviteUsers": "Invitaţi utilizatori", "Kilobyte": "KO", "Language": "Limbă", + "LastActivityDate": "Data când a avut loc ultima activitate", "LastModifiedDate": "Data ultimei modificări", "LastName": "Numele", "LatePayment": "Plata întârziată", @@ -394,6 +396,7 @@ "RoomAdmin": "Administratorul sălii", "RoomList": "Listă de săli", "Rooms": "Săli", + "RoomSpaceQuotaExceeded": "Spațiu de stocare pentru sala a fost depășit ({{size}})", "SameEmail": "Nu puteți folosi una și aceeași adresă adresa e-mail ", "SaveButton": "Salvează", "SaveHereButton": "Salvează aici", diff --git a/public/locales/ru/Common.json b/public/locales/ru/Common.json index cc6b74c83e..26039a44c0 100644 --- a/public/locales/ru/Common.json +++ b/public/locales/ru/Common.json @@ -52,6 +52,7 @@ "ComingSoon": "Скоро появится", "Comment": "Комментирование", "Comments": "Комментарии", + "Commercial": "Коммерческая", "Common": "Общие", "CommonFiles": "Общие файлы", "CompanyName": "Название компании", @@ -243,6 +244,7 @@ "InviteUsers": "Пригласить пользователей", "Kilobyte": "Кб", "Language": "Язык", + "LastActivityDate": "Дата последней активности", "LastModifiedDate": "Дата последнего изменения", "LastName": "Фамилия", "LatePayment": "Просроченная оплата", @@ -395,6 +397,7 @@ "RoomAdmin": "Администратор комнаты", "RoomList": "Список комнат", "Rooms": "Комнаты", + "RoomSpaceQuotaExceeded": "Превышена квота пространства на комнату ({{size}})", "SameEmail": "Email совпадает с текущим", "SaveButton": "Сохранить", "SaveHereButton": "Сохранить сюда", diff --git a/public/locales/sk/Common.json b/public/locales/sk/Common.json index 60e90a9b16..98065f940a 100644 --- a/public/locales/sk/Common.json +++ b/public/locales/sk/Common.json @@ -394,6 +394,7 @@ "RoomAdmin": "Administrátor miestnosti", "RoomList": "Zoznam miestností", "Rooms": "Miestností", + "RoomSpaceQuotaExceeded": "Kvóta priestoru v miestnosti bola prekročená ({{size}})", "SameEmail": "Nemôžete použiť ten istý e-mail", "SaveButton": "Uložiť", "SaveHereButton": "Uložiť tu", diff --git a/public/locales/sl/Common.json b/public/locales/sl/Common.json index 8f90b944b6..10a81fe517 100644 --- a/public/locales/sl/Common.json +++ b/public/locales/sl/Common.json @@ -394,6 +394,7 @@ "RoomAdmin": "Skrbnik sobe", "RoomList": "Spisek sob", "Rooms": "Săli", + "RoomSpaceQuotaExceeded": "Kvota prostora v sobi je presežena ({{size}})", "SameEmail": "Ne morete uporabljati istega e-mail naslova", "SaveButton": "Shrani", "SaveHereButton": "Shrani tukaj", diff --git a/public/locales/sr-Cyrl-RS/Common.json b/public/locales/sr-Cyrl-RS/Common.json index c3f791bd35..b36745941f 100644 --- a/public/locales/sr-Cyrl-RS/Common.json +++ b/public/locales/sr-Cyrl-RS/Common.json @@ -394,6 +394,7 @@ "RoomAdmin": "Админ собе", "RoomList": "Листа собе", "Rooms": "Собе", + "RoomSpaceQuotaExceeded": "Квота простора за собу прекорачена ({{size}})", "SameEmail": "Не можете користити исту емаил адресу", "SaveButton": "Сачувај", "SaveHereButton": "Сачувај овде", diff --git a/public/locales/sr-Latn-RS/Common.json b/public/locales/sr-Latn-RS/Common.json index 7c316d0d9a..3cdefc421c 100644 --- a/public/locales/sr-Latn-RS/Common.json +++ b/public/locales/sr-Latn-RS/Common.json @@ -394,6 +394,7 @@ "RoomAdmin": "Admin sobe", "RoomList": "Lista sobe", "Rooms": "Sobe", + "RoomSpaceQuotaExceeded": "Kvota prostora za sobu prekoračena ({{size}})", "SameEmail": "Ne možete koristiti istu email adresu", "SaveButton": "Sačuvaj", "SaveHereButton": "Sačuvaj ovde", diff --git a/public/locales/tr/Common.json b/public/locales/tr/Common.json index cac4db7872..e483d671af 100644 --- a/public/locales/tr/Common.json +++ b/public/locales/tr/Common.json @@ -394,6 +394,7 @@ "RoomAdmin": "Oda yöneticisi", "RoomList": "Oda listesi", "Rooms": "Odalar", + "RoomSpaceQuotaExceeded": "Oda alanı kotası aşıldı ({{size}})", "SameEmail": "Aynı e-postayı kullanamazsınız", "SaveButton": "Kaydet", "SaveHereButton": "Buraya kaydet", diff --git a/public/locales/uk-UA/Common.json b/public/locales/uk-UA/Common.json index a2c58a210c..dff09611e6 100644 --- a/public/locales/uk-UA/Common.json +++ b/public/locales/uk-UA/Common.json @@ -394,6 +394,7 @@ "RoomAdmin": "Адміністратор кімнати", "RoomList": "Список кімнати", "Rooms": "Кімнати", + "RoomSpaceQuotaExceeded": "Перевищено квоту простору кімнати ({{size}})", "SameEmail": "Не можна використовувати ту ж саму електронну пошту", "SaveButton": "Зберегти", "SaveHereButton": "Зберегти тут", diff --git a/public/locales/vi/Common.json b/public/locales/vi/Common.json index aee5380264..7b78b9bd84 100644 --- a/public/locales/vi/Common.json +++ b/public/locales/vi/Common.json @@ -394,6 +394,7 @@ "RoomAdmin": "Quản trị viên phòng", "RoomList": "Danh sách phòng", "Rooms": "Phòng", + "RoomSpaceQuotaExceeded": "Đã vượt quá hạn mức không gian phòng ({{size}})", "SameEmail": "Bạn không thể sử dụng cùng một email", "SaveButton": "Lưu", "SaveHereButton": "Lưu ở đây", diff --git a/public/locales/zh-CN/Common.json b/public/locales/zh-CN/Common.json index fe9abd6e3f..e62c3174bc 100644 --- a/public/locales/zh-CN/Common.json +++ b/public/locales/zh-CN/Common.json @@ -52,6 +52,7 @@ "ComingSoon": "即将推出", "Comment": "评论", "Comments": "批注", + "Commercial": "商业许可", "Common": "常见", "CommonFiles": "公共文件", "CompanyName": "企业名称", @@ -243,6 +244,7 @@ "InviteUsers": "邀请用户", "Kilobyte": "KB", "Language": "语言", + "LastActivityDate": "上次活动日期", "LastModifiedDate": "上次修改日期", "LastName": "姓氏", "LatePayment": "逾期付款", @@ -395,6 +397,7 @@ "RoomAdmin": "房间管理员", "RoomList": "房间列表", "Rooms": "房间", + "RoomSpaceQuotaExceeded": "已超出房间空间配额({{size}})", "SameEmail": "您不能使用相同的邮箱", "SaveButton": "保存", "SaveHereButton": "在此保存", From fe6a06332503744f78c7534bdb0b383b14d8b85a Mon Sep 17 00:00:00 2001 From: Aleksandr Lushkin Date: Thu, 29 Aug 2024 13:14:38 +0200 Subject: [PATCH 11/16] Client: EditGroupMembersPanel: Disable user-select --- .../components/dialogs/EditGroupMembersDialog/index.tsx | 7 ++++++- .../sub-components/GroupMember/index.tsx | 9 +++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/packages/client/src/components/dialogs/EditGroupMembersDialog/index.tsx b/packages/client/src/components/dialogs/EditGroupMembersDialog/index.tsx index a49c0581af..0f4c1f6db2 100644 --- a/packages/client/src/components/dialogs/EditGroupMembersDialog/index.tsx +++ b/packages/client/src/components/dialogs/EditGroupMembersDialog/index.tsx @@ -35,6 +35,7 @@ import { import { getGroupMembersInRoom } from "@docspace/shared/api/groups"; import { InputSize } from "@docspace/shared/components/text-input"; import { SearchInput } from "@docspace/shared/components/search-input"; +import { Text } from "@docspace/shared/components/text"; import { TGroup, TGroupMemberInvitedInRoom, @@ -131,7 +132,11 @@ const EditGroupMembers = ({ onClose={onClose} displayType={ModalDialogType.aside} > - {group.name} + + + {group.name} + + {!groupMembers ? ( diff --git a/packages/client/src/components/dialogs/EditGroupMembersDialog/sub-components/GroupMember/index.tsx b/packages/client/src/components/dialogs/EditGroupMembersDialog/sub-components/GroupMember/index.tsx index daef7c5006..23329929ab 100644 --- a/packages/client/src/components/dialogs/EditGroupMembersDialog/sub-components/GroupMember/index.tsx +++ b/packages/client/src/components/dialogs/EditGroupMembersDialog/sub-components/GroupMember/index.tsx @@ -190,9 +190,14 @@ const GroupMember = ({ member, infoPanelSelection }: GroupMemberProps) => { isLoading={isLoading} /> ) : ( -
+ {userRole.label} -
+ )}
)} From e0b24bb626e3ea2f9805ab041ed3e4a1b1e9713e Mon Sep 17 00:00:00 2001 From: Aleksandr Lushkin Date: Thu, 29 Aug 2024 13:21:01 +0200 Subject: [PATCH 12/16] Client: EditGroupMembersPanel: Remove useless check --- .../EditGroupMembersDialog/sub-components/GroupMember/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/client/src/components/dialogs/EditGroupMembersDialog/sub-components/GroupMember/index.tsx b/packages/client/src/components/dialogs/EditGroupMembersDialog/sub-components/GroupMember/index.tsx index 23329929ab..e980bed255 100644 --- a/packages/client/src/components/dialogs/EditGroupMembersDialog/sub-components/GroupMember/index.tsx +++ b/packages/client/src/components/dialogs/EditGroupMembersDialog/sub-components/GroupMember/index.tsx @@ -172,7 +172,7 @@ const GroupMember = ({ member, infoPanelSelection }: GroupMemberProps) => { {userRole && userRoleOptions && (
- {member.canEditAccess && !user.isOwner ? ( + {member.canEditAccess ? ( Date: Thu, 29 Aug 2024 18:08:28 +0500 Subject: [PATCH 13/16] Client:Confirm Fixed error message --- .../client/src/pages/Confirm/sub-components/createUser.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/client/src/pages/Confirm/sub-components/createUser.js b/packages/client/src/pages/Confirm/sub-components/createUser.js index 4c5797b838..3bb52b721f 100644 --- a/packages/client/src/pages/Confirm/sub-components/createUser.js +++ b/packages/client/src/pages/Confirm/sub-components/createUser.js @@ -680,7 +680,11 @@ const CreateUserForm = (props) => { isVertical={true} labelVisible={false} hasError={isPasswordErrorShow && !passwordValid} - errorMessage={t("Common:IncorrectPassword")} + errorMessage={ + password + ? t("Common:IncorrectPassword") + : t("Common:RequiredField") + } > Date: Fri, 30 Aug 2024 11:39:19 +0300 Subject: [PATCH 14/16] Fixed Bug 69877 - ChunkLoadError: Loading chunk 636 failed when opening the Share window --- packages/doceditor/next.config.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/doceditor/next.config.js b/packages/doceditor/next.config.js index 6bcc62aa91..ef13e5d568 100644 --- a/packages/doceditor/next.config.js +++ b/packages/doceditor/next.config.js @@ -41,7 +41,7 @@ const nextConfig = { }, generateBuildId: async () => { // This could be anything, using the latest git hash - return `${pkg.name} - ${pkg.version} `; + return `${pkg.name}-${pkg.version}-${new Date().getTime()}`; }, images: { unoptimized: true, @@ -157,8 +157,13 @@ module.exports = { // Modify the file loader rule to ignore *.svg, since we have it handled now. fileLoaderRule.exclude = /\.svg$/i; + if (config?.output?.filename) + config.output.filename = config.output.filename?.replace( + "[chunkhash]", + `[contenthash]`, + ); + return config; }, ...nextConfig, }; - From 303bd8b2ac2c9e851aa7b05a369b0f8453fa9866 Mon Sep 17 00:00:00 2001 From: Timofey Boyko Date: Fri, 30 Aug 2024 11:45:45 +0300 Subject: [PATCH 15/16] Login: change webpack rule for chunk name --- packages/login/next.config.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/login/next.config.js b/packages/login/next.config.js index d909856a7d..39413cd919 100644 --- a/packages/login/next.config.js +++ b/packages/login/next.config.js @@ -109,6 +109,12 @@ module.exports = { // Modify the file loader rule to ignore *.svg, since we have it handled now. fileLoaderRule.exclude = /\.svg$/i; + if (config?.output?.filename) + config.output.filename = config.output.filename?.replace( + "[chunkhash]", + `[contenthash]`, + ); + return config; }, ...nextConfig, From 7e0cb53c69ace253631c904bd9afa27b95d83bb7 Mon Sep 17 00:00:00 2001 From: Alexey Safronov Date: Fri, 30 Aug 2024 12:55:46 +0400 Subject: [PATCH 16/16] Files: Theme: value of fileExstColor have been replaced with globalColor const --- packages/shared/themes/base.ts | 2 +- packages/shared/themes/dark.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/shared/themes/base.ts b/packages/shared/themes/base.ts index 43b6c3d89f..663e35a6c6 100644 --- a/packages/shared/themes/base.ts +++ b/packages/shared/themes/base.ts @@ -2044,7 +2044,7 @@ export const getBaseTheme = () => { linkColor: black, textColor: gray, }, - fileExstColor: "#a3a9ae", + fileExstColor: gray, row: { checkboxChecked: `linear-gradient(to right, ${lightGrayHover} 24px, ${grayLightMid} 24px)`, diff --git a/packages/shared/themes/dark.ts b/packages/shared/themes/dark.ts index 95bceb1596..46f9366063 100644 --- a/packages/shared/themes/dark.ts +++ b/packages/shared/themes/dark.ts @@ -2034,7 +2034,7 @@ const Dark: TTheme = { linkColor: white, textColor: grayDark, }, - fileExstColor: "#a3a9ae", + fileExstColor: gray, row: { checkboxChecked: `linear-gradient(to right, ${black} 24px, ${grayDarkStrong} 24px)`,