IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed translations in ConflictResolve, Convert, MoveToTrash, DeleteUser and DeleteUsers dialogs

Browse Source
This commit is contained in:
mushka 2022-07-07 17:40:23 +03:00
parent a75fdc7690
commit 2ba523da5f
14 changed files with 101 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
products/ASC.Files/Client/public/locales/en/ConflictResolveDialog.json
View File

@ -1,6 +1,6 @@
{
"ConflictResolveDescription": "The file with the name <1>{{file}}</1> already exists in the folder <1>{{folder}}</1>.",
"ConflictResolveDescriptionFiles": "{{filesCount}} documents with the same name already exist in the folder <1>{{folder}}</1>.",
"SingleConflictResolveMessage": "The file with the name <strong>«{{file}}»</strong> already exists in the folder <strong>«{{folder}}»</strong>.",
"SeveralConflictsResolveMessage": "{{filesCount}} documents with the same name already exist in the folder <strong>«{{folder}}»</strong>.",
"ConflictResolveSelectAction": "Please select the action:",
"ConflictResolveTitle": "Overwrite confirmation",
"CreateDescription": "There will be two different files in the folder.",

6
products/ASC.Files/Client/public/locales/en/ConvertDialog.json
View File

@ -1,6 +1,10 @@
{
"ConversionFileMessage": "The file will be converted to OOXML (docx, xlsx, or pptx) for faster viewing and editing.",
"FileUploadTitle": "File upload",
"DocumentConversionTitle": "Document conversion",
"ConversionMessage": "All the documents you upload will be converted into Office Open XML format (docx, xlsx or pptx) for faster editing.",
"OpenFileMessage": "The document file you open will be converted to the Office Open XML format for quick viewing and editing.",
"ConversionTitle": "Document uploading",
"ConvertAndOpenTitle": "Convert and open document",
"ConvertedFileDestination": "The file copy will be created in the <strong>{{folderTitle}}</strong> folder",

10
products/ASC.Files/Client/public/locales/en/DeleteDialog.json
View File

@ -1,11 +1,9 @@
{
"MoveToTrashTitle": "Move to Trash?",
"MoveToTrashButton": "Move to Trash",
"MoveToTrashItemsNote": "If you delete shared items, other users won’t be able to access them.",
"MoveToTrashItemsTitle": "Move items to Trash?",
"MoveToTrashOneFileNote": "If you delete a shared file, other users won’t be able to access it.",
"MoveToTrashOneFileTitle": "Move file to Trash?",
"MoveToTrashOneFolderNote": "If you delete a shared folder, other users won’t be able to access it.",
"MoveToTrashOneFolderTitle": "Move folder to Trash?",
"MoveToTrashFile": "You are about to delete this file? Please note, that if you have shared it with someone, it will become unavailable. Are you sure you want to continue?",
"MoveToTrashFolder": "You are about to delete this folder? Please note, that if you have shared it with someone, it will become unavailable. Are you sure you want to continue?",
"MoveToTrashItems": "You are about to delete these items? Please note, that if you have shared it with someone, they will become unavailable. Are you sure you want to continue?",
"UnsubscribeButton": "Unsubscribe",
"UnsubscribeNote": "Are you sure you want to unsubscribe from the selected items from the list?",
"UnsubscribeTitle": "Unsubscribe confirmation"

3
products/ASC.Files/Client/public/locales/en/DeleteThirdPartyDialog.json
View File

@ -1,4 +1,5 @@
{
"DeleteThirdPartyAlert": "Remove {{service}} from the 'Documents' module? This will not affect your {{account}} account in any way.",
"DisconnectCloudTitle": "Disconnect cloud",
"DisconnectCloudMessage": "Are you sure you want to remove the {{service}} from the 'Documents'? This will not affect your {{account}} account in any way.",
"SuccessDeleteThirdParty": "Third-party {{service}} is deleted"
}

4
products/ASC.Files/Client/src/components/dialogs/ConflictResolveDialog/index.js
View File

@ -206,7 +206,7 @@ const ConflictResolveDialog = (props) => {
{singleFile ? (
<Trans
t={t}
i18nKey="ConflictResolveDescription"
i18nKey="SingleConflictResolveMessage"
ns="ConflictResolveDialog"
>
{{ file, folder: folderTitle }}
@ -214,7 +214,7 @@ const ConflictResolveDialog = (props) => {
) : (
<Trans
t={t}
i18nKey="ConflictResolveDescriptionFiles"
i18nKey="SeveralConflictsResolveMessage"
ns="ConflictResolveDialog"
>
{{ filesCount, folder: folderTitle }}

8
products/ASC.Files/Client/src/components/dialogs/ConvertDialog/index.js
View File

@ -71,7 +71,9 @@ const ConvertDialogComponent = (props) => {
withFooterCheckboxes
>
<ModalDialog.Header>
{convertSingleFile ? t("ConvertAndOpenTitle") : t("ConversionTitle")}
{convertSingleFile
? t("DocumentConversionTitle")
: t("FileUploadTitle")}
</ModalDialog.Header>
<ModalDialog.Body>
{/* <img
@ -80,9 +82,7 @@ const ConvertDialogComponent = (props) => {
alt="convert alert"
/> */}
<Text>
{convertSingleFile
? t("ConversionFileMessage")
: t("ConversionMessage")}
{convertSingleFile ? t("OpenFileMessage") : t("ConversionMessage")}
</Text>
</ModalDialog.Body>
<ModalDialog.Footer>

19
products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js
View File

@ -90,28 +90,19 @@ const DeleteDialogComponent = (props) => {
};
const moveToTrashTitle = () => {
if (unsubscribe) {
return t("UnsubscribeTitle");
} else {
if (selection.length > 1) {
return t("MoveToTrashItemsTitle");
} else {
return selection[0]?.isFolder
? t("MoveToTrashOneFolderTitle")
: t("MoveToTrashOneFileTitle");
}
}
if (unsubscribe) return t("UnsubscribeTitle");
return t("MoveToTrashTitle");
};
const moveToTrashNoteText = () => {
if (selection.length > 1) {
return t("MoveToTrashItemsNote");
return t("MoveToTrashItems");
} else {
return !selection[0]?.isFolder
? t("MoveToTrashOneFileNote")
? t("MoveToTrashFile")
: personal
? ""
: t("MoveToTrashOneFolderNote");
: t("MoveToTrashFolder");
}
};

15
products/ASC.Files/Client/src/components/dialogs/DeleteThirdPartyDialog/index.js
View File

@ -70,9 +70,12 @@ const DeleteThirdPartyDialog = (props) => {
zIndex={310}
onClose={onClose}
>
<ModalDialog.Header>{t("Common:Disconnect")}</ModalDialog.Header>
<ModalDialog.Header>{t("DisconnectCloudTitle")}</ModalDialog.Header>
<ModalDialog.Body>
{t("DeleteThirdPartyAlert", { service: removeItem.title })}
{t("DisconnectCloudMessage", {
service: removeItem.title,
account: removeItem.providerKey,
})}
</ModalDialog.Body>
<ModalDialog.Footer>
<Button
@ -80,8 +83,16 @@ const DeleteThirdPartyDialog = (props) => {
label={t("Common:OKButton")}
size="normal"
primary
scale
onClick={onDeleteThirdParty}
/>
<Button
isLoading={isLoading}
label={t("Common:CancelButton")}
size="normal"
scale
onClick={onClose}
/>
</ModalDialog.Footer>
</ModalDialog>
);

6
products/ASC.Files/Client/src/pages/Settings/Section/Body/ConnectedClouds.js
View File

@ -90,9 +90,10 @@ class ConnectClouds extends React.Component {
onDeleteThirdParty = (e) => {
const { dataset } = (e.originalEvent || e).currentTarget;
const { id, title } = dataset;
const { id, title, providerKey } = dataset;
console.log(dataset);
this.props.setDeleteThirdPartyDialogVisible(true);
this.props.setRemoveItem({ id, title });
this.props.setRemoveItem({ id, title, providerKey });
};
onChangeThirdPartyInfo = (e) => {
@ -183,6 +184,7 @@ class ConnectClouds extends React.Component {
key: `${index}_delete`,
"data-id": item.provider_id,
"data-title": item.customer_title,
"data-provider-key": item.provider_key,
icon: "/static/images/catalog.trash.react.svg",
label: t("Common:Disconnect"),
onClick: this.onDeleteThirdParty,

3
products/ASC.People/Client/public/locales/en/DeleteProfileEverDialog.json
View File

@ -1,4 +1,5 @@
{
"DeleteUserConfirmation": "{{userCaption}} <strong>{{user}}</strong> will be deleted.",
"DeleteUser": "Delete User",
"DeleteUserMessage": "{{userCaption}} <strong>{{user}}</strong> will be deleted. User personal documents which are available to others will be deleted. To avoid this, you must start the data reassign process before deleting.",
"SuccessfullyDeleteUserInfoMessage": "The user has been successfully deleted"
}

4
products/ASC.People/Client/public/locales/en/DeleteUsersDialog.json
View File

@ -1,5 +1,5 @@
{
"DeleteGroupUsersMessage": "The disabled users you selected will be deleted.",
"DeleteGroupUsersMessageHeader": "Delete the users from portal",
"DeleteUsersMessage": "The selected disabled users will be deleted from the portal. Personal documents of these users which are available to others will be deleted. To avoid this, you must start the data transfer process before deleting.",
"DeleteUsers": "Delete users",
"DeleteGroupUsersSuccessMessage": "Users have been successfully deleted."
}

24
products/ASC.People/Client/src/components/dialogs/DeleteProfileEverDialog/index.js
View File

@ -14,6 +14,7 @@ import { inject, observer } from "mobx-react";
import config from "../../../../package.json";
import { combineUrl } from "@appserver/common/utils";
import { AppServerConfig } from "@appserver/common/constants";
import Link from "@appserver/components/link";
const { deleteUser } = api.people; //TODO: Move to action
const { Filter } = api;
@ -72,25 +73,36 @@ class DeleteProfileEverDialogComponent extends React.Component {
visible={visible}
onClose={onClose}
>
<ModalDialog.Header>{t("Common:Confirmation")}</ModalDialog.Header>
<ModalDialog.Header>{t("DeleteUser")}</ModalDialog.Header>
<ModalDialog.Body>
<Text>
<Trans
i18nKey="DeleteUserConfirmation"
i18nKey="DeleteUserMessage"
ns="DeleteProfileEverDialog"
t={t}
>
{{ userCaption }} <strong>{{ user: user.displayName }}</strong>{" "}
will be deleted.
{{ userCaption }} <strong>{{ user: user.displayName }}</strong>
will be deleted. User personal documents which are available to
others will be deleted. To avoid this, you must start the data
reassign process before deleting.
</Trans>
</Text>
<Text>{t("Translations:NotBeUndone")}</Text>
{/* <Text color="#c30" fontSize="18px" className="warning-text">
{t("Common:Warning")}!
</Text>
<Text>{t("DeleteUserDataConfirmation")}</Text> */}
</ModalDialog.Body>
<ModalDialog.Footer>
<div className="delete-user-footer">
<Link
className="reassign-data"
isHovered
fontWeight={600}
type={"action"}
>
{t("Translations:ReassignData")}
</Link>
<div className="delete-user-footer-buttons">
<Button
key="OKBtn"
label={t("Common:OKButton")}
@ -107,6 +119,8 @@ class DeleteProfileEverDialogComponent extends React.Component {
onClick={onClose}
isLoading={isRequestRunning}
/>
</div>
</div>
</ModalDialog.Footer>
</ModalDialogContainer>
);

7
products/ASC.People/Client/src/components/dialogs/DeleteUsersDialog/index.js
View File

@ -115,12 +115,9 @@ class DeleteGroupUsersDialogComponent extends React.Component {
onClose={onClose}
autoMaxHeight
>
<ModalDialog.Header>
{t("DeleteGroupUsersMessageHeader")}
</ModalDialog.Header>
<ModalDialog.Header>{t("DeleteUsers")}</ModalDialog.Header>
<ModalDialog.Body>
<Text>{t("DeleteGroupUsersMessage")}</Text>
<Text>{t("Translations:NotBeUndone")}</Text>
<Text>{t("DeleteUsersMessage")}</Text>
</ModalDialog.Body>
<ModalDialog.Footer>
<Button

19
products/ASC.People/Client/src/components/dialogs/ModalDialogContainer.js
View File

@ -93,6 +93,25 @@ const ModalDialogContainer = styled(ModalDialog)`
.heading {
max-width: calc(100% - 32px);
}
.delete-user-footer {
width: 100%;
display: flex;
flex-direction: column;
align-items: start;
justify-content: center;
gap: 16px;
.reassign-data {
text-underline-offset: 0.5px;
}
.delete-user-footer-buttons {
width: 100%;
flex-direction: row;
display: flex;
gap: 8px;
}
}
`;
ModalDialogContainer.defaultProps = { theme: Base };