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

* Fix bug #14996.

Browse Source
This commit is contained in:
dingguodong
2021-09-08 13:58:22 +08:00
parent d3ffc97d41
commit a4be8f518a
3 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/group/lang/resource.php
+2 -1
View File
@@ -1171,7 +1171,8 @@ $lang->mr->methodOrder[10] = 'create';
$lang->mr->methodOrder[15] = 'browse';
$lang->mr->methodOrder[20] = 'edit';
$lang->mr->methodOrder[25] = 'delete';
$lang->mr->methodOrder[35] = 'settings';
$lang->mr->methodOrder[35] = 'view';
$lang->mr->methodOrder[45] = 'accept';
/* Git. */
$lang->resource->git = new stdclass();
module/mr/lang/en.php
+10 -8
View File
@@ -1,15 +1,17 @@
<?php
$lang->mr = new stdclass;
$lang->mr->common = "Merge Request";
$lang->mr->create = "create";
$lang->mr->browse = "browse";
$lang->mr->list = "list";
$lang->mr->edit = "edit";
$lang->mr->delete = "delete";
$lang->mr->view = "view";
$lang->mr->create = "Create";
$lang->mr->browse = "Browse";
$lang->mr->list = "List";
$lang->mr->edit = "Edit";
$lang->mr->delete = "Delete";
$lang->mr->view = "View";
$lang->mr->accept = "Accept";
$lang->mr->source = 'source';
$lang->mr->target = 'target';
$lang->mr->viewDiff = 'view diff';
$lang->mr->viewInGitlab = 'view in GitLab';
$lang->mr->viewDiff = 'View diff';
$lang->mr->viewInGitlab = 'View in GitLab';
$lang->mr->id = 'ID';
$lang->mr->mriid = "raw MR ID";
module/mr/lang/zh-cn.php
+2
View File
@@ -1,4 +1,5 @@
<?php
$lang->mr = new stdclass;
$lang->mr->common = "合并请求";
$lang->mr->create = "创建{$lang->mr->common}";
$lang->mr->browse = "浏览{$lang->mr->common}";
@@ -6,6 +7,7 @@ $lang->mr->list = $lang->mr->browse;
$lang->mr->edit = "编辑{$lang->mr->common}";
$lang->mr->delete = "删除{$lang->mr->common}";
$lang->mr->view = "{$lang->mr->common}详情";
$lang->mr->accept = "合并请求";
$lang->mr->source = '源项目分支';
$lang->mr->target = '目标项目分支';
$lang->mr->viewDiff = '比对代码';