Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'master' of https://github.com/easysoft/zentaopms

Browse Source
This commit is contained in:
yfl
2019-04-17 09:39:25 +08:00
parent 25294fc6e4 204390100d
commit 1f8899a848
15 changed files with 298 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/action/lang/en.php
+9 -9
View File
@@ -153,7 +153,7 @@ $lang->action->label->blocked = 'blocked ';
$lang->action->label->resolved = 'resolved ';
$lang->action->label->reviewed = 'reviewed ';
$lang->action->label->moved = 'moved ';
$lang->action->label->confirmed = 'Confirm Story';
$lang->action->label->confirmed = 'Confirmed Story';
$lang->action->label->bugconfirmed = 'Confirmed';
$lang->action->label->tostory = 'Convert to Story';
$lang->action->label->frombug = 'Converted from Bug';
@@ -170,14 +170,14 @@ $lang->action->label->unlinkedfromproject = "Unlink {$lang->projectCommon}";
$lang->action->label->unlinkedfrombuild = "Unlink Build";
$lang->action->label->linked2release = "Link Release";
$lang->action->label->unlinkedfromrelease = "Unlink Release";
$lang->action->label->linkrelatedbug = "Link to Bug";
$lang->action->label->unlinkrelatedbug = "Unlink";
$lang->action->label->linkrelatedcase = "Link to Case";
$lang->action->label->unlinkrelatedcase = "Unlink";
$lang->action->label->linkrelatedstory = "Link to Story";
$lang->action->label->unlinkrelatedstory = "Unlink";
$lang->action->label->subdividestory = "Decompose Story";
$lang->action->label->unlinkchildstory = "Unlink";
$lang->action->label->linkrelatedbug = "Linked Bug";
$lang->action->label->unlinkrelatedbug = "Unlinked Bug";
$lang->action->label->linkrelatedcase = "Linked Case";
$lang->action->label->unlinkrelatedcase = "Unlinked Case";
$lang->action->label->linkrelatedstory = "Linked Story";
$lang->action->label->unlinkrelatedstory = "Unlinked Story";
$lang->action->label->subdividestory = "Decomposed Story";
$lang->action->label->unlinkchildstory = "Unlinked Story";
$lang->action->label->started = 'started ';
$lang->action->label->restarted = 'continued ';
$lang->action->label->recordestimate = 'recorded ';
module/admin/lang/en.php
+10 -1
View File
@@ -38,13 +38,22 @@ $lang->admin->notice->ignore = "Ignore";
$lang->admin->notice->int = "『%s』should be a positive integer.";
$lang->admin->register = new stdclass();
<<<<<<< HEAD
$lang->admin->register->common = 'Bind New Account';
=======
$lang->admin->register->common = 'Bind Account';
>>>>>>> d3fa148cb3d0ea19eb92b37374b0ec4e2a64ec6f
$lang->admin->register->caption = 'Register in Zentao Community';
$lang->admin->register->click = 'Register here';
<<<<<<< HEAD
$lang->admin->register->lblAccount = 'at least 3 characters; contains letters and numbers.';
$lang->admin->register->lblPasswd = 'at least 6 characters; contains letters and numbers.';
=======
$lang->admin->register->lblAccount = '>= 3 characters; contains letters and numbers.';
$lang->admin->register->lblPasswd = '>= 6 characters; contains letters and numbers.';
>>>>>>> 58a5ce3d921a17cce37484db7696956508f5d454
$lang->admin->register->submit = 'Register';
$lang->admin->register->bind = "Binding Exsit Account";
$lang->admin->register->bind = "Bind Exsit Account";
$lang->admin->register->success = "You have registered with us!";
$lang->admin->bind = new stdclass();
module/bug/lang/en.php
+50 -11
View File
@@ -32,17 +32,34 @@ $lang->bug->status = 'Status';
$lang->bug->statusAB = 'Status';
$lang->bug->activatedCount = 'Active';
$lang->bug->activatedCountAB = 'Active';
<<<<<<< HEAD
$lang->bug->activatedDate = 'Active';
=======
$lang->bug->activatedDate = 'Activated';
>>>>>>> d3fa148cb3d0ea19eb92b37374b0ec4e2a64ec6f
$lang->bug->confirmed = 'Confirmed';
$lang->bug->toTask = 'Convert to Task';
$lang->bug->toStory = 'Convert to Story';
$lang->bug->mailto = 'Mail To';
<<<<<<< HEAD
<<<<<<< HEAD
$lang->bug->openedBy = 'Created by';
$lang->bug->openedDate = 'Created';
$lang->bug->openedDateAB = 'Created';
$lang->bug->openedBuild = 'Open Build';
$lang->bug->assignedTo = 'To';
$lang->bug->assignBug = 'Assignee';
=======
$lang->bug->openedBy = 'Creator';
=======
$lang->bug->openedBy = 'Created by';
>>>>>>> 58a5ce3d921a17cce37484db7696956508f5d454
$lang->bug->openedDate = 'Created';
$lang->bug->openedDateAB = 'Created';
$lang->bug->openedBuild = 'Open Build';
$lang->bug->assignedTo = 'Assign To';
$lang->bug->assignBug = 'Assign To';
>>>>>>> d3fa148cb3d0ea19eb92b37374b0ec4e2a64ec6f
$lang->bug->assignedToAB = 'To';
$lang->bug->assignedDate = 'Assigned';
$lang->bug->resolvedBy = 'Resolved';
@@ -64,9 +81,15 @@ $lang->bug->unlinkBug = 'Unlink';
$lang->bug->case = 'Case';
$lang->bug->files = 'File';
$lang->bug->keywords = 'Tags';
<<<<<<< HEAD
$lang->bug->lastEditedByAB = 'Edited by';
$lang->bug->lastEditedDateAB = 'Edit';
$lang->bug->lastEditedDate = 'Edit';
=======
$lang->bug->lastEditedByAB = 'Edited By';
$lang->bug->lastEditedDateAB = 'Edited';
$lang->bug->lastEditedDate = 'Edited';
>>>>>>> d3fa148cb3d0ea19eb92b37374b0ec4e2a64ec6f
$lang->bug->fromCase = 'From Case';
$lang->bug->toCase = 'To Case';
$lang->bug->colorTag = 'Color Tag';
@@ -92,7 +115,7 @@ $lang->bug->close = 'Close';
$lang->bug->activate = 'Activate';
$lang->bug->batchActivate = 'Batch Activate';
$lang->bug->reportChart = 'Report';
$lang->bug->export = 'Export';
$lang->bug->export = 'Export bugs';
$lang->bug->delete = 'Delete';
$lang->bug->deleted = 'Deleted';
$lang->bug->saveTemplate = 'Save as Template';
@@ -103,30 +126,41 @@ $lang->bug->copy = 'Copy';
$lang->bug->search = 'Search';
/* 查询条件列表。*/
$lang->bug->assignToMe = 'Assigned To Me';
$lang->bug->openedByMe = 'Created By Me';
$lang->bug->resolvedByMe = 'Resolved By Me';
$lang->bug->closedByMe = 'Closed By Me';
$lang->bug->assignToMe = 'AssignToMe';
$lang->bug->openedByMe = 'CreateByMe';
$lang->bug->resolvedByMe = 'ResolveByMe';
$lang->bug->closedByMe = 'ClosedByMe';
$lang->bug->assignToNull = 'Unassigned';
$lang->bug->unResolved = 'Unresolved';
$lang->bug->toClosed = 'Unclosed';
$lang->bug->unclosed = 'Active';
$lang->bug->unconfirmed = 'UnConfirmed';
$lang->bug->unconfirmed = 'UnConfirm';
$lang->bug->longLifeBugs = 'Pending';
$lang->bug->postponedBugs = 'Postponed';
$lang->bug->overdueBugs = 'Overdue';
$lang->bug->allBugs = 'All';
$lang->bug->byQuery = 'Search';
<<<<<<< HEAD
$lang->bug->needConfirm = 'ChangedStory';
=======
$lang->bug->needConfirm = 'Story Changed';
>>>>>>> d3fa148cb3d0ea19eb92b37374b0ec4e2a64ec6f
$lang->bug->allProduct = 'All' . $lang->productCommon;
<<<<<<< HEAD
$lang->bug->my = 'Mine';
$lang->bug->yesterdayResolved = 'Resolved Yesterday ';
$lang->bug->yesterdayConfirmed = 'Confirmed Yesterday ';
$lang->bug->yesterdayClosed = 'Closed Yesterday ';
=======
$lang->bug->my = 'My';
$lang->bug->yesterdayResolved = 'Bug Resolved Yesterday ';
$lang->bug->yesterdayConfirmed = 'Bug Confirmed Yesterday ';
$lang->bug->yesterdayClosed = 'Bug Closed Yesterday ';
>>>>>>> 58a5ce3d921a17cce37484db7696956508f5d454
$lang->bug->assignToMeAB = 'Assigned To Me';
$lang->bug->openedByMeAB = 'Created By Me';
$lang->bug->resolvedByMeAB = 'Resolved By Me';
$lang->bug->assignToMeAB = 'AssignToMe';
$lang->bug->openedByMeAB = 'CreateByMe';
$lang->bug->resolvedByMeAB = 'ResolveByMe';
$lang->bug->ditto = 'Ditto';
$lang->bug->dittoNotice = 'This bug is not linked to the same product as the last one!';
@@ -146,14 +180,19 @@ $lang->bug->createBuild = 'New';
/* legend列表。*/
$lang->bug->legendBasicInfo = 'Basic Info';
$lang->bug->legendAttatch = 'Attachment';
$lang->bug->legendAttatch = 'File';
$lang->bug->legendPrjStoryTask = $lang->projectCommon . '/Story/Task';
$lang->bug->lblTypeAndSeverity = 'Type/Severity';
$lang->bug->lblSystemBrowserAndHardware = 'System/Browser';
$lang->bug->legendSteps = 'Repro Steps';
$lang->bug->legendComment = 'Note';
<<<<<<< HEAD
$lang->bug->legendLife = 'About the Bug';
$lang->bug->legendMisc = 'Misc.';
=======
$lang->bug->legendLife = 'About';
$lang->bug->legendMisc = 'Misc';
>>>>>>> d3fa148cb3d0ea19eb92b37374b0ec4e2a64ec6f
$lang->bug->legendRelated = 'Related Info';
/* 功能按钮。*/
@@ -161,7 +200,7 @@ $lang->bug->buttonConfirm = 'Confirm';
/* 交互提示。*/
$lang->bug->summary = "Bugs on this page : <strong>%s</strong> Total, <strong>%s</strong> Unresolved.";
$lang->bug->confirmChangeProduct = "Change {$lang->productCommon} will cause linked {$lang->projectCommon},Story and Task change. Do you want to do this?";
$lang->bug->confirmChangeProduct = "Any change to {$lang->productCommon} will cause linked {$lang->projectCommon}, Story and Task change. Do you want to do this?";
$lang->bug->confirmDelete = 'Do you want to delete this bug?';
$lang->bug->setTemplateTitle = 'Please enter the title of template.';
$lang->bug->remindTask = 'This Bug has been converted to Task. Do you want to update Status of Task(ID %s)?';
module/common/lang/en.php
+26 -4
View File
@@ -108,8 +108,8 @@ $lang->workingHour = 'Hour';
$lang->idAB = 'ID';
$lang->priAB = 'P';
$lang->statusAB = 'Status';
$lang->openedByAB = 'Creator';
$lang->assignedToAB = 'Assignee';
$lang->openedByAB = 'CreatedBy';
$lang->assignedToAB = 'AssignTo';
$lang->typeAB = 'Type';
$lang->common = new stdclass();
@@ -319,7 +319,7 @@ $lang->testreport->menu->testcase = array('link' => 'Case|testcase|browse|produ
$lang->testreport->menu->testtask = array('link' => 'Test|testtask|browse|productID=%s');
$lang->testreport->menu->testsuite = array('link' => 'Suite|testsuite|browse|productID=%s');
$lang->testreport->menu->report = array('link' => 'Report|testreport|browse|productID=%s', 'alias' => 'view,create,edit');
$lang->testreport->menu->caselib = array('link' => 'Library|testsuite|library');
$lang->testreport->menu->caselib = array('link' => 'Case Library|testsuite|library');
$lang->caselib = new stdclass();
$lang->caselib->menu = new stdclass();
@@ -516,16 +516,31 @@ $lang->website = "https://www.zentao.pm";
$lang->suhosinInfo = "Warning! Data is reaching the limit. Please change <font color=red>sohusin.post.max_vars</font> and <font color=red>sohusin.request.max_vars</font> (set larger %s value) in php.ini, then save and restart Apache or php-fpm, or some data will not be saved.";
$lang->maxVarsInfo = "Warning! Data is reaching the limit. Please change <font color=red>max_input_vars</font> (set larger %s value) in php.ini, then save and restart Apache or php-fpm, or some data will not be saved.";
$lang->pasteTextInfo = "Paste text here. Each line will be the title of each record. ";
<<<<<<< HEAD
$lang->noticeImport = "Imported data contains data that has already existed in system. Please confirm you actions on the date.";
$lang->importConfirm = "Import";
=======
$lang->noticeImport = "Imported data contains something that has already existed in system. Please confirm your actions.";
$lang->importConfirm = "Confirm";
>>>>>>> d3fa148cb3d0ea19eb92b37374b0ec4e2a64ec6f
$lang->importAndCover = "Override";
$lang->importAndInsert = "Insert";
$lang->noResultsMatch = "No results match found!";
$lang->searchMore = "More results：";
<<<<<<< HEAD
<<<<<<< HEAD
$lang->chooseUsersToMail = "Choose users that will be notified.";
$lang->browserNotice = 'Your current browser might not display· the best effect. Please use Chrome, Firefox, IE9+, Opera or Safari.';
=======
$lang->chooseUsersToMail = "Choose users to be notified.";
$lang->browserNotice = 'Your current browser might not display the best effect. Use Chrome, Firefox, IE9+, Opera or Safari.';
>>>>>>> d3fa148cb3d0ea19eb92b37374b0ec4e2a64ec6f
=======
$lang->chooseUsersToMail = "Choose users to be notified";
$lang->browserNotice = 'Your browser might not display the best effect. Use Chrome, Firefox, IE9+, Opera or Safari.';
>>>>>>> 58a5ce3d921a17cce37484db7696956508f5d454
$lang->noticePasteImg = "Paste images here";
$lang->pasteImgFail = "Pasting image failed. Try again later.";
$lang->pasteImgUploading = "Uploading...";
@@ -736,10 +751,17 @@ if(isset($config->global->flow) and $config->global->flow == 'onlyTest')
/* Add bug, testcase and testtask module. */
$lang->menu->bug = 'Bug|bug|index';
<<<<<<< HEAD
$lang->menu->testcase = 'Case|testcase|index';
$lang->menu->testsuite = 'Suite|testsuite|index';
$lang->menu->testtask = 'Test|testtask|index';
$lang->menu->caselib = 'Case Library|testsuite|library';
=======
$lang->menu->testcase = 'Test Case|testcase|index';
$lang->menu->testsuite = 'Test Suite|testsuite|index';
$lang->menu->testtask = 'Test|testtask|index';
$lang->menu->caselib = 'Case Lib|testsuite|library';
>>>>>>> d3fa148cb3d0ea19eb92b37374b0ec4e2a64ec6f
$lang->menuOrder[6] = 'bug';
$lang->menuOrder[7] = 'testcase';
@@ -787,7 +809,7 @@ if(isset($config->global->flow) and $config->global->flow == 'onlyTest')
$lang->testcase->menu = new stdclass();
$lang->testcase->menu->all = 'All|testcase|browse|productID=%s&branch=%s&browseType=all';
$lang->testcase->menu->wait = 'Wait|testcase|browse|productID=%s&branch=%s&browseType=wait';
$lang->testcase->menu->bysuite = array('link' => 'Test Suite|testsuite|create|productID=%s', 'class' => 'dropdown dropdown-hover');
$lang->testcase->menu->bysuite = array('link' => 'Suite|testsuite|create|productID=%s', 'class' => 'dropdown dropdown-hover');
$lang->testcase->subMenu = new stdclass();
$lang->testcase->subMenu->bysuite = new stdclass();
module/dept/lang/en.php
+12 -3
View File
@@ -15,16 +15,25 @@ $lang->dept->edit = "Edit";
$lang->dept->delete = "Delete";
$lang->dept->parent = "Parent";
$lang->dept->manager = "Manager";
$lang->dept->name = "Dept Name";
$lang->dept->name = "Department Name";
$lang->dept->browse = "Manage";
<<<<<<< HEAD
$lang->dept->manage = "Maintain Department";
=======
$lang->dept->manage = "Manage Dept";
>>>>>>> d3fa148cb3d0ea19eb92b37374b0ec4e2a64ec6f
$lang->dept->updateOrder = "Sort";
$lang->dept->add = "Add Dept";
$lang->dept->add = "Add Department";
$lang->dept->dragAndSort = "Drag and Sort";
$lang->dept->confirmDelete = " Do you want to delete this Dept?";
$lang->dept->confirmDelete = " Do you want to delete this Department?";
$lang->dept->successSave = " Saved!";
$lang->dept->error = new stdclass();
<<<<<<< HEAD
$lang->dept->error->hasSons = 'This Department has child Department. You cannot delete it!';
$lang->dept->error->hasUsers = 'This Department has users. You cannot delete it!';
=======
$lang->dept->error->hasSons = 'This Dept has child departments. You cannot delete it!';
$lang->dept->error->hasUsers = 'This Dept has users. You cannot delete it!';
>>>>>>> d3fa148cb3d0ea19eb92b37374b0ec4e2a64ec6f
module/dept/model.php
+13
View File
@@ -203,6 +203,19 @@ class deptModel extends model
return $linkHtml;
}
/**
* Create the traingoal member link.
*
* @param int $dept
* @access public
* @return string
*/
public function traingoalMemberLink($dept, $planID)
{
$linkHtml = html::a(helper::createLink('traingoal', 'browse', "goalID={$planID}&type=company&dept={$dept->id}&"), $dept->name, '_self', "id='dept{$dept->id}'");
return $linkHtml;
}
/**
* Create the group manage members link.
*
module/project/lang/en.php
+93 -3
View File
@@ -19,9 +19,19 @@ $lang->project->begin = 'Begin';
$lang->project->end = 'End';
$lang->project->dateRange = 'Duration';
$lang->project->to = 'To';
<<<<<<< HEAD
<<<<<<< HEAD
$lang->project->days = 'Man-Day';
$lang->project->day = 'day';
$lang->project->workHour = 'Hours';
=======
$lang->project->days = 'Man Day';
=======
$lang->project->days = 'Man-Day';
>>>>>>> 58a5ce3d921a17cce37484db7696956508f5d454
$lang->project->day = ' days';
$lang->project->workHour = ' hours';
>>>>>>> d3fa148cb3d0ea19eb92b37374b0ec4e2a64ec6f
$lang->project->totalHours = 'Work Hours';
$lang->project->totalDays = 'Work Days';
$lang->project->status = 'Status';
@@ -49,14 +59,28 @@ $lang->project->createStory = "Create Story";
$lang->project->all = 'All';
$lang->project->undone = 'Unfinished';
$lang->project->unclosed = 'Unclosed';
<<<<<<< HEAD
<<<<<<< HEAD
$lang->project->typeDesc = 'No story, bug, build, test task or Burndown is allowed in OPS';
$lang->project->mine = 'My Responsibility: ';
=======
$lang->project->typeDesc = 'No story, bug, build, test task or burndown is allowed in OPS';
=======
$lang->project->typeDesc = 'No story, bug, build, test or burndown is allowed in OPS';
>>>>>>> 58a5ce3d921a17cce37484db7696956508f5d454
$lang->project->mine = 'Mine: ';
>>>>>>> d3fa148cb3d0ea19eb92b37374b0ec4e2a64ec6f
$lang->project->other = 'Other:';
$lang->project->deleted = 'Deleted';
$lang->project->delayed = 'Delayed';
$lang->project->product = $lang->project->products;
<<<<<<< HEAD
$lang->project->readjustTime = 'Change project duration';
$lang->project->readjustTask = 'Change task duration';
=======
$lang->project->readjustTime = "Adjust {$lang->projectCommon} begin and end time";
$lang->project->readjustTask = 'Adjust task start date and deadline';
>>>>>>> 58a5ce3d921a17cce37484db7696956508f5d454
$lang->project->effort = 'Effort';
$lang->project->relatedMember = 'Team Member';
@@ -106,14 +130,30 @@ $lang->project->aclList['custom'] = 'Whitelist (Team members and the whitelist
/* 方法列表。*/
$lang->project->index = "Home";
<<<<<<< HEAD
$lang->project->task = 'Tasks';
<<<<<<< HEAD
$lang->project->groupTask = 'View by Group';
=======
=======
$lang->project->task = 'Task';
>>>>>>> 58a5ce3d921a17cce37484db7696956508f5d454
$lang->project->groupTask = 'Group View';
>>>>>>> d3fa148cb3d0ea19eb92b37374b0ec4e2a64ec6f
$lang->project->story = 'Story';
$lang->project->bug = 'Bug';
$lang->project->dynamic = 'Dynamic';
$lang->project->latestDynamic = 'Latest Dynamic';
$lang->project->build = 'Build';
<<<<<<< HEAD
<<<<<<< HEAD
$lang->project->testtask = 'Test';
=======
$lang->project->testtask = 'Test Task';
>>>>>>> d3fa148cb3d0ea19eb92b37374b0ec4e2a64ec6f
=======
$lang->project->testtask = 'Test';
>>>>>>> 58a5ce3d921a17cce37484db7696956508f5d454
$lang->project->burn = 'Burndown';
$lang->project->computeBurn = 'Update';
$lang->project->burnData = 'Burndown Data';
@@ -135,7 +175,11 @@ $lang->project->delete = "Delete";
$lang->project->browse = "Browse";
$lang->project->edit = "Edit";
$lang->project->batchEdit = "Batch Edit";
<<<<<<< HEAD
$lang->project->manageMembers = 'Manange Team';
=======
$lang->project->manageMembers = 'Manage Team';
>>>>>>> d3fa148cb3d0ea19eb92b37374b0ec4e2a64ec6f
$lang->project->unlinkMember = 'Unlink Member';
$lang->project->unlinkStory = 'Unlink Story';
$lang->project->batchUnlinkStory = 'Batch Unlink Story';
@@ -163,7 +207,7 @@ $lang->project->myInvolved = 'Involved';
$lang->project->statusSelects[''] = 'More';
$lang->project->statusSelects['wait'] = 'Wait';
$lang->project->statusSelects['doing'] = 'Doing';
$lang->project->statusSelects['finishedbyme'] = 'FinishedbyMe';
$lang->project->statusSelects['finishedbyme'] = 'FinishedByMe';
$lang->project->statusSelects['done'] = 'Done';
$lang->project->statusSelects['closed'] = 'Closed';
$lang->project->statusSelects['cancel'] = 'Canceled';
@@ -172,8 +216,8 @@ $lang->project->groups[''] = 'Groups';
$lang->project->groups['story'] = 'By Story';
$lang->project->groups['status'] = 'By Status';
$lang->project->groups['pri'] = 'By Priority';
$lang->project->groups['assignedTo'] = 'By AssignedTo';
$lang->project->groups['finishedBy'] = 'By FinishedBy';
$lang->project->groups['assignedTo'] = 'By AssignTo';
$lang->project->groups['finishedBy'] = 'By FinishBy';
$lang->project->groups['closedBy'] = 'By ClosedBy';
$lang->project->groups['type'] = 'By Type';
@@ -192,7 +236,47 @@ $lang->project->aboveAllProduct = "All the above {$lang->productCommon}";
$lang->project->aboveAllProject = "All the above {$lang->projectCommon}";
/* 页面提示。*/
<<<<<<< HEAD
<<<<<<< HEAD
$lang->project->selectProject = "Select {$lang->projectCommon}";
$lang->project->beginAndEnd = 'Duration';
$lang->project->begin = 'Begin';
$lang->project->end = 'End';
$lang->project->lblStats = 'Man-Hour Summary(h) : ';
$lang->project->stats = '<strong>%s</strong> Available, <strong>%s</strong> Total Estimates, <strong>%s</strong> Cost, <strong>%s</strong> Left.';
$lang->project->taskSummary = "Tasks on this page : <strong>%s</strong> Total, <strong>%s</strong> Wait, <strong>%s</strong> Doing; &nbsp;&nbsp;&nbsp; Hours : <strong>%s</strong> Est., <strong>%s</strong> Cost, <strong>%s</strong> Left.";
$lang->project->checkedSummary = " <strong>%total%</strong> Checked, <strong>%wait%</strong> Wait, <strong>%doing%</strong> Doing; Hours: <strong>%estimate%</strong> Est., <strong>%consumed%</strong> Cost, <strong>%left%</strong> Left.";
$lang->project->memberHoursAB = "%s has <strong>%s</strong> Hours";
$lang->project->memberHours = '<div class="table-col"><div class="clearfix segments"><div class="segment"><div class="segment-title">%s Working Hours</div><div class="segment-value">%s</div></div></div></div>';
$lang->project->countSummary = '<div class="table-col"><div class="clearfix segments"><div class="segment"><div class="segment-title">Tasks</div><div class="segment-value">%s</div></div><div class="segment"><div class="segment-title">Doing</div><div class="segment-value"><span class="label label-dot label-primary"></span> %s</div></div><div class="segment"><div class="segment-title">Wait</div><div class="segment-value"><span class="label label-dot label-primary muted"></span> %s</div></div></div></div>';
$lang->project->timeSummary = '<div class="table-col"><div class="clearfix segments"><div class="segment"><div class="segment-title">Est.</div><div class="segment-value">%s</div></div><div class="segment"><div class="segment-title">Cost</div><div class="segment-value text-red">%s</div></div><div class="segment"><div class="segment-title">Left</div><div class="segment-value">%s</div></div></div></div>';
$lang->project->groupSummaryAB = "<div>Tasks <strong>%s ：</strong><span class='text-muted'>Wait</span> %s &nbsp; <span class='text-muted'>Doing</span> %s</div><div>Est. <strong>%s ：</strong><span class='text-muted'>Cost</span> %s &nbsp; <span class='text-muted'>Left</span> %s</div>";
$lang->project->wbs = "Work Breakdown";
$lang->project->batchWBS = "Batch Work Breakdown";
$lang->project->howToUpdateBurn = "<a href='https://www.zentao.pm/book/zentaomanual/free-open-source-project-management-software-updateburndowncharts-98.html' target='_blank' title='How to Update the Burndown Chart?' class='btn btn-link'>Help <i class='icon icon-help'></i></a>";
$lang->project->whyNoStories = "No Story can be linked. Please check whether there is Story in {$lang->projectCommon} linked {$lang->productCommon} and make sure it has been reviewed.";
$lang->project->productStories = "{$lang->projectCommon} linked story is the subeset of {$lang->productCommon}, which can only be linked after review. Please <a href='%s'> Link Story</a>。";
$lang->project->haveDraft = "There are %s draft stories that cannot be linked.";
$lang->project->doneProjects = 'Done';
$lang->project->selectDept = 'Select Department';
$lang->project->selectDeptTitle = 'Select Department';
$lang->project->copyTeam = 'Copy Team';
$lang->project->copyFromTeam = "Copy from {$lang->projectCommon} Team: <strong>%s</strong>";
$lang->project->noMatched = "No $lang->projectCommon including '%s'can be found.";
$lang->project->copyTitle = "Choose a {$lang->projectCommon} to copy.";
$lang->project->copyTeamTitle = "Choose {$lang->projectCommon}Team to copy.";
$lang->project->copyNoProject = "No {$lang->projectCommon} can be copied.";
$lang->project->copyFromProject = "Copy from {$lang->projectCommon} <strong>%s</strong>";
$lang->project->cancelCopy = 'Cancel Copy';
$lang->project->byPeriod = 'By Time';
$lang->project->byUser = 'By User';
$lang->project->noProject = 'No projects. ';
$lang->project->noMembers = 'No members. ';
=======
$lang->project->linkStoryByPlanTips = 'It will link all stories in this plan to the project.';
=======
$lang->project->linkStoryByPlanTips = "It will link all stories in this plan to the {$lang->projectCommon}.";
>>>>>>> 58a5ce3d921a17cce37484db7696956508f5d454
$lang->project->selectProject = "Select {$lang->projectCommon}";
$lang->project->beginAndEnd = 'Duration';
$lang->project->begin = 'Begin';
@@ -227,6 +311,7 @@ $lang->project->byPeriod = 'By Time';
$lang->project->byUser = 'By User';
$lang->project->noProject = "No {$lang->projectCommon}. ";
$lang->project->noMembers = 'No members. ';
>>>>>>> d3fa148cb3d0ea19eb92b37374b0ec4e2a64ec6f
/* 交互提示。*/
$lang->project->confirmDelete = "Do you want to delete {$lang->projectCommon}[%s]?";
@@ -267,8 +352,13 @@ $lang->project->charts->burn->graph->reference = 'Ideal';
$lang->project->charts->burn->graph->actuality = 'Actual';
$lang->project->placeholder = new stdclass();
<<<<<<< HEAD
$lang->project->placeholder->code = 'Alias of project name';
$lang->project->placeholder->totalLeft = 'Estimates at the beginning of the Project.';
=======
$lang->project->placeholder->code = "Abbreviation of {$lang->projectCommon} name";
$lang->project->placeholder->totalLeft = "Estimates at the beginning of the {$lang->projectCommon}.";
>>>>>>> 58a5ce3d921a17cce37484db7696956508f5d454
$lang->project->selectGroup = new stdclass();
$lang->project->selectGroup->done = '(Done)';
module/release/lang/en.php
+6 -2
View File
@@ -17,7 +17,7 @@ $lang->release->linkBug = "Link Bug";
$lang->release->delete = "Delete";
$lang->release->deleted = 'Deleted';
$lang->release->view = "Overview";
$lang->release->browse = "Browse";
$lang->release->browse = "Release";
$lang->release->changeStatus = "Change Status";
$lang->release->batchUnlink = "Batch Unlink";
$lang->release->batchUnlinkStory = "Batch Unlink Story";
@@ -48,7 +48,7 @@ $lang->release->bugs = 'Resolved Bug';
$lang->release->leftBugs = 'Remained Bug';
$lang->release->generatedBugs = 'Remained Bug';
$lang->release->finishStories = 'Finished %s Story';
$lang->release->resolvedBugs = 'Solved %s Bug';
$lang->release->resolvedBugs = 'Resolved %s Bug';
$lang->release->createdBugs = 'Generated %s Bug';
$lang->release->export = 'Export as HTML';
$lang->release->yesterday = 'Released Yesterday';
@@ -69,4 +69,8 @@ $lang->release->changeStatusList['normal'] = 'Activate';
$lang->release->changeStatusList['terminate'] = 'Terminate';
$lang->release->action = new stdclass();
<<<<<<< HEAD
$lang->release->action->changestatus = array('main' => '$date, by <strong>$actor</strong> $extra。', 'extra' => 'changeStatusList');
=======
$lang->release->action->changestatus = array('main' => '$date, $extra by <strong>$actor</strong>', 'extra' => 'changeStatusList');
>>>>>>> 58a5ce3d921a17cce37484db7696956508f5d454
module/story/lang/en.php
+10
View File
@@ -36,9 +36,15 @@ $lang->story->bugCountAB = 'B';
$lang->story->caseCountAB = 'C';
$lang->story->linkStory = 'Link';
$lang->story->unlinkStory = 'UnLinked';
<<<<<<< HEAD
$lang->story->export = "Export Story";
$lang->story->zeroCase = "Story w/o cases";
$lang->story->zeroTask = "Display story w/o tasks";
=======
$lang->story->export = "Export Data";
$lang->story->zeroCase = "Story w/o case";
$lang->story->zeroTask = "Story w/o task";
>>>>>>> d3fa148cb3d0ea19eb92b37374b0ec4e2a64ec6f
$lang->story->reportChart = "Report";
$lang->story->copyTitle = "Copy Title";
$lang->story->batchChangePlan = "Batch Change Plans";
@@ -70,7 +76,11 @@ $lang->story->stage = 'Stage';
$lang->story->stageAB = 'Stage';
$lang->story->mailto = 'Mail to';
$lang->story->openedBy = 'Creator';
<<<<<<< HEAD
$lang->story->openedDate = 'Create';
=======
$lang->story->openedDate = 'Created';
>>>>>>> d3fa148cb3d0ea19eb92b37374b0ec4e2a64ec6f
$lang->story->assignedTo = 'Assignee';
$lang->story->assignedDate = 'Assigned';
$lang->story->lastEditedBy = 'Last Edited';
module/task/js/batchedit.js
+1 -1
View File
@@ -12,7 +12,7 @@ $(document).on('change', 'select', function()
var tbody = $(this).closest('tr').parent();
var value = '';
for(i = row - 1; i >= 0; i--)
for(var i = row - 1; i >= 0; i--)
{
value = tbody.children('tr').eq(i).find('td').eq(index).find('select').val();
if(value != 'ditto') break;
module/testcase/lang/en.php
+7 -7
View File
@@ -12,7 +12,7 @@
$lang->testcase->id = 'ID';
$lang->testcase->product = $lang->productCommon;
$lang->testcase->module = 'Module';
$lang->testcase->lib = "Library";
$lang->testcase->lib = "Case Library";
$lang->testcase->branch = "Branch/Platform";
$lang->testcase->moduleAB = 'Module';
$lang->testcase->story = 'Story';
@@ -50,12 +50,12 @@ $lang->testcase->assignedTo = 'To';
$lang->testcase->colorTag = 'Color Tag';
$lang->testcase->lastRunResult = 'Result';
$lang->testcase->desc = 'Step';
$lang->testcase->expect = 'Expect';
$lang->testcase->expect = 'Expectation';
$lang->testcase->allProduct = "All {$lang->productCommon}";
$lang->testcase->fromBug = 'From Bug';
$lang->testcase->toBug = 'To Bug';
$lang->testcase->changed = 'Changed';
$lang->testcase->bugs = 'Bugs Generated';
$lang->testcase->bugs = 'Bugs Reported';
$lang->testcase->bugsAB = 'B';
$lang->testcase->results = 'Results';
$lang->testcase->resultsAB = 'R';
@@ -120,11 +120,11 @@ $lang->testcase->deleteStep = 'Delete';
$lang->testcase->insertBefore = 'Inserted Before';
$lang->testcase->insertAfter = 'Inserted After';
$lang->testcase->assignToMe = 'Assigned To Me';
$lang->testcase->openedByMe = 'Created By Me';
$lang->testcase->assignToMe = 'AssignToMe';
$lang->testcase->openedByMe = 'CreateByMe';
$lang->testcase->allCases = 'All';
$lang->testcase->allTestcases = 'All Cases';
$lang->testcase->needConfirm = 'Story Changed';
$lang->testcase->needConfirm = 'Changed Story';
$lang->testcase->bySearch = 'Search';
$lang->testcase->unexecuted = 'Wait';
@@ -144,7 +144,7 @@ $lang->testcase->summary = "Cases on this page : <strong>%s</strong>
$lang->testcase->confirmDelete = 'Do you want to delete this Test Case?';
$lang->testcase->confirmBatchDelete = 'Do you want to batch delete these Test Cases?';
$lang->testcase->ditto = 'Ditto';
$lang->testcase->dittoNotice = 'This Case does not belong to the Product as the previous one!';
$lang->testcase->dittoNotice = 'This Case does not belong to the Product as the last one!';
$lang->testcase->reviewList[0] = 'NO';
$lang->testcase->reviewList[1] = 'YES';
module/testreport/lang/en.php
+43 -2
View File
@@ -19,7 +19,11 @@ $lang->testreport->owner = 'Owner';
$lang->testreport->members = 'Members';
$lang->testreport->begin = 'Begin';
$lang->testreport->end = 'End';
<<<<<<< HEAD
$lang->testreport->stories = 'Story of Test';
=======
$lang->testreport->stories = 'Test Story';
>>>>>>> d3fa148cb3d0ea19eb92b37374b0ec4e2a64ec6f
$lang->testreport->bugs = 'Bugs';
$lang->testreport->builds = 'Build Info';
$lang->testreport->goal = 'Project Goal';
@@ -36,7 +40,11 @@ $lang->testreport->all = 'All Report';
$lang->testreport->deleted = 'Deleted';
$lang->testreport->legendBasic = 'Basic Info';
<<<<<<< HEAD
$lang->testreport->legendStoryAndBug = 'Story and Bug of Test';
=======
$lang->testreport->legendStoryAndBug = 'Story&Bug';
>>>>>>> 58a5ce3d921a17cce37484db7696956508f5d454
$lang->testreport->legendBuild = 'Build Info';
$lang->testreport->legendCase = 'Linked Case';
$lang->testreport->legendLegacyBugs = 'Legacy Bug';
@@ -47,17 +55,49 @@ $lang->testreport->legendMore = 'More';
$lang->testreport->bugSeverityGroups = 'Bug Severity Distribution';
$lang->testreport->bugTypeGroups = 'Bug Type Distribution';
$lang->testreport->bugStatusGroups = 'Bug Status Distribution';
<<<<<<< HEAD
$lang->testreport->bugOpenedByGroups = 'Bug ReportBy Distribution';
=======
$lang->testreport->bugOpenedByGroups = 'Bug CreateBy Distribution';
>>>>>>> d3fa148cb3d0ea19eb92b37374b0ec4e2a64ec6f
$lang->testreport->bugResolvedByGroups = 'Bug ResolveBy Distribution';
$lang->testreport->bugResolutionGroups = 'Bug Resolution Distribution';
$lang->testreport->bugModuleGroups = 'Bug Module Distribution';
<<<<<<< HEAD
$lang->testreport->legacyBugs = 'Legacy Bugs';
$lang->testreport->bugConfirmedRate = 'Confirmed Bug Rate (Resolution is fixed or postponed / status is resolved or closed)';
$lang->testreport->bugCreateByCaseRate = 'Bug Created in Case Rate (Bugs reported in cases / Newly added bugs)';
=======
$lang->testreport->legacyBugs = 'Legacy Bug';
$lang->testreport->bugConfirmedRate = 'Confirmed Bug Rate (Solution is fixed or postponed / status is resolved or closed)';
$lang->testreport->bugCreateByCaseRate = 'Bug Created in Case Rate (Bugs created in cases / Newly added bugs)';
>>>>>>> 58a5ce3d921a17cce37484db7696956508f5d454
$lang->testreport->caseSummary = ' <strong>%s</strong> cases in Total : <strong>%s</strong> performed, <strong>%s</strong> results, <strong>%s</strong> failed.';
$lang->testreport->buildSummary = 'Tested <strong>%s</strong> build.';
<<<<<<< HEAD
$lang->testreport->confirmDelete = 'Do you want tot delete this report?';
$lang->testreport->moreNotice = 'More features can be extended with reference to the ZenTao extension mechanism, or you can contact us for customization.';
$lang->testreport->exportNotice = "Export By <a href='https://www.zentao.pm' target='_blank' style='color:grey'>ZenTaoPMS</a>";
$lang->testreport->noReport = "No report has been generated. Please check it later.";
$lang->testreport->foundBugTip = "Bugs reported in this build and in the test period.";
$lang->testreport->legacyBugTip = "Active bugs, or bugs that are resolved beyond the test period.";
$lang->testreport->fromCaseBugTip = "Bugs reported after case-failure in the test period.";
$lang->testreport->errorTrunk = "The trunk version cannot create a test report. Please modify the related version!";
$lang->testreport->moreProduct = "A test report can only be generated for the same product.";
=======
$lang->testreport->confirmDelete = 'Do you want to delete this report?';
<<<<<<< HEAD
$lang->testreport->moreNotice = 'More features can be extended with reference to the ZenTao extension manual, or you can contact us at renee@easysoft.ltd for customization.';
$lang->testreport->exportNotice = "Exported By <a href='https://www.zentao.net' target='_blank' style='color:grey'>ZenTaoPMS</a>";
$lang->testreport->noReport = "No report has been generated. Please check it later.";
$lang->testreport->foundBugTip = "Bugs created in this build and created in the test period.";
$lang->testreport->legacyBugTip = "Active Bugs, or the resolved beyond the test period.";
$lang->testreport->fromCaseBugTip = "Bugs created after failed cases in the test period.";
$lang->testreport->errorTrunk = "The trunk cannot create a QA report for. Please modify the linked build!";
$lang->testreport->moreProduct = "You can only create QA reports for the same product.";
>>>>>>> d3fa148cb3d0ea19eb92b37374b0ec4e2a64ec6f
=======
$lang->testreport->moreNotice = 'More features can be extended with reference to the ZenTao manual, or you can contact us at renee@easysoft.ltd for customization.';
$lang->testreport->exportNotice = "Exported By <a href='https://www.zentao.pm' target='_blank' style='color:grey'>ZenTao</a>";
$lang->testreport->noReport = "No report has been generated yet.";
@@ -66,10 +106,11 @@ $lang->testreport->legacyBugTip = "Active Bugs, or bugs that are resolved afte
$lang->testreport->fromCaseBugTip = "Bugs reported due to failed cases in this test.";
$lang->testreport->errorTrunk = "The trunk cannot generate a QA report. Modify the linked build!";
$lang->testreport->moreProduct = "You can only generate QA reports for the same product.";
>>>>>>> 58a5ce3d921a17cce37484db7696956508f5d454
$lang->testreport->bugSummary = <<<EOD
<strong>%s</strong> Bug(s) generated in total <a data-toggle='tooltip' class='text-warning' title='{$lang->testreport->foundBugTip}'><i class='icon-help'></i></a>,
<strong>%s</strong> Bug(s) reported in total <a data-toggle='tooltip' class='text-warning' title='{$lang->testreport->foundBugTip}'><i class='icon-help'></i></a>,
<strong>%s</strong> Bug(s) remained unresolve <a data-toggle='tooltip' class='text-warning' title='{$lang->testreport->legacyBugTip}'><i class='icon-help'></i></a>,
<strong>%s</strong> Bug(s) failure of case <a data-toggle='tooltip' class='text-warning' title='{$lang->testreport->fromCaseBugTip}'><i class='icon-help'></i></a>.
Bug Effective Rate <a data-toggle='tooltip' class='text-warning' title='resolution is resolved or delayedg / status is resolved or closed'><i class='icon-help'></i></a>: <strong>%s</strong>，Bugs created from case Rate<a data-toggle='tooltip' class='text-warning' title='Bugs created from cases / bugs'><i class='icon-help'></i></a>: <strong>%s</strong>
Bug Effective Rate <a data-toggle='tooltip' class='text-warning' title='Resolution is resolved or delayed / status is resolved or closed'><i class='icon-help'></i></a>: <strong>%s</strong>，Bugs reportted from case rate<a data-toggle='tooltip' class='text-warning' title='Bugs created from cases / bugs'><i class='icon-help'></i></a>: <strong>%s</strong>
EOD;
module/testsuite/lang/en.php
+9
View File
@@ -18,12 +18,21 @@ $lang->testsuite->browse = "Suite List";
$lang->testsuite->linkCase = "Link Case";
$lang->testsuite->linkVersion = "Version";
$lang->testsuite->unlinkCase = "Unlink";
<<<<<<< HEAD
$lang->testsuite->batchUnlinkCases = "Batch unlink case";
$lang->testsuite->deleted = 'Deleted';
$lang->testsuite->exportTemplet = 'Export template';
$lang->testsuite->batchCreateCase = 'Batch create case';
$lang->testsuite->import = 'Import';
$lang->testsuite->showImport = 'Show imported data';
=======
$lang->testsuite->batchUnlinkCases = "Batch Unlink Case";
$lang->testsuite->deleted = 'Deleted';
$lang->testsuite->exportTemplet = 'Export template';
$lang->testsuite->batchCreateCase = 'Batch Create Case';
$lang->testsuite->import = 'Import';
$lang->testsuite->showImport = 'Show Imported Data';
>>>>>>> d3fa148cb3d0ea19eb92b37374b0ec4e2a64ec6f
$lang->testsuite->successSaved = 'Saved';
$lang->testsuite->common = 'Test Suite';
module/user/js/common.js
+5 -5
View File
@@ -1,8 +1,8 @@
/**
* Switch account
*
* @param string $account
* @param string $method
* Switch account
*
* @param string $account
* @param string $method
* @access public
* @return void
*/
@@ -34,7 +34,7 @@ function switchAccount(account, method)
}
var mailsuffix = '';
var account = new Array();
var account = [];
function setDefaultEmail(num)
{
var mailValue = $('.email_' + num).val();
www/js/zui/min.js
+4 -4
View File
File diff suppressed because one or more lines are too long