1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-02 15:38:15 +00:00

Merge branch '7.0'

This commit is contained in:
shanshuirenjia
2020-03-02 17:52:41 +08:00
2 changed files with 3 additions and 3 deletions

View File

@@ -15,8 +15,8 @@ class CopyMoveDirentProgressDialog extends React.Component {
render() { render() {
let { type , asyncOperationProgress, asyncOperatedFilesLength } = this.props; let { type , asyncOperationProgress, asyncOperatedFilesLength } = this.props;
let title = type === 'move' ? gettext('Move {files_length} items') : gettext('Copy {files_length} items'); let title = type === 'move' ? gettext('Move {num} items') : gettext('Copy {num} items');
title = title.replace('{files_length}', asyncOperatedFilesLength); title = title.replace('{num}', asyncOperatedFilesLength);
let progressStyle = { let progressStyle = {
width: asyncOperationProgress + '%', width: asyncOperationProgress + '%',
lineHeight: '40px', lineHeight: '40px',

View File

@@ -595,7 +595,7 @@ class LibContentView extends React.Component {
this.setState({isCopyMoveProgressDialogShow: false}); this.setState({isCopyMoveProgressDialogShow: false});
let message = gettext('Successfully moved files to another library.'); let message = gettext('Successfully moved files to another library.');
if (asyncOperationType === 'copy') { if (asyncOperationType === 'copy') {
message = gettext('Successfully copyed files to another library.'); message = gettext('Successfully copied files to another library.');
} }
toaster.success(message); toaster.success(message);
return; return;