diff --git a/module/convert/control.php b/module/convert/control.php index bbacc8ca58..22cf6720db 100644 --- a/module/convert/control.php +++ b/module/convert/control.php @@ -311,7 +311,7 @@ class convert extends control if(!file_exists($jiraFilePath . 'entities.xml')) { $response['result'] = 'fail'; - $response['message'] = $this->lang->convert->jira->notExistEntities; + $response['message'] = sprintf($this->lang->convert->jira->notExistEntities, $jiraFilePath . 'entities.xml'); return print($this->send($response)); } diff --git a/module/convert/lang/en.php b/module/convert/lang/en.php index b8c9b09255..f3cc9b5845 100644 --- a/module/convert/lang/en.php +++ b/module/convert/lang/en.php @@ -145,7 +145,7 @@ $lang->convert->jira->dbNameEmpty = 'Jira database name cannot be empty!' $lang->convert->jira->invalidDB = 'Invalid database name!'; $lang->convert->jira->invalidTable = 'This database is not a Jira database!'; $lang->convert->jira->notReadAndWrite = 'Please modify the jirafile directory permissions!'; -$lang->convert->jira->notExistEntities = 'The entities.xml file does not exist!'; +$lang->convert->jira->notExistEntities = 'The %s file does not exist!'; $lang->convert->jira->passwordNotice = "Set the default password of Jira users after they are imported into ZenTao. Users can modify the password in ZenTao later."; $lang->convert->jira->groupNotice = "Set the default permission grouping of Jira users after importing into ZenTao."; $lang->convert->jira->passwordDifferent = 'Password do not match!'; diff --git a/module/convert/lang/zh-cn.php b/module/convert/lang/zh-cn.php index cbbae1498e..77c746f9bb 100644 --- a/module/convert/lang/zh-cn.php +++ b/module/convert/lang/zh-cn.php @@ -145,7 +145,7 @@ $lang->convert->jira->dbNameEmpty = 'Jira数据库名字不能为空!'; $lang->convert->jira->invalidDB = '无效的数据库名!'; $lang->convert->jira->invalidTable = '本数据库非Jira数据库!'; $lang->convert->jira->notReadAndWrite = '请修改jirafile目录权限!'; -$lang->convert->jira->notExistEntities = 'entities.xml 该文件不存在!'; +$lang->convert->jira->notExistEntities = '%s 文件不存在!'; $lang->convert->jira->passwordNotice = "设置Jira用户导入到禅道后的默认密码,用户后续可以在禅道中自行修改密码。"; $lang->convert->jira->groupNotice = "设置Jira用户导入到禅道后的默认权限分组。"; $lang->convert->jira->passwordDifferent = '两次密码不一致!';