From cb13c64e9c3dfa83997b5a3109659e30ddfa86a1 Mon Sep 17 00:00:00 2001 From: dajiao007 Date: Mon, 9 Jul 2018 09:39:49 +0800 Subject: [PATCH 1/4] * modify english labels --- module/block/lang/en.php | 2 +- module/bug/lang/en.php | 8 ++++---- module/install/lang/en.php | 13 +++++++------ module/install/view/step4.html.php | 4 ++-- module/product/lang/en.php | 2 +- module/project/lang/en.php | 6 +++--- module/project/view/team.html.php | 4 ++-- module/release/lang/en.php | 2 +- module/story/lang/en.php | 2 +- module/testcase/lang/en.php | 6 +++--- module/testtask/lang/en.php | 2 +- 11 files changed, 26 insertions(+), 25 deletions(-) diff --git a/module/block/lang/en.php b/module/block/lang/en.php index ec6fdcad88..3762257c0e 100644 --- a/module/block/lang/en.php +++ b/module/block/lang/en.php @@ -34,7 +34,7 @@ $lang->block->assignToMe = 'Assign To Me'; $lang->block->lblFlowchart = 'Workflow'; $lang->block->welcome = 'Welcome'; -$lang->block->leftToday = 'Work for Today'; +$lang->block->leftToday = 'Works for Today'; $lang->block->myTask = 'My Task'; $lang->block->myStory = 'My Story'; $lang->block->myBug = 'My Bug'; diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php index 11a8cecde6..ca00df987c 100644 --- a/module/bug/lang/en.php +++ b/module/bug/lang/en.php @@ -109,7 +109,7 @@ $lang->bug->resolvedByMe = 'ResolvedByMe'; $lang->bug->closedByMe = 'ClosedByMe'; $lang->bug->assignToNull = 'Unassigned'; $lang->bug->unResolved = 'Unresolved'; -$lang->bug->toClosed = 'ToBeClosed'; +$lang->bug->toClosed = 'Unclosed'; $lang->bug->unclosed = 'Active'; $lang->bug->unconfirmed = 'UnConfirmed'; $lang->bug->longLifeBugs = 'Pending'; @@ -167,7 +167,7 @@ $lang->bug->remindTask = 'This Bug has been converted to Task. Do you $lang->bug->skipClose = 'Bug %s is not resolved. You cannot close it.'; $lang->bug->applyTemplate = 'Template'; $lang->bug->confirmDeleteTemplate = 'Do you want to delete this template?'; -$lang->bug->hasSubmittedTest = 'Development has submitted test application,'; +$lang->bug->hasSubmittedTest = 'Developer has submitted test task,'; $lang->bug->nowToTest = 'Now to test'; /* 模板。*/ @@ -252,8 +252,8 @@ $lang->bug->statusList['active'] = 'Active'; $lang->bug->statusList['resolved'] = 'Resolved'; $lang->bug->statusList['closed'] = 'Closed'; -$lang->bug->confirmedList[1] = 'Yes'; -$lang->bug->confirmedList[0] = 'No'; +$lang->bug->confirmedList[1] = 'Confirmed'; +$lang->bug->confirmedList[0] = 'Unconfirmed'; $lang->bug->resolutionList[''] = ''; $lang->bug->resolutionList['bydesign'] = 'As Design'; diff --git a/module/install/lang/en.php b/module/install/lang/en.php index 05e95dabce..1bbe1c1256 100644 --- a/module/install/lang/en.php +++ b/module/install/lang/en.php @@ -25,14 +25,15 @@ $lang->install->seeLatestRelease = 'View Latest Version'; $lang->install->welcome = 'Thanks for choosing ZenTao Project Management Software!'; $lang->install->license = 'ZenTao PMS is under Z PUBLIC LICENSE(ZPL) 1.2'; $lang->install->desc = <<ZPL license. It integrates with Product Management, Project Management, QA Management, Document Management, To-Dos Management, Company Management etc. ZenTao is the best choice for software project management. +ZenTao Project Management Software is an Open Source software released under ZPL license. It integrates with Product Management, Project Management, QA Management, Document Management, Todos Management, Company Management etc. ZenTao is the best choice for software project management. -ZenTao PMS is built on PHP + MySQL and based on ZenTaoPHP, an independent framework developed by our team. Third party developers/organizations can develop extensions or customize for your requirements. +ZenTao PMS is built on PHP + MySQL and based on ZenTaoPHP framework, an independent framework developed by our team. Third party developers/organizations can develop extensions or customize for their requirements. EOT; $lang->install->links = <<Nature Easy Soft Co., LTD. -Official Website http://www.zentao.pm -Technical Support http://www.zentao.pm/ask/ +Official Website : http://www.zentao.pm +Technical Support : http://www.zentao.pm/forum/ +WhatsApp Group : https://chat.whatsapp.com/B6pi6b3gv0S7x7jqMxwhbF Twitter: cneasysoft You are installing ZenTao %s Version. @@ -97,7 +98,7 @@ $lang->install->dbName = 'Database Name'; $lang->install->dbPrefix = 'Table Prefix'; $lang->install->clearDB = 'Clean tables if already exist.'; $lang->install->importDemoData = 'Import Demo Data'; -$lang->install->working = 'Working way'; +$lang->install->working = 'Work Mode'; $lang->install->requestTypes['GET'] = 'GET'; $lang->install->requestTypes['PATH_INFO'] = 'PATH_INFO'; @@ -167,7 +168,7 @@ $lang->install->login = 'Login ZenTao'; $lang->install->register = 'Register in ZenTao'; $lang->install->joinZentao = <<You have installed ZenTao %s. Please delete install.php asap.

Note: In order to get the latest news of ZenTao, register in ZenTao(www.zentao.pm).

+

You have installed ZenTao %s. Please delete install.php asap.

Note: In order to get the latest news of ZenTao, please register in ZenTao(www.zentao.pm).

EOT; $lang->install->product = array('chanzhi', 'ranzhi'); diff --git a/module/install/view/step4.html.php b/module/install/view/step4.html.php index ec0614dca5..cbe7ca995e 100644 --- a/module/install/view/step4.html.php +++ b/module/install/view/step4.html.php @@ -46,8 +46,8 @@
- - + + diff --git a/module/product/lang/en.php b/module/product/lang/en.php index 82f954b519..c6c59297b7 100644 --- a/module/product/lang/en.php +++ b/module/product/lang/en.php @@ -74,7 +74,7 @@ $lang->product->qa = 'QA'; $lang->product->release = 'Release'; $lang->product->latestDynamic = 'Dynamic'; $lang->product->plan = 'Plan'; -$lang->product->iteration = 'Iteration'; +$lang->product->iteration = 'Version Iteration'; $lang->product->iterationInfo = '%s Iterations'; $lang->product->iterationView = 'Details'; diff --git a/module/project/lang/en.php b/module/project/lang/en.php index 49c1152684..ffe75916c2 100644 --- a/module/project/lang/en.php +++ b/module/project/lang/en.php @@ -58,7 +58,7 @@ $lang->project->product = $lang->project->products; $lang->project->readjustTime = 'Adjust project begin and end time'; $lang->project->readjustTask = 'Adjust task start date and deadline'; $lang->project->effort = 'Effort'; -$lang->project->relatedMember = 'Related Member'; +$lang->project->relatedMember = 'Team Members'; $lang->project->start = 'Start'; $lang->project->activate = 'Activate'; @@ -143,7 +143,7 @@ $lang->project->batchUnlinkStory = 'Batch Unlink Story'; $lang->project->importTask = 'Import Tasks'; $lang->project->importPlanStories = 'Link Story From Plan'; $lang->project->importBug = 'Import Bugs'; -$lang->project->updateOrder = 'Order'; +$lang->project->updateOrder = 'Sort'; $lang->project->tree = 'Tree'; $lang->project->storyKanban = 'Story Kanban'; $lang->project->storySort = 'Sort Story'; @@ -175,7 +175,7 @@ $lang->project->groups['closedBy'] = 'By ClosedBy'; $lang->project->groups['type'] = 'By Type'; $lang->project->groupFilter['story']['all'] = $lang->project->all; -$lang->project->groupFilter['story']['linked'] = 'Task Linked to Story'; +$lang->project->groupFilter['story']['linked'] = 'Tasks Linked to Story'; $lang->project->groupFilter['pri']['all'] = $lang->project->all; $lang->project->groupFilter['pri']['noset'] = 'Not set'; $lang->project->groupFilter['assignedTo']['undone'] = 'Unfinished'; diff --git a/module/project/view/team.html.php b/module/project/view/team.html.php index 6a5344b87c..4bd399692f 100644 --- a/module/project/view/team.html.php +++ b/module/project/view/team.html.php @@ -52,8 +52,8 @@ - - + + diff --git a/module/release/lang/en.php b/module/release/lang/en.php index 81f709f9eb..eeb7abbc80 100644 --- a/module/release/lang/en.php +++ b/module/release/lang/en.php @@ -36,7 +36,7 @@ $lang->release->product = $lang->productCommon; $lang->release->branch = 'Platform/Branch'; $lang->release->build = 'Build'; $lang->release->name = 'Name'; -$lang->release->marker = 'Marker'; +$lang->release->marker = 'Milestone'; $lang->release->date = 'Date'; $lang->release->desc = 'Description'; $lang->release->status = 'Status'; diff --git a/module/story/lang/en.php b/module/story/lang/en.php index 66f820fc6f..b393762bb7 100644 --- a/module/story/lang/en.php +++ b/module/story/lang/en.php @@ -36,7 +36,7 @@ $lang->story->caseCountAB = 'C'; $lang->story->linkStory = 'Link'; $lang->story->unlinkStory = 'UnLinked'; $lang->story->export = "Export Data"; -$lang->story->zeroCase = "Story w/o cases"; +$lang->story->zeroCase = "Stories w/o cases"; $lang->story->zeroTask = "Display stories w/o tasks"; $lang->story->reportChart = "Report"; $lang->story->copyTitle = "Copy Title"; diff --git a/module/testcase/lang/en.php b/module/testcase/lang/en.php index 8c51f67f4d..d92471a1f8 100644 --- a/module/testcase/lang/en.php +++ b/module/testcase/lang/en.php @@ -116,7 +116,7 @@ $lang->testcase->assignToMe = 'AssignedToMe'; $lang->testcase->openedByMe = 'CreatedByMe'; $lang->testcase->allCases = 'All'; $lang->testcase->allTestcases = 'All Cases'; -$lang->testcase->needConfirm = 'Story Change'; +$lang->testcase->needConfirm = 'StoryChanged'; $lang->testcase->bySearch = 'Search'; $lang->testcase->unexecuted = 'Wait'; @@ -169,8 +169,8 @@ $lang->testcase->reviewResultList['pass'] = 'Pass'; $lang->testcase->reviewResultList['clarify'] = 'Clarify'; $lang->testcase->groups[''] = 'Group '; -$lang->testcase->groups['story'] = 'Story Group'; -$lang->testcase->groups['assignedTo'] = 'Assign Group'; +$lang->testcase->groups['story'] = 'Group by Story'; +$lang->testcase->groups['assignedTo'] = 'Group by Assignee'; $lang->testcase->statusList[''] = ''; $lang->testcase->statusList['wait'] = 'Wait'; diff --git a/module/testtask/lang/en.php b/module/testtask/lang/en.php index f7be9aa30a..05ea7c622d 100644 --- a/module/testtask/lang/en.php +++ b/module/testtask/lang/en.php @@ -10,7 +10,7 @@ * @link http://www.zentao.net */ $lang->testtask->index = "Home"; -$lang->testtask->create = "Create Test"; +$lang->testtask->create = "Submit Test"; $lang->testtask->reportChart = 'Report'; $lang->testtask->delete = "Delete"; $lang->testtask->view = "Overview"; From 45df604068925eb8294c56a32a89c2969beb4475 Mon Sep 17 00:00:00 2001 From: dajiao007 Date: Mon, 9 Jul 2018 09:45:33 +0800 Subject: [PATCH 2/4] * modify english labels --- module/block/view/flowchart.html.php | 2 +- module/task/lang/en.php | 2 +- module/todo/lang/en.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/module/block/view/flowchart.html.php b/module/block/view/flowchart.html.php index f955df70bb..722885a0fb 100644 --- a/module/block/view/flowchart.html.php +++ b/module/block/view/flowchart.html.php @@ -26,7 +26,7 @@ - + diff --git a/module/task/lang/en.php b/module/task/lang/en.php index 829c88b28b..3f9c88db00 100644 --- a/module/task/lang/en.php +++ b/module/task/lang/en.php @@ -117,7 +117,7 @@ $lang->task->noStory = 'No Story'; $lang->task->noAssigned = 'Unassigned'; $lang->task->noFinished = 'Unfinished'; $lang->task->noClosed = 'Unclosed'; -$lang->task->yesterdayFinished = 'Finishied Yesterday'; +$lang->task->yesterdayFinished = 'Finished Yesterday'; $lang->task->allTasks = 'All Tasks'; $lang->task->statusList[''] = ''; diff --git a/module/todo/lang/en.php b/module/todo/lang/en.php index b60880779a..a8ff8c85ea 100644 --- a/module/todo/lang/en.php +++ b/module/todo/lang/en.php @@ -89,7 +89,7 @@ if($config->global->flow == 'onlyTask' or $config->global->flow == 'onlyStory') $lang->todo->confirmDelete = "Do you want to delete this Todo?"; $lang->todo->thisIsPrivate = 'This is a private Todo'; -$lang->todo->lblDisableDate = 'Set later'; +$lang->todo->lblDisableDate = 'Set it later'; $lang->todo->lblBeforeDays = "Create a todo %s days(s) earlier"; $lang->todo->lblClickCreate = "Click to add a todo"; $lang->todo->noTodo = 'No todos of this type.'; From 6d2d35bff0fe16e3931a668aa02ef54025292ce7 Mon Sep 17 00:00:00 2001 From: daitingting Date: Mon, 9 Jul 2018 09:56:07 +0800 Subject: [PATCH 3/4] * Adjust status when the old status is done. --- module/upgrade/model.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/module/upgrade/model.php b/module/upgrade/model.php index 1ba716287f..d2fbad788e 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -2247,7 +2247,13 @@ class upgradeModel extends model $this->dao->insert(TABLE_HISTORY)->set('`new`')->eq($action->actor)->set('`field`')->eq('closedBy')->set('`action`')->eq($action->id)->exec(); $this->dao->insert(TABLE_HISTORY)->set('`new`')->eq($action->date)->set('`old`')->eq('0000-00-00 00:00:00')->set('`field`')->eq('closedDate')->set('`action`')->eq($action->id)->exec(); $this->dao->update(TABLE_HISTORY)->set('`new`')->eq('closed')->where('`action`')->eq($action->id)->andWhere('field')->eq('status')->exec(); - $this->dao->update(TABLE_PROJECT)->set('`status`')->eq('closed')->set('`closedBy`')->eq($action->actor)->set('`closedDate`')->eq($action->date)->where('id')->eq($action->objectID)->exec(); + $this->dao->update(TABLE_PROJECT) + ->set('`status`')->eq('closed') + ->set('`closedBy`')->eq($action->actor) + ->set('`closedDate`')->eq($action->date) + ->where('id')->eq($action->objectID) + ->andWhere('status')->eq('done') + ->exec(); } return !dao::isError(); } From 370cdfad9dfe9d96d77561da1cb3d676cccce450 Mon Sep 17 00:00:00 2001 From: liugang Date: Mon, 9 Jul 2018 10:07:52 +0800 Subject: [PATCH 4/4] * Finish task #4634 --- module/task/js/create.js | 17 +---------------- module/task/js/edit.js | 19 ++----------------- module/task/view/create.html.php | 12 ++++++------ module/task/view/edit.html.php | 25 +++++++++++++------------ 4 files changed, 22 insertions(+), 51 deletions(-) diff --git a/module/task/js/create.js b/module/task/js/create.js index bb488c49d9..d39bdacca8 100644 --- a/module/task/js/create.js +++ b/module/task/js/create.js @@ -209,9 +209,6 @@ $(document).ready(function() var adjustButtons = function() { - $taskTeamEditor.find('.btn-move-up.disabled,.btn-move-down.disabled,.btn-delete.disabled').removeClass('disabled').attr('disabled', null); - $taskTeamEditor.find('.btn-move-up:first').addClass('disabled').attr('disabled', 'disabled'); - $taskTeamEditor.find('.btn-move-down:last').addClass('disabled').attr('disabled', 'disabled'); var $deleteBtn = $taskTeamEditor.find('.btn-delete'); if ($deleteBtn.length == 1) $deleteBtn.addClass('disabled').attr('disabled', 'disabled'); }; @@ -233,19 +230,7 @@ $(document).ready(function() $row.remove(); adjustButtons(); }); - }).on('click', '.btn-move-up, .btn-move-down', function() - { - var $this = $(this); - if($this.hasClass('btn-move-up')) - { - $(this).parents('tr').prev().before($(this).parents('tr')); - } - else - { - $this.parents('tr').next().after($(this).parents('tr')); - } - adjustButtons(); - });; + }); adjustButtons(); }); diff --git a/module/task/js/edit.js b/module/task/js/edit.js index da8f2f3044..b457c91982 100644 --- a/module/task/js/edit.js +++ b/module/task/js/edit.js @@ -93,7 +93,7 @@ $(document).ready(function() var $taskTeamEditor = $('#taskTeamEditor').batchActionForm( { idStart: 0, - idEnd: 5, + idEnd: newRowCount - 1, chosen: true, datetimepicker: false, colorPicker: false, @@ -102,9 +102,6 @@ $(document).ready(function() var adjustButtons = function() { - $taskTeamEditor.find('.btn-move-up.disabled,.btn-move-down.disabled,.btn-delete.disabled').removeClass('disabled').attr('disabled', null); - $taskTeamEditor.find('.btn-move-up:first').addClass('disabled').attr('disabled', 'disabled'); - $taskTeamEditor.find('.btn-move-down:last').addClass('disabled').attr('disabled', 'disabled'); var $deleteBtn = $taskTeamEditor.find('.btn-delete'); if ($deleteBtn.length == 1) $deleteBtn.addClass('disabled').attr('disabled', 'disabled'); }; @@ -126,19 +123,7 @@ $(document).ready(function() $row.remove(); adjustButtons(); }); - }).on('click', '.btn-move-up, .btn-move-down', function() - { - var $this = $(this); - if($this.hasClass('btn-move-up')) - { - $(this).parents('tr').prev().before($(this).parents('tr')); - } - else - { - $this.parents('tr').next().after($(this).parents('tr')); - } - adjustButtons(); - });; + }); adjustButtons(); }); diff --git a/module/task/view/create.html.php b/module/task/view/create.html.php index 46ef80ec95..4c173158f2 100644 --- a/module/task/view/create.html.php +++ b/module/task/view/create.html.php @@ -12,6 +12,7 @@ ?> + global->flow == 'onlyTask' || !empty($task->id));?>
@@ -181,7 +182,7 @@
install->company;?>install->company;?>
install->working;?>team->days;?> team->hours;?> team->totalHours;?>team->limited;?>actions;?>team->limited;?>actions;?>
block->role?>block->role?>
- + - diff --git a/module/task/view/edit.html.php b/module/task/view/edit.html.php index add4bc011a..8ea3be1348 100644 --- a/module/task/view/edit.html.php +++ b/module/task/view/edit.html.php @@ -13,11 +13,13 @@ -story); ?> -assignedTo); ?> -project); ?> -task->confirmChangeProject); ?> - + +story);?> +assignedTo);?> +project);?> +task->confirmChangeProject);?> + +team) < 6 ? 6 - count($task->team) : 1);?>
@@ -219,7 +221,7 @@
@@ -190,11 +191,10 @@ task->hour;?> - - - - + + + +
- + team as $member):?> @@ -233,10 +235,10 @@ left, "class='form-control text-center' placeholder='{$lang->task->hour}'")?> - @@ -252,10 +254,9 @@ task->hour}'")?> -
account, "class='form-control chosen'")?> - - + + +
- - + +