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/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 @@ - block->role?> + block->role?>
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/search/control.php b/module/search/control.php index 5b97e5e809..b07809e4ae 100644 --- a/module/search/control.php +++ b/module/search/control.php @@ -70,7 +70,9 @@ class search extends control $queryID = $this->search->saveQuery(); if(!$queryID) die(js::error(dao::getError())); - die(js::closeModal('parent.parent', '', "function(){parent.parent.loadQueries($queryID)}")); + $data = fixer::input('post')->get(); + $shortcut = empty($data->onMenuBar) ? 0 : 1; + die(js::closeModal('parent.parent', '', "function(){parent.parent.loadQueries($queryID, $shortcut, '{$data->title}')}")); } $this->view->module = $module; $this->view->onMenuBar = $onMenuBar; @@ -109,7 +111,7 @@ class search extends control foreach($queries as $queryID => $queryName) { if(empty($queryID)) continue; - $html .= html::a("###", $queryName . (common::hasPriv('search', 'deleteQuery') ? '' : ''), '', "class='label user-query' data-query-id='$queryID'"); + $html .= '
  • ' . html::a("javascript:executeQuery({$queryID})", $queryName . (common::hasPriv('search', 'deleteQuery') ? '' : ''), '', "class='label user-query' data-query-id='$queryID'") . '
    • '; } die($html); } diff --git a/module/search/lang/en.php b/module/search/lang/en.php index 7c005f8309..ead6467fbd 100644 --- a/module/search/lang/en.php +++ b/module/search/lang/en.php @@ -24,6 +24,7 @@ $lang->search->select = 'Stories/Tasks Filter'; $lang->search->me = 'Me'; $lang->search->noQuery = 'No query saved!'; $lang->search->onMenuBar = 'Show in Menu'; +$lang->search->custom = 'Custom'; $lang->search->account = 'Account'; $lang->search->module = 'Module'; diff --git a/module/search/lang/zh-cn.php b/module/search/lang/zh-cn.php index cc98ff7208..7a2fc64bb0 100644 --- a/module/search/lang/zh-cn.php +++ b/module/search/lang/zh-cn.php @@ -24,6 +24,7 @@ $lang->search->select = '需求/任务筛选'; $lang->search->me = '自己'; $lang->search->noQuery = '还没有保存查询！'; $lang->search->onMenuBar = '显示在菜单栏'; +$lang->search->custom = '自定义'; $lang->search->account = '用户名'; $lang->search->module = '模块'; diff --git a/module/search/view/buildform.html.php b/module/search/view/buildform.html.php index 6954877b6c..cdb3894e15 100644 --- a/module/search/view/buildform.html.php +++ b/module/search/view/buildform.html.php @@ -217,6 +217,7 @@ foreach($fieldParams as $fieldName => $param)
    install->company;?>install->company;?>
    install->working;?>team->days;?> team->hours;?> team->totalHours;?>team->limited;?>actions;?>team->limited;?>actions;?>
    +search->custom);?>