From 01bfc4f928ebeea648bedddb2f72c58b82226c50 Mon Sep 17 00:00:00 2001 From: zenggang Date: Fri, 24 Dec 2021 08:24:05 +0000 Subject: [PATCH] * Fix bug#17941 --- module/mr/lang/en.php | 2 +- module/mr/lang/zh-cn.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/module/mr/lang/en.php b/module/mr/lang/en.php index 22bdd4d3b4..154f68e365 100644 --- a/module/mr/lang/en.php +++ b/module/mr/lang/en.php @@ -113,7 +113,7 @@ $lang->mr->apiErrorMap[1] = "You can't use same project/branch for source and ta $lang->mr->apiErrorMap[2] = "/Another open merge request already exists for this source branch: !([0-9]+)/"; $lang->mr->errorLang[1] = 'The source project branch cannot be the same as the target project branch'; -$lang->mr->errorLang[2] = 'Another open merge request already exists for this source branch: !%u'; +$lang->mr->errorLang[2] = 'Another open merge request already exists for this source branch: ID%u'; $lang->mr->from = "from"; $lang->mr->to = "to"; diff --git a/module/mr/lang/zh-cn.php b/module/mr/lang/zh-cn.php index a3cf83111e..3d59b59dbc 100644 --- a/module/mr/lang/zh-cn.php +++ b/module/mr/lang/zh-cn.php @@ -113,7 +113,7 @@ $lang->mr->apiErrorMap[1] = "You can't use same project/branch for source and ta $lang->mr->apiErrorMap[2] = "/Another open merge request already exists for this source branch: !([0-9]+)/"; $lang->mr->errorLang[1] = '源项目分支与目标项目分支不能相同'; -$lang->mr->errorLang[2] = '存在另外一个同样的合并请求在源项目分支中: !%u'; +$lang->mr->errorLang[2] = '存在另外一个同样的合并请求在源项目分支中: ID%u'; $lang->mr->from = "从"; $lang->mr->to = "合并到";