diff --git a/module/compile/lang/en.php b/module/compile/lang/en.php index 40662de94b..be4fc2ac57 100644 --- a/module/compile/lang/en.php +++ b/module/compile/lang/en.php @@ -3,15 +3,20 @@ $lang->compile->common = 'Compile'; $lang->compile->browse = 'History'; $lang->compile->logs = 'Log'; -$lang->compile->id = 'ID'; -$lang->compile->name = 'Name'; -$lang->compile->status = 'Status'; -$lang->compile->time = 'Time'; -$lang->compile->result = 'Result'; +$lang->compile->id = 'ID'; +$lang->compile->name = 'Name'; +$lang->compile->buildType = 'Engine'; +$lang->compile->status = 'Status'; +$lang->compile->time = 'Time'; +$lang->compile->result = 'Result'; +$lang->compile->refresh = 'Refresh'; $lang->compile->statusList['success'] = 'Done'; $lang->compile->statusList['failure'] = 'Failed'; $lang->compile->statusList['created'] = 'Created'; -$lang->compile->statusList['building'] = 'Creating'; +$lang->compile->statusList['pending'] = 'Pending'; +$lang->compile->statusList['running'] = 'Running'; +$lang->compile->statusList['building'] = 'Building'; $lang->compile->statusList['create_fail'] = 'Failed to create'; $lang->compile->statusList['timeout'] = 'Timeout'; +$lang->compile->statusList['canceled'] = 'Canceled'; diff --git a/module/job/lang/en.php b/module/job/lang/en.php index 3cf9727194..93bcaf271d 100644 --- a/module/job/lang/en.php +++ b/module/job/lang/en.php @@ -4,11 +4,13 @@ $lang->job->browse = 'Browse Job'; $lang->job->create = 'Create Job'; $lang->job->edit = 'Edit Job'; $lang->job->exec = 'Execute Job'; +$lang->job->runPipeline = 'Run pipeline'; $lang->job->view = 'Execute Details'; $lang->job->delete = 'Delete Job'; $lang->job->confirmDelete = 'Do you want to delete this job?'; $lang->job->dirChange = 'Directory Changed'; $lang->job->buildTag = 'Build Tag'; +$lang->job->execSuccess = 'Build success'; $lang->job->browseAction = 'Job List'; @@ -20,6 +22,7 @@ $lang->job->svnDir = 'SVN Tag Watch Path'; $lang->job->jenkins = 'Jenkins'; $lang->job->jkHost = 'Jenkins Server'; $lang->job->jkJob = 'Jenkins Task'; +$lang->job->buildSpec = 'Build Target'; // 'pipeline@server' $lang->job->engine = 'Engine'; $lang->job->server = 'Server'; $lang->job->pipeline = 'Pipeline'; @@ -68,3 +71,19 @@ $lang->job->paramValueList['$zentao_version'] = 'Current version'; $lang->job->paramValueList['$zentao_account'] = 'Current user'; $lang->job->paramValueList['$zentao_product'] = 'Current product ID'; $lang->job->paramValueList['$zentao_repopath'] = 'Current version library path'; + +$lang->job->engineList = array(); +$lang->job->engineList[''] = ''; +$lang->job->engineList['gitlab'] = 'GitLab'; +$lang->job->engineList['jenkins'] = 'Jenkins'; + +$lang->job->engineTips = new stdclass; +$lang->job->engineTips->success = 'Build engine will use the built pipeline in GitLab.'; +$lang->job->engineTips->error = 'No pipeline is currently available in the GitLab project, please go to GitLab configuration first. '; + +$lang->job->pipeline = new stdclass; +$lang->job->pipeline->pipelineTips = "Run for branch name or tag"; +$lang->job->pipeline->variables = "Variables"; +$lang->job->pipeline->variablesKeyPlaceHolder = "Input variable key"; +$lang->job->pipeline->variablesValuePlaceHolder = "Input variable value"; +$lang->job->pipeline->variablesTips = "Specify variable values to be used in this run. The values specified in CI/CD settings will be used by default."; diff --git a/module/job/lang/zh-cn.php b/module/job/lang/zh-cn.php index 0176c33f7a..e091cdb0e1 100644 --- a/module/job/lang/zh-cn.php +++ b/module/job/lang/zh-cn.php @@ -72,7 +72,6 @@ $lang->job->paramValueList['$zentao_account'] = '当前用户名'; $lang->job->paramValueList['$zentao_product'] = '当前产品ID'; $lang->job->paramValueList['$zentao_repopath'] = '当前版本库路径'; - $lang->job->engineList = array(); $lang->job->engineList[''] = ''; $lang->job->engineList['gitlab'] = 'GitLab';