Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Add finished notice.

Browse Source
This commit is contained in:
孙广明
2022-02-16 10:04:55 +08:00
parent 7cfb1c2e9c
commit 127da2bfc6
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/convert/control.php
+3 -2
View File
@@ -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
{
module/convert/lang/en.php
+1
View File
@@ -156,6 +156,7 @@ $lang->convert->jira->importResult = "Import <strong class='text-red'>%s</
$lang->convert->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 <strong class='text-red'>%s</strong>";
$lang->convert->jira->zentaoObjectList[''] = '';
$lang->convert->jira->zentaoObjectList['task'] = 'Task';
module/convert/lang/zh-cn.php
+1
View File
@@ -156,6 +156,7 @@ $lang->convert->jira->importResult = "导入 <strong class='text-red'>%s</
$lang->convert->jira->importing = '数据导入中，请不要切换其它页面';
$lang->convert->jira->importingAB = '数据导入中';
$lang->convert->jira->imported = '数据导入完成';
$lang->convert->jira->removeFile = "请手动清空 <strong class='text-red'>%s</strong> 下的文件";
$lang->convert->jira->zentaoObjectList[''] = '';
$lang->convert->jira->zentaoObjectList['task'] = '任务';