* Finish task#45440

This commit is contained in:
zenggang
2021-12-08 05:26:59 +00:00
parent ed5a494bf8
commit d5d7e8a578
3 changed files with 12 additions and 1 deletions
+4
View File
@@ -100,6 +100,10 @@ $lang->mr->accessGitlabFailed = "Unable to connect to the GitLab server.";
$lang->mr->reopenSuccess = "The merge request was reopened.";
$lang->mr->closeSuccess = "Merge request closed.";
$lang->mr->apiErrorMap[0] = "You can't use same project/branch for source and target";
$lang->mr->errorLang[0] = 'The source project branch cannot be the same as the target project branch';
$lang->mr->from = "from";
$lang->mr->to = "to";
$lang->mr->at = "at";
+4
View File
@@ -100,6 +100,10 @@ $lang->mr->accessGitlabFailed = "当前无法连接到GitLab服务器。";
$lang->mr->reopenSuccess = "已重新打开合并请求。";
$lang->mr->closeSuccess = "已关闭合并请求。";
$lang->mr->apiErrorMap[0] = "You can't use same project/branch for source and target";
$lang->mr->errorLang[0] = '源项目分支不能和目标项目分支一样';
$lang->mr->from = "从";
$lang->mr->to = "合并到";
$lang->mr->at = "于";
+4 -1
View File
@@ -134,7 +134,10 @@ class mrModel extends model
if(isset($rawMR->message) and !isset($rawMR->iid))
{
$this->dao->delete()->from(TABLE_MR)->where('id')->eq($MRID)->exec();
return array('result' => 'fail', 'message' => sprintf($this->lang->mr->apiError->createMR, $rawMR->message[0]));
$errorKey = array_search($rawMR->message[0], $this->lang->mr->apiErrorMap);
$errorMessage = zget($this->lang->mr->errorLang, $errorKey);
return array('result' => 'fail', 'message' => sprintf($this->lang->mr->apiError->createMR, $errorMessage));
}
/* Create MR failed. */