Client:Dialogs:ConflictResolveDialog Fixed translation name space
This commit is contained in:
parent
67f9c3097e
commit
3bd118861a
@ -63,7 +63,7 @@ const ConflictResolveDialog = (props: ConflictResolveDialogProps) => {
|
||||
handleFilesUpload,
|
||||
} = props;
|
||||
|
||||
const { t, ready } = useTranslation(["ConflictResolveDialog", "Common"]);
|
||||
const { t, ready } = useTranslation(["Common"]);
|
||||
|
||||
const {
|
||||
destFolderId,
|
||||
@ -198,7 +198,7 @@ const ConflictResolveDialog = (props: ConflictResolveDialogProps) => {
|
||||
items.length === 1 ? (
|
||||
<Trans
|
||||
t={t}
|
||||
ns="ConflictResolveDialog"
|
||||
ns="Common"
|
||||
i18nKey="ConflictResolveDescription"
|
||||
values={{ file: items[0].title, folder: folderTitle }}
|
||||
components={{ 1: <span className="bold" /> }}
|
||||
@ -206,7 +206,7 @@ const ConflictResolveDialog = (props: ConflictResolveDialogProps) => {
|
||||
) : (
|
||||
<Trans
|
||||
t={t}
|
||||
ns="ConflictResolveDialog"
|
||||
ns="Common"
|
||||
i18nKey="ConflictResolveDescriptionFiles"
|
||||
values={{ filesCount: items.length, folder: folderTitle }}
|
||||
components={{ 1: <span className="bold" /> }}
|
||||
@ -216,20 +216,20 @@ const ConflictResolveDialog = (props: ConflictResolveDialogProps) => {
|
||||
return (
|
||||
<ConflictResolve
|
||||
visible={visible}
|
||||
headerLabel={t("ConflictResolveTitle")}
|
||||
headerLabel={t("Common:ConflictResolveTitle")}
|
||||
isLoading={!ready}
|
||||
onSubmit={isUploadConflict ? onAcceptUploadType : onAcceptType}
|
||||
onClose={onCloseDialog}
|
||||
cancelButtonLabel={t("Common:CancelButton")}
|
||||
submitButtonLabel={t("Common:OKButton")}
|
||||
messageText={messageText}
|
||||
selectActionText={t("ConflictResolveSelectAction")}
|
||||
overwriteTitle={t("OverwriteTitle")}
|
||||
overwriteDescription={t("OverwriteDescription")}
|
||||
selectActionText={t("Common:ConflictResolveSelectAction")}
|
||||
overwriteTitle={t("Common:OverwriteTitle")}
|
||||
overwriteDescription={t("Common:OverwriteDescription")}
|
||||
duplicateTitle={t("Common:CreateFileCopy")}
|
||||
duplicateDescription={t("CreateDescription")}
|
||||
skipTitle={t("SkipTitle")}
|
||||
skipDescription={t("SkipDescription")}
|
||||
duplicateDescription={t("Common:CreateDescription")}
|
||||
skipTitle={t("Common:SkipTitle")}
|
||||
skipDescription={t("Common:SkipDescription")}
|
||||
/>
|
||||
);
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user