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

* Adjust code

Browse Source
This commit is contained in:
zenggang
2021-11-24 06:13:04 +00:00
parent ba8ae82bbc
commit 9b13921ed4
4 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/compile/lang/en.php
+1
View File
@@ -30,3 +30,4 @@ $lang->compile->statusList['building'] = 'Building';
$lang->compile->statusList['create_fail'] = 'Failed to create';
$lang->compile->statusList['timeout'] = 'Timeout';
$lang->compile->statusList['canceled'] = 'Canceled';
$lang->compile->statusList['failed'] = 'Build failed';
module/compile/lang/zh-cn.php
+1
View File
@@ -30,3 +30,4 @@ $lang->compile->statusList['building'] = '构建中';
$lang->compile->statusList['create_fail'] = '创建失败';
$lang->compile->statusList['timeout'] = '执行超时';
$lang->compile->statusList['canceled'] = '已取消';
$lang->compile->statusList['failed'] = '构建失败';
module/mail/model.php
+1 -1
View File
@@ -724,7 +724,7 @@ class mailModel extends model
chdir($modulePath . 'ext/view');
}
ob_start();
include $viewFile;
if($objectType != 'mr') include $viewFile;
foreach(glob($modulePath . 'ext/view/sendmail.*.html.hook.php') as $hookFile) include $hookFile;
$mailContent = ob_get_contents();
ob_end_clean();
module/mr/lang/en.php
+3 -3
View File
@@ -74,8 +74,8 @@ $lang->mr->targetBranch = 'Target branch';
$lang->mr->usersTips = 'Tip: If you cannot choose the assignee, please go to the GitLab page to bind the user first.';
$lang->mr->notFound = "Merge Request does not exist!";
$lang->mr->toCreatedMessage = "The merge request you submitted：<a href='%s'>%s</a>, the build task succeeded.";
$lang->mr->toReviewerMessage = "有一个合并请求：<a href='%s'>%s</a> 待审核。";
$lang->mr->failMessage = "您提交的合并请求：<a href='%s'>%s</a> 构建任务执行失败，查看执行结果。";
$lang->mr->toReviewerMessage = "You have one merge request <a href='%s'>%s</a> waiting.";
$lang->mr->failMessage = "Your merge request <a href='%s'>%s</a> failed. Please check its execution result. ";
$lang->mr->apiError = new stdclass;
$lang->mr->apiError->createMR = "Failed to create a merge request through API. Reason: %s";
@@ -152,4 +152,4 @@ $lang->mr->unlinkTask = "Remove task";
$lang->mr->linkedTasks = 'Task';
$lang->mr->unlinkedTasks = 'Task not linked';
$lang->mr->confirmUnlinkTask = "Are you sure to remove this task?";
$lang->mr->taskSummary = "There are <strong>%s</strong> tasks on this page";
$lang->mr->taskSummary = "There are <strong>%s</strong> tasks on this page";