From 9a6c02867de507cf9e274fe24268d7ed2dc60143 Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Mon, 3 Jun 2019 17:12:25 +0800 Subject: [PATCH 1/4] * Fix testcase view style. --- module/report/css/bugcreate.css | 1 + module/report/lang/en.php | 4 ++-- module/testcase/view/view.html.php | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/module/report/css/bugcreate.css b/module/report/css/bugcreate.css index c46a3f4501..2f2b944cf1 100644 --- a/module/report/css/bugcreate.css +++ b/module/report/css/bugcreate.css @@ -1,2 +1,3 @@ #begin{min-width: 85px} #end{min-width: 85px} +table th{font-size: 12px} diff --git a/module/report/lang/en.php b/module/report/lang/en.php index 8d737d6e1e..2d81bf9d57 100644 --- a/module/report/lang/en.php +++ b/module/report/lang/en.php @@ -49,8 +49,8 @@ $lang->report->deviationChart = $lang->projectCommon . ' Deviation Chart'; $lang->reportList->project->lists[10] = $lang->projectCommon . ' Deviation|report|projectdeviation'; $lang->reportList->product->lists[10] = $lang->productCommon . ' Summary|report|productsummary'; -$lang->reportList->test->lists[10] = 'Bug Reported|report|bugcreate'; -$lang->reportList->test->lists[13] = 'Bug Assigned|report|bugassign'; +$lang->reportList->test->lists[10] = 'Bug Reported Summary|report|bugcreate'; +$lang->reportList->test->lists[13] = 'Bug Assigned Summary|report|bugassign'; $lang->reportList->staff->lists[10] = 'Team Workload|report|workload'; $lang->report->id = 'ID'; diff --git a/module/testcase/view/view.html.php b/module/testcase/view/view.html.php index 9067b0ff5c..5b3a07c532 100644 --- a/module/testcase/view/view.html.php +++ b/module/testcase/view/view.html.php @@ -302,7 +302,7 @@
testcase->legendOpenAndEdit;?>
- getClientLang() == 'en' ? 'w-90px' : 'w-60px';?> + getClientLang() == 'en' ? 'w-100px' : 'w-60px';?> From 029572d70ad1b930a7ea9a55f3971648a55bdd92 Mon Sep 17 00:00:00 2001 From: reneeteng Date: Mon, 3 Jun 2019 17:25:06 +0800 Subject: [PATCH 2/4] * Lang file update. --- module/report/lang/en.php | 4 ++-- module/task/lang/en.php | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/module/report/lang/en.php b/module/report/lang/en.php index 8d737d6e1e..4dd11677ff 100644 --- a/module/report/lang/en.php +++ b/module/report/lang/en.php @@ -80,8 +80,8 @@ $lang->report->typeList['bar'] = 'Bar'; $lang->report->typeList['line'] = 'Line'; $lang->report->conditions = 'Filter by:'; -$lang->report->closedProduct = 'Closed ' . $lang->productCommon; -$lang->report->overduePlan = 'Expired Plan'; +$lang->report->closedProduct = 'Closed ' . $lang->productCommon . 's'; +$lang->report->overduePlan = 'Expired Plans'; /* daily reminder. */ $lang->report->idAB = 'ID'; diff --git a/module/task/lang/en.php b/module/task/lang/en.php index ab486ea74c..c485f5606c 100644 --- a/module/task/lang/en.php +++ b/module/task/lang/en.php @@ -93,7 +93,7 @@ $lang->task->closedBy = 'ClosedBy'; $lang->task->closedDate = 'ClosedDate'; $lang->task->closedReason = 'CloseReason'; $lang->task->lastEditedBy = 'ModifiedBy'; -$lang->task->lastEditedDate = 'ModifiedOn'; +$lang->task->lastEditedDate = 'ModifiedDate'; $lang->task->lastEdited = 'Last Edited'; $lang->task->recordEstimate = '%'; $lang->task->editEstimate = 'Edit Estimates'; @@ -117,8 +117,8 @@ $lang->task->lblTestStory = 'Story Tested'; $lang->task->ditto = 'Ditto'; $lang->task->dittoNotice = "This Task is not linked to the project as the previous one is!"; $lang->task->selectTestStory = 'Select Story Testd'; -$lang->task->selectAllUser = 'All Users'; -$lang->task->noStory = 'No Story'; +$lang->task->selectAllUser = 'Load All Users'; +$lang->task->noStory = 'No Story Linked'; $lang->task->noAssigned = 'Unassigned'; $lang->task->noFinished = 'Unfinished'; $lang->task->noClosed = 'Unclosed'; From 963da6ba24d3768e3ec566b5c03d38834b1a2f52 Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Tue, 4 Jun 2019 08:51:42 +0800 Subject: [PATCH 3/4] * Finish task #5752. --- module/report/css/bugcreate.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/module/report/css/bugcreate.css b/module/report/css/bugcreate.css index 2f2b944cf1..4ce04c08b9 100644 --- a/module/report/css/bugcreate.css +++ b/module/report/css/bugcreate.css @@ -1,3 +1,5 @@ #begin{min-width: 85px} #end{min-width: 85px} table th{font-size: 12px} +table th:nth-child(7){width: 87px} +table th:nth-child(10){width: 100px} From 23eb8f03cb9274ec868bc885b24b574ea8b315e9 Mon Sep 17 00:00:00 2001 From: reneeteng Date: Tue, 4 Jun 2019 09:35:12 +0800 Subject: [PATCH 4/4] * Lang file update. --- module/doc/lang/en.php | 4 ++-- module/misc/lang/en.php | 2 +- module/task/lang/en.php | 2 +- module/testreport/lang/en.php | 6 +++--- module/user/lang/en.php | 4 ++-- module/webhook/lang/en.php | 14 +++++++------- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/module/doc/lang/en.php b/module/doc/lang/en.php index e11a97f834..0c1db84c63 100644 --- a/module/doc/lang/en.php +++ b/module/doc/lang/en.php @@ -150,8 +150,8 @@ $lang->doc->fastMenuIconList['collectedbyme'] = 'icon-folder-star'; $lang->doc->customObjectLibs['files'] = 'Show Attachment Library'; $lang->doc->customObjectLibs['customFiles'] = 'Show Custom Library'; -$lang->doc->orderLib = 'Library Rank Settings'; -$lang->doc->customShowLibs = 'Library Display Settings'; +$lang->doc->orderLib = 'Rank Settings'; +$lang->doc->customShowLibs = 'Display Settings'; $lang->doc->customShowLibsList['zero'] = 'Display Empty Library'; $lang->doc->customShowLibsList['children'] = 'Display Child-category Documents'; $lang->doc->customShowLibsList['unclosed'] = 'Display Active Projects Only'; diff --git a/module/misc/lang/en.php b/module/misc/lang/en.php index 7bcb9e66b0..6a94ecbb98 100644 --- a/module/misc/lang/en.php +++ b/module/misc/lang/en.php @@ -131,7 +131,7 @@ $lang->misc->feature->all['10.4.stable'][] = array('title'=>'Upgrade existing in $lang->misc->feature->all['10.3.stable'][] = array('title'=>'Fix Bug.', 'desc' => ''); $lang->misc->feature->all['10.2.stable'][] = array('title'=>'Xuan.im is integrated!', 'desc' => ''); -$lang->misc->feature->all['10.0.stable'][] = array('title'=>'New UI/UX and new experience', 'desc' => '
  1. My Dashboard
  2. Dynamic
  3. Product Home
  4. Product overview
  5. Roadmap
  6. Project Home
  7. Project overview
  8. QA Home
  9. Document Home
  10. Added work report on My Dashboard
  11. Add/Edit/Finish todos on My Dashboard
  12. Add prodcut report on Product Home
  13. Add prodcut overview on Product Home
  14. Add project report on Project Home
  15. Add project overview on Project Home
  16. Add QA report on QA Home
  17. All Product/product Home/All Project/Project Home/QA Home is moved from the right of the secondary Narbar to the left.
  18. Kanban/Burndown/Tree/ByGroup of Project/Task has been moved from the third Navbar to the secondary one; Tree/ByGroup/Task Liat has been integrated to a drop-down.
  19. Bug/Build of Project on the secondary Navbar has been integrated to a drop-down.
  20. Display build and list by group, which is more reasonable.
  21. Added tree to display docuemnt on the left of the page.
  22. Added quick entry to document, including Last Update, My Doc and My Favorite
  23. Added My Favorite to Doc module.
'); +$lang->misc->feature->all['10.0.stable'][] = array('title'=>'New UI/UX and new experience', 'desc' => '
  1. My Dashboard
  2. Dynamics
  3. Product Home
  4. Product Overview
  5. Roadmap
  6. Project Home
  7. Project overview
  8. QA Home
  9. Document Home
  10. Added work report on My Dashboard
  11. Add/Edit/Finish todos on My Dashboard
  12. Add prodcut report on Product Home
  13. Add prodcut overview on Product Home
  14. Add project report on Project Home
  15. Add project overview on Project Home
  16. Add Testing report on QA Home
  17. All Product/product Home/All Project/Project Home/QA Home is moved from the right of the secondary Navbar to the left.
  18. Kanban/Burndown/Tree/ByGroup of Project/Task has been moved from the third Navbar to the secondary one; Tree/ByGroup/Task List has been integrated to a drop-down.
  19. Bug/Build of Project on the secondary Navbar has been integrated to a drop-down.
  20. Display build and list by group, which is more reasonable.
  21. Added tree to display document on the left of the page.
  22. Added quick entry to document, including Last Update, My Doc and My Favorite
  23. Added My Favorite to Doc module.
'); $lang->misc->feature->all['9.8.stable'][] = array('title'=>'Message centralized management', 'desc' => '

Gather Mail，SMS，webhook into Message

'); $lang->misc->feature->all['9.8.stable'][] = array('title'=>'Add recurred Todo', 'desc' => ''); diff --git a/module/task/lang/en.php b/module/task/lang/en.php index c485f5606c..705f4a7e50 100644 --- a/module/task/lang/en.php +++ b/module/task/lang/en.php @@ -78,7 +78,7 @@ $lang->task->assignTo = $lang->task->assign; $lang->task->batchAssignTo = 'Batch Assign'; $lang->task->assignedTo = 'AssignedTo'; $lang->task->assignedToAB = 'AssignedTo'; -$lang->task->assignedDate = 'AssignedOn'; +$lang->task->assignedDate = 'AssignedDate'; $lang->task->openedBy = 'CreatedBy'; $lang->task->openedDate = 'CreatedDate'; $lang->task->openedDateAB = 'CreatedOn'; diff --git a/module/testreport/lang/en.php b/module/testreport/lang/en.php index ed3c4e41a9..552778d12f 100644 --- a/module/testreport/lang/en.php +++ b/module/testreport/lang/en.php @@ -1,6 +1,6 @@ testreport->common = 'QA Report'; -$lang->testreport->browse = 'QA Report'; +$lang->testreport->common = 'Testing Report'; +$lang->testreport->browse = 'Testing Reports'; $lang->testreport->create = 'Create Report'; $lang->testreport->edit = 'Edit Report'; $lang->testreport->delete = 'Delete'; @@ -64,7 +64,7 @@ $lang->testreport->noReport = "No report has been generated. Please check $lang->testreport->foundBugTip = "Bugs generated in this build and generated in the test period."; $lang->testreport->legacyBugTip = "Active bugs, or solved bugs that are not in the test period."; $lang->testreport->fromCaseBugTip = "Bugs generated due to the failed case run in the test period."; -$lang->testreport->errorTrunk = "You cannot create a Test report for the trunk. Please modify the linked build!"; +$lang->testreport->errorTrunk = "You cannot create a Testing report for the trunk. Please modify the linked build!"; $lang->testreport->moreProduct = "Testing reports can only be generated for the same product."; $lang->testreport->bugSummary = <<user->project = $lang->projectCommon; $lang->user->task = 'Task'; $lang->user->bug = 'Bug'; $lang->user->test = 'QA'; -$lang->user->testTask = 'Request'; -$lang->user->testCase = 'Case'; +$lang->user->testTask = 'Test Request'; +$lang->user->testCase = 'Test Case'; $lang->user->schedule = 'Schedule'; $lang->user->todo = 'Todo'; $lang->user->story = 'Story'; diff --git a/module/webhook/lang/en.php b/module/webhook/lang/en.php index f53824d887..f6b9cfaa9c 100644 --- a/module/webhook/lang/en.php +++ b/module/webhook/lang/en.php @@ -15,7 +15,7 @@ $lang->webhook->delete = 'Delete'; $lang->webhook->id = 'ID'; $lang->webhook->type = 'Type'; $lang->webhook->name = 'Name'; -$lang->webhook->url = 'Webhook Address'; +$lang->webhook->url = 'Webhook URL'; $lang->webhook->domain = 'ZenTao Domain'; $lang->webhook->contentType = 'Content Type'; $lang->webhook->sendType = 'Sending Type'; @@ -55,13 +55,13 @@ $lang->webhook->confirmDelete = 'Do you want to delete this hook?'; $lang->webhook->trimWords = ''; $lang->webhook->note = new stdClass(); -$lang->webhook->note->async = 'If the send type is asynchronous, you need open cron.'; -$lang->webhook->note->product = "All actions will trigger the hook if the {$lang->productCommon} is empty, else only actions of the {$lang->productCommon} will trigger it."; -$lang->webhook->note->project = "All actions will trigger the hook if the {$lang->projectCommon} is empty, else only actions of the {$lang->projectCommon} will trigger it."; +$lang->webhook->note->async = 'If the sending type is asynchronous, you need turn on cron.'; +$lang->webhook->note->product = "All actions will trigger the hook if {$lang->productCommon} is empty, or only actions of {$lang->productCommon} will trigger it."; +$lang->webhook->note->project = "All actions will trigger the hook if {$lang->projectCommon} is empty, or only actions of {$lang->projectCommon} will trigger it."; -$lang->webhook->note->typeList['bearychat'] = 'Add a ZenTao bot in bearychat and get the webhook address.'; -$lang->webhook->note->typeList['dingding'] = 'Add a customed bot in dingding and get the webhook address.'; -$lang->webhook->note->typeList['default'] = 'Get a webhook address from others'; +$lang->webhook->note->typeList['bearychat'] = 'Add a ZenTao bot in bearychat and get the webhook url.'; +$lang->webhook->note->typeList['dingding'] = 'Add a customized bot in dingding and get the webhook url.'; +$lang->webhook->note->typeList['default'] = 'Get a webhook url from others'; $lang->webhook->error = new stdclass(); $lang->webhook->error->curl = 'Load php-curl in php.ini.';
testcase->openedBy;?>