From 3b543648607bda2fb549233ad6458ceb7e25add4 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Tue, 11 Jun 2019 08:20:49 +0800 Subject: [PATCH] * code for task #5673. --- module/branch/model.php | 3 ++- module/bug/lang/en.php | 2 +- module/dept/lang/en.php | 2 +- module/doc/lang/en.php | 6 +++--- module/group/lang/resource.php | 2 +- module/group/view/privbygroup.html.php | 9 ++++++--- module/product/lang/en.php | 6 +++--- module/productplan/lang/en.php | 4 ++-- module/project/lang/en.php | 16 ++++++++-------- module/story/lang/en.php | 2 +- module/testcase/lang/en.php | 4 ++-- module/testtask/lang/en.php | 8 ++++---- www/theme/default/style.css | 3 +++ 13 files changed, 37 insertions(+), 30 deletions(-) diff --git a/module/branch/model.php b/module/branch/model.php index 1b7e612e50..dda46a5675 100644 --- a/module/branch/model.php +++ b/module/branch/model.php @@ -107,12 +107,13 @@ class branchModel extends model } } + $space = $this->app->getClientLang() == 'en' ? ' ' : ''; foreach($products as $product) { if($product->type == 'normal') continue; if(!isset($branchGroups[$product->id])) $branchGroups[$product->id] = array(); - if(strpos($params, 'noempty') === false) $branchGroups[$product->id] = array('0' => $this->lang->branch->all . $this->lang->product->branchName[$product->type]) + $branchGroups[$product->id]; + if(strpos($params, 'noempty') === false) $branchGroups[$product->id] = array('0' => $this->lang->branch->all . $space . $this->lang->product->branchName[$product->type]) + $branchGroups[$product->id]; } return $branchGroups; diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php index 7f954f2bdb..49fad6fef2 100644 --- a/module/bug/lang/en.php +++ b/module/bug/lang/en.php @@ -85,7 +85,7 @@ $lang->bug->batchChangeBranch = 'Batch Modify Branch'; $lang->bug->batchClose = 'Batch Close'; $lang->bug->assignTo = 'Assign'; $lang->bug->batchAssignTo = 'Batch Assign'; -$lang->bug->browse = 'Bugs'; +$lang->bug->browse = 'Bug List'; $lang->bug->view = 'Bug Detail'; $lang->bug->resolve = 'Resolve Bug'; $lang->bug->batchResolve = 'Batch Resolve'; diff --git a/module/dept/lang/en.php b/module/dept/lang/en.php index 5754c6eeb8..4c0690b269 100644 --- a/module/dept/lang/en.php +++ b/module/dept/lang/en.php @@ -10,7 +10,7 @@ * @link http://www.zentao.net */ $lang->dept->common = 'Department'; -$lang->dept->manageChild = "Department"; +$lang->dept->manageChild = "Child Department"; $lang->dept->edit = "Edit"; $lang->dept->delete = "Delete"; $lang->dept->parent = "Parent Dept"; diff --git a/module/doc/lang/en.php b/module/doc/lang/en.php index a8f46ddcc3..cffe7e7b3b 100644 --- a/module/doc/lang/en.php +++ b/module/doc/lang/en.php @@ -68,8 +68,8 @@ $lang->doc->index = 'Document Home'; $lang->doc->create = 'Create Document'; $lang->doc->edit = 'Edit Document'; $lang->doc->delete = 'Delete'; -$lang->doc->browse = 'List'; -$lang->doc->view = 'Detail'; +$lang->doc->browse = 'Document List'; +$lang->doc->view = 'Document Detail'; $lang->doc->diff = 'Diff'; $lang->doc->sort = 'Sort'; $lang->doc->manageType = 'Manage Category'; @@ -86,7 +86,7 @@ $lang->doc->libType = 'Category'; $lang->doc->custom = 'Custom Document Library'; $lang->doc->customAB = 'Custom Doc Lib'; $lang->doc->createLib = 'Create Document Library'; -$lang->doc->allLibs = 'Libraries'; +$lang->doc->allLibs = 'Library List'; $lang->doc->objectLibs = "{$lang->productCommon}/{$lang->projectCommon} Libraries"; $lang->doc->showFiles = 'Attachments'; $lang->doc->editLib = 'Edit Document Library'; diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index 1cc2e5fa22..19fa620b03 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -587,7 +587,7 @@ $lang->resource->testtask->index = 'index'; $lang->resource->testtask->create = 'create'; $lang->resource->testtask->browse = 'browse'; $lang->resource->testtask->view = 'view'; -$lang->resource->testtask->cases = 'lblCases'; +$lang->resource->testtask->cases = 'cases'; $lang->resource->testtask->groupCase = 'groupCase'; $lang->resource->testtask->edit = 'edit'; $lang->resource->testtask->start = 'start'; diff --git a/module/group/view/privbygroup.html.php b/module/group/view/privbygroup.html.php index 07e1065b0c..d9b6da5a14 100644 --- a/module/group/view/privbygroup.html.php +++ b/module/group/view/privbygroup.html.php @@ -26,7 +26,8 @@ '> - my->common;?> + getClientLang() == 'en' ? 'w-160px' : 'w-150px';?> + my->common;?>
/> @@ -72,7 +73,8 @@ - + getClientLang() == 'en' ? 'w-160px' : 'w-150px';?> + @@ -96,7 +98,8 @@ } ?> '> -
group->module;?>group->module;?> group->method;?>
+ getClientLang() == 'en' ? 'w-160px' : 'w-150px';?> +
diff --git a/module/product/lang/en.php b/module/product/lang/en.php index 7815d4276e..818d025893 100644 --- a/module/product/lang/en.php +++ b/module/product/lang/en.php @@ -11,7 +11,7 @@ */ $lang->product->common = $lang->productCommon; $lang->product->index = $lang->productCommon . ' Home'; -$lang->product->browse = 'Story'; +$lang->product->browse = 'Story List'; $lang->product->dynamic = 'Dynamics'; $lang->product->view = 'Overview'; $lang->product->edit = "Edit {$lang->productCommon}"; @@ -39,9 +39,9 @@ $lang->product->projects = "Linked {$lang->projectCommon}"; $lang->product->cases = 'Case'; $lang->product->builds = 'Build'; $lang->product->roadmap = 'Roadmap'; -$lang->product->doc = 'Doc'; +$lang->product->doc = 'Documents'; $lang->product->project = $lang->projectCommon . ' List'; -$lang->product->build = 'Build'; +$lang->product->build = 'Build List'; $lang->product->projectInfo = "{$lang->projectCommon}s that are linked to this {$lang->productCommon} are listed below."; $lang->product->currentProject = "{$lang->projectCommon}"; diff --git a/module/productplan/lang/en.php b/module/productplan/lang/en.php index 123565a0cd..e757dac632 100644 --- a/module/productplan/lang/en.php +++ b/module/productplan/lang/en.php @@ -14,8 +14,8 @@ $lang->productplan->browse = "Plans"; $lang->productplan->index = "List"; $lang->productplan->create = "Create Plan"; $lang->productplan->edit = "Edit Plan"; -$lang->productplan->delete = "Delete"; -$lang->productplan->view = "Detail"; +$lang->productplan->delete = "Delete Plan"; +$lang->productplan->view = "Plan Detail"; $lang->productplan->bugSummary = "Total %s Bugs on this page."; $lang->productplan->basicInfo = 'Basic Info'; $lang->productplan->batchEdit = 'Batch Edit'; diff --git a/module/project/lang/en.php b/module/project/lang/en.php index 490da7e453..5605f37860 100644 --- a/module/project/lang/en.php +++ b/module/project/lang/en.php @@ -107,13 +107,13 @@ $lang->project->aclList['custom'] = 'Whitelist (Team members and the whitelist /* 方法列表。*/ $lang->project->index = "Project Home"; -$lang->project->task = 'Tasks'; +$lang->project->task = 'Task List'; $lang->project->groupTask = 'Group View'; -$lang->project->story = 'Story'; -$lang->project->bug = 'Bug'; +$lang->project->story = 'Story List'; +$lang->project->bug = 'Bug List'; $lang->project->dynamic = 'Dynamics'; $lang->project->latestDynamic = 'Dynamics'; -$lang->project->build = 'Build'; +$lang->project->build = 'Build List'; $lang->project->testtask = 'Request'; $lang->project->burn = 'Burndown'; $lang->project->computeBurn = 'Update'; @@ -132,18 +132,18 @@ $lang->project->unlinkedProducts = 'Unlinked Products'; $lang->project->view = "Overview"; $lang->project->create = "Create {$lang->projectCommon}"; $lang->project->copy = "Copy {$lang->projectCommon}"; -$lang->project->delete = "Delete"; -$lang->project->browse = "Browse"; +$lang->project->delete = "Delete {$lang->projectCommon}"; +$lang->project->browse = "{$lang->projectCommon} List"; $lang->project->edit = "Edit Project"; $lang->project->batchEdit = "Batch Edit"; $lang->project->manageMembers = 'Manage Team'; $lang->project->unlinkMember = 'Remove Member'; -$lang->project->unlinkStory = 'Unlink'; +$lang->project->unlinkStory = 'Unlink Story'; $lang->project->batchUnlinkStory = 'Batch Unlink Stories'; $lang->project->importTask = 'Transfer Task'; $lang->project->importPlanStories = 'Link Stories By Plans'; $lang->project->importBug = 'Import Bug'; -$lang->project->updateOrder = 'Rank'; +$lang->project->updateOrder = "Rank {$lang->projectCommon}"; $lang->project->tree = 'Tree'; $lang->project->treeTask = 'Show Task Only'; $lang->project->treeStory = 'Show Story Only'; diff --git a/module/story/lang/en.php b/module/story/lang/en.php index 930050bf72..7b1c5539b0 100644 --- a/module/story/lang/en.php +++ b/module/story/lang/en.php @@ -35,7 +35,7 @@ $lang->story->caseCount = 'Cases'; $lang->story->taskCountAB = 'T'; $lang->story->bugCountAB = 'B'; $lang->story->caseCountAB = 'C'; -$lang->story->linkStory = 'Link'; +$lang->story->linkStory = 'Link Story'; $lang->story->unlinkStory = 'UnLinked'; $lang->story->export = "Export"; $lang->story->zeroCase = "Story with 0 case"; diff --git a/module/testcase/lang/en.php b/module/testcase/lang/en.php index 8708706725..c08aa1b077 100644 --- a/module/testcase/lang/en.php +++ b/module/testcase/lang/en.php @@ -94,8 +94,8 @@ $lang->testcase->delete = "Delete"; $lang->testcase->batchDelete = "Batch Delete "; $lang->testcase->batchConfirmStoryChange = "Batch Confirm"; $lang->testcase->batchCaseTypeChange = "Batch Change Type"; -$lang->testcase->browse = "Case"; -$lang->testcase->groupCase = "By Group"; +$lang->testcase->browse = "Case List"; +$lang->testcase->groupCase = "View By Group"; $lang->testcase->import = "Import"; $lang->testcase->importFile = "Import CSV"; $lang->testcase->importFromLib = "Import From Library"; diff --git a/module/testtask/lang/en.php b/module/testtask/lang/en.php index 403bbb29ef..f8923de09b 100644 --- a/module/testtask/lang/en.php +++ b/module/testtask/lang/en.php @@ -23,11 +23,11 @@ $lang->testtask->batchUnlinkCases = "Batch Unlink Case"; $lang->testtask->batchAssign = "Batch Assign"; $lang->testtask->runCase = "Run"; $lang->testtask->batchRun = "Batch Run"; -$lang->testtask->results = "Result"; +$lang->testtask->results = "Case Result"; $lang->testtask->createBug = "Bug(+)"; $lang->testtask->assign = 'Assign'; -$lang->testtask->cases = 'Case'; -$lang->testtask->groupCase = "By Group"; +$lang->testtask->cases = 'Case List'; +$lang->testtask->groupCase = "View By Group"; $lang->testtask->pre = 'Prev.'; $lang->testtask->next = 'Next'; $lang->testtask->start = "Start"; @@ -64,7 +64,7 @@ $lang->testtask->lastRunTime = 'Last Run'; $lang->testtask->lastRunResult = 'Result'; $lang->testtask->reportField = 'Report'; $lang->testtask->files = 'Upload'; -$lang->testtask->case = 'Case'; +$lang->testtask->case = 'Case List'; $lang->testtask->version = 'Version'; $lang->testtask->caseResult = 'Test Result'; $lang->testtask->stepResults = 'Step Result'; diff --git a/www/theme/default/style.css b/www/theme/default/style.css index 7d7d7b1b53..03df163154 100644 --- a/www/theme/default/style.css +++ b/www/theme/default/style.css @@ -26,3 +26,6 @@ /* Pager v-align. */ .pager>li>.pager-label { padding: 2px; line-height: 21px; } + +.side .leftmenu .nav-primary>li.active>a { background-color: #e7f1fc;} +.side .leftmenu .nav-primary>li.active>a:hover {background-color: #006af1;}