Merge branch 'zenops_46_wangjianhua_79797' into 'zenops_46'

* Modify lang items about devops.

See merge request easycorp/zentaopms!6528
This commit is contained in:
孙广明
2022-12-13 02:54:50 +00:00
23 changed files with 58 additions and 52 deletions
+1
View File
@@ -6,3 +6,4 @@ $lang->ci->checkCompileStatus = 'Interface: Fetch Test Result.';
$lang->ci->job = 'Construction';
$lang->ci->task = 'Task';
$lang->ci->history = 'History';
$lang->ci->list = 'List';
+1
View File
@@ -6,3 +6,4 @@ $lang->ci->checkCompileStatus = 'Interface: Fetch Test Result.';
$lang->ci->job = 'Job';
$lang->ci->task = 'Task';
$lang->ci->history = 'History';
$lang->ci->list = 'List';
+1
View File
@@ -6,3 +6,4 @@ $lang->ci->checkCompileStatus = 'Interface: Fetch Test Result.';
$lang->ci->job = 'Construction';
$lang->ci->task = 'T鈉he';
$lang->ci->history = 'Historique';
$lang->ci->list = 'List';
+1
View File
@@ -5,3 +5,4 @@ $lang->ci->commitResult = 'Interface: Commit Test Result.';
$lang->ci->job = 'Job';
$lang->ci->task = 'Nhiệm vụ';
$lang->ci->history = 'Lịch sử';
$lang->ci->list = 'List';
+1
View File
@@ -6,3 +6,4 @@ $lang->ci->checkCompileStatus = '接口:获取测试结果';
$lang->ci->job = '构建';
$lang->ci->task = '构建任务';
$lang->ci->history = '构建历史';
$lang->ci->list = '列表';
+1
View File
@@ -6,3 +6,4 @@ $lang->ci->checkCompileStatus = '介面:獲取測試結果';
$lang->ci->job = '構建';
$lang->ci->task = '構建任務';
$lang->ci->history = '構建歷史';
$lang->ci->list = '列表';
+1 -1
View File
@@ -288,7 +288,7 @@ $lang->testcase->case = 'Test Case';
$lang->testcase->testsuite = 'Test Suite';
$lang->testcase->caselib = 'Case Library';
$lang->devops->compile = 'Compile';
$lang->devops->compile = 'Pipelines';
$lang->devops->mr = 'Merge Request';
$lang->devops->repo = 'Repo';
$lang->devops->rules = 'Rule';
+1 -1
View File
@@ -288,7 +288,7 @@ $lang->testcase->case = 'Test Case';
$lang->testcase->testsuite = 'Test Suite';
$lang->testcase->caselib = 'Case Library';
$lang->devops->compile = 'Compile';
$lang->devops->compile = 'Pipelines';
$lang->devops->mr = 'Merge Request';
$lang->devops->repo = 'Repo';
$lang->devops->rules = 'Rule';
+1 -1
View File
@@ -288,7 +288,7 @@ $lang->testcase->case = 'Test Case';
$lang->testcase->testsuite = 'Test Suite';
$lang->testcase->caselib = 'Case Library';
$lang->devops->compile = 'Compile';
$lang->devops->compile = 'Pipelines';
$lang->devops->mr = 'Merge Request';
$lang->devops->repo = 'Repo';
$lang->devops->rules = 'Rule';
+1 -1
View File
@@ -219,7 +219,7 @@ $lang->system->menu->calendar = array('link' => 'Calendar|my|calendar|', 'subMod
$lang->measurement = new stdclass();
$lang->measurement->menu = new stdclass();
$lang->devops->compile = 'Compile';
$lang->devops->compile = 'Pipelines';
$lang->devops->mr = 'Merge Request';
$lang->devops->repo = 'Repo';
$lang->devops->rules = 'Rule';
+1 -1
View File
@@ -288,7 +288,7 @@ $lang->testcase->case = '用例';
$lang->testcase->testsuite = '套件';
$lang->testcase->caselib = '用例库';
$lang->devops->compile = '构建';
$lang->devops->compile = '流水线';
$lang->devops->mr = '合并请求';
$lang->devops->repo = '代码库';
$lang->devops->rules = '指令';
+1 -1
View File
@@ -266,7 +266,7 @@ $lang->testcase->case = '用例';
$lang->testcase->testsuite = '套件';
$lang->testcase->caselib = '用例庫';
$lang->devops->compile = '構建';
$lang->devops->compile = '流水線';
$lang->devops->mr = '合併請求';
$lang->devops->repo = '版本庫';
$lang->devops->rules = '指令';
+1 -1
View File
@@ -7,7 +7,7 @@ $lang->compile->syncCompile = 'Interface: Sync Compiles.';
$lang->compile->id = 'ID';
$lang->compile->name = 'Nom';
$lang->compile->buildType = 'Engine';
$lang->compile->status = 'Statut du Build';
$lang->compile->status = 'Statut';
$lang->compile->time = 'Date/Heure Build';
$lang->compile->result = 'R閟ultat';
$lang->compile->refresh = 'Refresh';
+3 -3
View File
@@ -6,9 +6,9 @@ $lang->compile->syncCompile = '接口:同步构建记录';
$lang->compile->id = 'ID';
$lang->compile->name = '构建名称';
$lang->compile->buildType = '构建引擎';
$lang->compile->status = '构建状态';
$lang->compile->time = '构建时间';
$lang->compile->buildType = '引擎';
$lang->compile->status = '状态';
$lang->compile->time = '最后执行时间';
$lang->compile->result = '构建结果';
$lang->compile->refresh = '刷新';
$lang->compile->job = '构建任务';
+3 -3
View File
@@ -5,9 +5,9 @@ $lang->compile->logs = '構建日誌';
$lang->compile->id = 'ID';
$lang->compile->name = '構建名稱';
$lang->compile->buildType = '構建引擎';
$lang->compile->status = '構建狀態';
$lang->compile->time = '構建時間';
$lang->compile->buildType = '引擎';
$lang->compile->status = '狀態';
$lang->compile->time = '最後執行時間';
$lang->compile->result = '構建結果';
$lang->compile->refresh = '刷新';
$lang->compile->job = '構建任務';
+1 -1
View File
@@ -14,7 +14,7 @@
<div id="mainMenu" class="clearfix">
<div class="btn-toolbar pull-left">
<?php
echo html::a($this->createLink('job', 'browse', "repoID=$repoID"), "<span class='text'>{$lang->ci->task}</span>", '', "class='btn btn-link'");
echo html::a($this->createLink('job', 'browse', "repoID=$repoID"), "<span class='text'>{$lang->ci->list}</span>", '', "class='btn btn-link'");
echo html::a($this->createLink('compile', 'browse', "repoID=$repoID&jobID=$jobID"), "<span class='text'>" . ($jobID ? $job->name : '') . " {$lang->ci->history}</span>", '', "class='btn btn-link btn-active-text'");
?>
</div>
+5 -5
View File
@@ -1,12 +1,12 @@
<?php
$lang->job->common = 'Job';
$lang->job->browse = 'Browse Job';
$lang->job->create = 'Create Job';
$lang->job->edit = 'Edit Job';
$lang->job->exec = 'Execute Job';
$lang->job->browse = 'Browse Pipeline';
$lang->job->create = 'Create Pipeline';
$lang->job->edit = 'Edit Pipeline';
$lang->job->exec = 'Execute Pipeline';
$lang->job->runPipeline = 'Run pipeline';
$lang->job->view = 'Execute Details';
$lang->job->delete = 'Delete Job';
$lang->job->delete = 'Delete Pipeline';
$lang->job->confirmDelete = 'Do you want to delete this job?';
$lang->job->dirChange = 'Directory Changed';
$lang->job->buildTag = 'Build Tag';
+6 -6
View File
@@ -1,13 +1,13 @@
<?php
$lang->job->common = 'Job';
$lang->job->browse = 'Browse Job';
$lang->job->create = 'Create Job';
$lang->job->edit = 'Edit Job';
$lang->job->exec = 'Execute Job';
$lang->job->browse = 'Browse Pipeline';
$lang->job->create = 'Create Pipeline';
$lang->job->edit = 'Edit Pipeline';
$lang->job->exec = 'Execute Pipeline';
$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->delete = 'Delete Pipeline';
$lang->job->confirmDelete = 'Do you want to delete this pipeline?';
$lang->job->dirChange = 'Directory Changed';
$lang->job->buildTag = 'Build Tag';
$lang->job->execSuccess = 'Build success';
+7 -7
View File
@@ -1,14 +1,14 @@
<?php
$lang->job->common = 'Job';
$lang->job->browse = 'Afficher Job';
$lang->job->create = 'Cr閑r Job';
$lang->job->edit = 'Editer Job';
$lang->job->exec = 'Ex閏uter Job';
$lang->job->browse = 'Browse Pipeline';
$lang->job->create = 'Create Pipeline';
$lang->job->edit = 'Edit Pipeline';
$lang->job->exec = 'Execute Pipeline';
$lang->job->runPipeline = 'Run pipeline';
$lang->job->view = 'D閠ails Exec';
$lang->job->delete = 'Supprimer Job';
$lang->job->view = 'Execute Details';
$lang->job->delete = 'Delete Pipeline';
$lang->job->confirmDelete = 'Voullez-vous supprimer ce job ?';
$lang->job->dirChange = 'R閜ertoire change';
$lang->job->dirChange = 'Directory Changed';
$lang->job->buildTag = 'Build Tag';
$lang->job->execSuccess = 'Build success';
+5 -5
View File
@@ -1,11 +1,11 @@
<?php
$lang->job->common = 'Job';
$lang->job->browse = 'Browse Job';
$lang->job->create = 'Tạo Job';
$lang->job->edit = 'Sửa Job';
$lang->job->exec = 'Xử lý Job';
$lang->job->browse = 'Browse Pipeline';
$lang->job->create = 'Tạo Pipeline';
$lang->job->edit = 'Sửa Pipeline';
$lang->job->exec = 'Xử lý Pipeline';
$lang->job->view = 'Execute Details';
$lang->job->delete = 'Xóa Job';
$lang->job->delete = 'Xóa Pipeline';
$lang->job->confirmDelete = 'Bạn có muốn xóa job này?';
$lang->job->dirChange = 'Thư mục đã thay đổi';
$lang->job->buildTag = 'Tag bản dựng';
+6 -6
View File
@@ -1,13 +1,13 @@
<?php
$lang->job->common = '构建任务';
$lang->job->browse = '浏览构建任务';
$lang->job->create = '创建构建任务';
$lang->job->edit = '编辑构建任务';
$lang->job->exec = '执行构建';
$lang->job->create = '添加流水线';
$lang->job->edit = '编辑流水线';
$lang->job->exec = '执行流水线';
$lang->job->runPipeline = '运行流水线';
$lang->job->view = '执行详情';
$lang->job->delete = '删除构建任务';
$lang->job->confirmDelete = '确认删除该构建任务';
$lang->job->delete = '删除流水线';
$lang->job->confirmDelete = '确认删除该流水线';
$lang->job->dirChange = '目录改动';
$lang->job->buildTag = '打标签';
$lang->job->execSuccess = '执行成功';
@@ -23,7 +23,7 @@ $lang->job->jenkins = 'Jenkins';
$lang->job->jkHost = 'Jenkins服务器';
$lang->job->jkJob = 'Jenkins任务';
$lang->job->buildSpec = '构建对象'; // 'pipeline@server'
$lang->job->engine = '构建引擎';
$lang->job->engine = '引擎';
$lang->job->server = '服务器';
$lang->job->pipeline = '流水线';
$lang->job->buildType = '构建类型';
+8 -8
View File
@@ -1,13 +1,13 @@
<?php
$lang->job->common = '構建任務';
$lang->job->browse = '瀏覽構建任務';
$lang->job->create = '創建構建任務';
$lang->job->edit = '編輯構建任務';
$lang->job->browse = '瀏覽流水線';
$lang->job->create = '創建流水線';
$lang->job->edit = '編輯流水線';
$lang->job->exec = '執行構建';
$lang->job->runPipeline = '運行流水綫';
$lang->job->runPipeline = '運行流水線';
$lang->job->view = '執行詳情';
$lang->job->delete = '刪除構建任務';
$lang->job->confirmDelete = '確認刪除該構建任務';
$lang->job->delete = '刪除流水線';
$lang->job->confirmDelete = '確認刪除該流水線';
$lang->job->dirChange = '目錄改動';
$lang->job->buildTag = '打標籤';
$lang->job->execSuccess = '執行成功';
@@ -23,9 +23,9 @@ $lang->job->jenkins = 'Jenkins';
$lang->job->jkHost = 'Jenkins伺服器';
$lang->job->jkJob = 'Jenkins任務';
$lang->job->buildSpec = '構建對象'; // 'pipeline@server'
$lang->job->engine = '構建引擎';
$lang->job->engine = '引擎';
$lang->job->server = '伺服器';
$lang->job->pipeline = '流水綫';
$lang->job->pipeline = '流水線';
$lang->job->buildType = '構建類型';
$lang->job->frame = '工具/框架';
$lang->job->triggerType = '觸發方式';
+1 -1
View File
@@ -13,7 +13,7 @@
<?php include '../../common/view/header.html.php';?>
<div id="mainMenu" class="clearfix">
<div class="btn-toolbar pull-left">
<?php echo html::a($this->createLink('job', 'browse', "repoID=$repoID"), "<span class='text'>{$lang->ci->task}</span>", '', "class='btn btn-link btn-active-text'");?>
<?php echo html::a($this->createLink('job', 'browse', "repoID=$repoID"), "<span class='text'>{$lang->ci->list}</span>", '', "class='btn btn-link btn-active-text'");?>
<?php echo html::a($this->createLink('compile', 'browse', "repoID=$repoID"), "<span class='text'>{$lang->ci->history}</span>", '', "class='btn btn-link'");?>
</div>
<div class="btn-toolbar pull-right">