From 127da2bfc62cb32783e82f99ab540ed2016cdc7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B9=BF=E6=98=8E?= Date: Wed, 16 Feb 2022 10:04:38 +0800 Subject: [PATCH] * Add finished notice. --- module/convert/control.php | 5 +++-- module/convert/lang/en.php | 1 + module/convert/lang/zh-cn.php | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/module/convert/control.php b/module/convert/control.php index d4fc93ae1b..b6f5c54f86 100644 --- a/module/convert/control.php +++ b/module/convert/control.php @@ -453,8 +453,9 @@ class convert extends control $result = $method == 'db' ? $this->convert->importJiraFromDB($type, $lastID, $createTable) : $this->convert->importJiraFromFile($type, $lastID, $createTable); if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError())); if(isset($result['finished']) and $result['finished']) - { - return print $this->send(array('result' => 'finished', 'message' => $this->lang->convert->jira->importSuccessfully)); + { + $message = $method == 'db' ? $this->lang->convert->jira->importSuccessfully : $this->lang->convert->jira->importSuccessfully . sprintf($this->lang->convert->jira->removeFile, $this->app->getTmpRoot() . 'jirafile/'); + return print $this->send(array('result' => 'finished', 'message' => $message)); } else { diff --git a/module/convert/lang/en.php b/module/convert/lang/en.php index be6c7758d9..9ae533f8c7 100644 --- a/module/convert/lang/en.php +++ b/module/convert/lang/en.php @@ -156,6 +156,7 @@ $lang->convert->jira->importResult = "Import %sconvert->jira->importing = 'Data is being imported, please do not switch to other pages.'; $lang->convert->jira->importingAB = 'Data Import'; $lang->convert->jira->imported = 'Data Import Complete'; +$lang->convert->jira->removeFile = "Please remove %s"; $lang->convert->jira->zentaoObjectList[''] = ''; $lang->convert->jira->zentaoObjectList['task'] = 'Task'; diff --git a/module/convert/lang/zh-cn.php b/module/convert/lang/zh-cn.php index 4893ba7692..5107243a82 100644 --- a/module/convert/lang/zh-cn.php +++ b/module/convert/lang/zh-cn.php @@ -156,6 +156,7 @@ $lang->convert->jira->importResult = "导入 %sconvert->jira->importing = '数据导入中,请不要切换其它页面'; $lang->convert->jira->importingAB = '数据导入中'; $lang->convert->jira->imported = '数据导入完成'; +$lang->convert->jira->removeFile = "请手动清空 %s 下的文件"; $lang->convert->jira->zentaoObjectList[''] = ''; $lang->convert->jira->zentaoObjectList['task'] = '任务';