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

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

Browse Source
This commit is contained in:
wangyidong
2016-11-30 11:05:17 +08:00
parent 95f028cbbb ae1b3f9080
commit 964ebebc54
32 changed files with 160 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+1
View File
@@ -11,3 +11,4 @@ tmp/model/*
tmp/cache/*
tmp/extension/*
.gitkeep
.bak
module/action/lang/en.php
+1 -1
View File
@@ -108,7 +108,7 @@ $lang->action->desc->unlinkrelatedcase = '$date, <strong>$actor</strong> removed
/* 用来显示动态信息。*/
$lang->action->label = new stdclass();
$lang->action->label->created = 'Created';
$lang->action->label->opened = 'Opened';
$lang->action->label->opened = 'Open';
$lang->action->label->changed = 'Changed';
$lang->action->label->edited = 'Edited';
$lang->action->label->assigned = 'Assigned';
module/admin/lang/en.php
+1 -1
View File
@@ -45,7 +45,7 @@ $lang->admin->safe->password = 'Password Security';
$lang->admin->safe->weak = 'Common Weak Password';
$lang->admin->safe->reason = 'Type';
$lang->admin->safe->checkWeak = 'Weak Password Check';
$lang->admin->safe->modifyPasswordFirstLogin = 'Modify password in frist login';
$lang->admin->safe->modifyPasswordFirstLogin = 'Modify password when login for the first time.';
$lang->admin->safe->modeList[0] = 'N/A';
$lang->admin->safe->modeList[1] = 'Medium';
module/block/lang/en.php
+25 -25
View File
@@ -10,14 +10,14 @@
* @link http://www.ranzhi.org
*/
$lang->block = new stdclass();
$lang->block->common = 'Block';
$lang->block->common = 'Widget';
$lang->block->name = 'Name';
$lang->block->style = 'Style';
$lang->block->grid = 'Grid';
$lang->block->color = 'Color';
$lang->block->lblModule = 'Module';
$lang->block->lblBlock = 'Block';
$lang->block->lblBlock = 'Widget';
$lang->block->lblNum = 'Number';
$lang->block->lblHtml = 'HTML';
$lang->block->dynamic = 'Dynamic';
@@ -27,10 +27,10 @@ $lang->block->params = new stdclass();
$lang->block->params->name = 'Name';
$lang->block->params->value = 'Value';
$lang->block->createBlock = 'Add Block';
$lang->block->editBlock = 'Edit Block';
$lang->block->ordersSaved = 'Sequence saved.';
$lang->block->confirmRemoveBlock = 'Do you want to remove Block【{0}】?';
$lang->block->createBlock = 'Create Widget';
$lang->block->editBlock = 'Edit';
$lang->block->ordersSaved = 'Ranking is saved.';
$lang->block->confirmRemoveBlock = 'Do you want to remove Widget【{0}】?';
$lang->block->refresh = 'Refresh';
$lang->block->hidden = 'Hide';
$lang->block->dynamicInfo = "%s, %s <em>%s</em> %s <a href='%s'>%s</a>.";
@@ -118,21 +118,21 @@ $lang->block->default['my']['9']['source'] = 'qa';
$lang->block->num = 'Number';
$lang->block->type = 'Type';
$lang->block->orderBy = 'Sequence';
$lang->block->orderBy = 'Ranking';
$lang->block->availableBlocks = new stdclass();
$lang->block->availableBlocks->todo = 'My To-Dos';
$lang->block->availableBlocks->task = 'My Task';
$lang->block->availableBlocks->bug = 'My Bug';
$lang->block->availableBlocks->case = 'My Case';
$lang->block->availableBlocks->story = 'My Story';
$lang->block->availableBlocks->task = 'My Tasks';
$lang->block->availableBlocks->bug = 'My Bugs';
$lang->block->availableBlocks->case = 'My Cases';
$lang->block->availableBlocks->story = 'My Stories';
$lang->block->availableBlocks->product = $lang->productCommon . 'List';
$lang->block->availableBlocks->project = $lang->projectCommon . 'List';
$lang->block->availableBlocks->plan = 'Planning List';
$lang->block->availableBlocks->release = 'Release List';
$lang->block->availableBlocks->build = 'Build List';
$lang->block->availableBlocks->testtask = 'Test Build List';
$lang->block->availableBlocks->build = 'Builds';
$lang->block->availableBlocks->testtask = 'Test Builds';
$lang->block->moduleList['product'] = $lang->productCommon;
$lang->block->moduleList['project'] = $lang->projectCommon;
@@ -142,22 +142,22 @@ $lang->block->moduleList['todo'] = 'To-Dos';
$lang->block->modules['product'] = new stdclass();
$lang->block->modules['product']->availableBlocks = new stdclass();
$lang->block->modules['product']->availableBlocks->list = $lang->productCommon . 'List';
$lang->block->modules['product']->availableBlocks->story = 'Story List';
$lang->block->modules['product']->availableBlocks->story = 'Stories';
$lang->block->modules['product']->availableBlocks->plan = 'Planning List';
$lang->block->modules['product']->availableBlocks->release = 'Release List';
$lang->block->modules['project'] = new stdclass();
$lang->block->modules['project']->availableBlocks = new stdclass();
$lang->block->modules['project']->availableBlocks->list = $lang->projectCommon . 'List';
$lang->block->modules['project']->availableBlocks->task = 'Task List';
$lang->block->modules['project']->availableBlocks->build = 'Build List';
$lang->block->modules['project']->availableBlocks->task = 'Tasks';
$lang->block->modules['project']->availableBlocks->build = 'Builds';
$lang->block->modules['qa'] = new stdclass();
$lang->block->modules['qa']->availableBlocks = new stdclass();
$lang->block->modules['qa']->availableBlocks->bug = 'Bug List';
$lang->block->modules['qa']->availableBlocks->case = 'Case List';
$lang->block->modules['qa']->availableBlocks->testtask = 'Test Build List';
$lang->block->modules['qa']->availableBlocks->bug = 'Bugs';
$lang->block->modules['qa']->availableBlocks->case = 'Cases';
$lang->block->modules['qa']->availableBlocks->testtask = 'Test Builds';
$lang->block->modules['todo'] = new stdclass();
$lang->block->modules['todo']->availableBlocks = new stdclass();
$lang->block->modules['todo']->availableBlocks->list = 'To-Do List';
$lang->block->modules['todo']->availableBlocks->list = 'To-Dos';
$lang->block->orderByList = new stdclass();
@@ -247,8 +247,8 @@ $lang->block->modules['common']->moreLinkList = new stdclass();
$lang->block->modules['common']->moreLinkList->dynamic = 'company|dynamic|';
$lang->block->flowchart = array();
$lang->block->flowchart[] = array('Admin', 'Manage a Company', 'Add User', 'Maintain Privilege');
$lang->block->flowchart[] = array('Product Manager', 'Add Product', 'Maintain a Module', 'Maintain Planning', 'Maintain a Story', 'Create Release');
$lang->block->flowchart[] = array('Project Manager', 'Add Project', 'MaintainTeam', 'Link a Product', 'Link a Story', 'Decompose a Task');
$lang->block->flowchart[] = array('R&D Team', 'Claim a Task/Bug', 'Update Status', 'Finish a Task/Bug');
$lang->block->flowchart[] = array('Testing Team', 'Write a Case', 'Implement a Case', 'Submit a Bug', 'Bug', 'Off a Bug');
$lang->block->flowchart[] = array('Administration', 'Manage a Company', 'Add Users', 'Maintain Privileges');
$lang->block->flowchart[] = array('Product Manager', 'Add Products', 'Maintain Modules', 'Maintain Planning', 'Maintain Stories', 'Create Release');
$lang->block->flowchart[] = array('Project Manager', 'Add Projects', 'Maintain Teams', 'Link Products', 'Link Stories', 'Decompose Tasks');
$lang->block->flowchart[] = array('DEV Team', 'Claim TaskS/BugS', 'Update Status', 'Finish Tasks/Bugs');
$lang->block->flowchart[] = array('Testing Team', 'Write Cases', 'Implement Cases', 'Submit Bugs', 'Fix Bugs', 'Close Bugs');
module/branch/lang/en.php
+2 -2
View File
@@ -6,5 +6,5 @@ $lang->branch->delete = 'Delete Branch';
$lang->branch->manageTitle = '%s Management';
$lang->branch->all = 'All';
$lang->branch->confirmDelete = 'Are you sure delete this @branch@?';
$lang->branch->canNotDelete = 'It has data in @branch@, can not deleted.';
$lang->branch->confirmDelete = 'Do you want to delete this @branch@?';
$lang->branch->canNotDelete = 'There is data in @branch@. It cannot be deleted.';
module/bug/lang/en.php
+3 -3
View File
@@ -36,9 +36,9 @@ $lang->bug->toTask = 'Convert to Task';
$lang->bug->toStory = 'Convert to Story';
$lang->bug->mailto = 'Mail To';
$lang->bug->openedBy = 'Opened By';
$lang->bug->openedDate = 'Opened Date';
$lang->bug->openedDateAB = 'Opened Date';
$lang->bug->openedBuild = 'Opened Build';
$lang->bug->openedDate = 'Open Date';
$lang->bug->openedDateAB = 'Open Date';
$lang->bug->openedBuild = 'Open Build';
$lang->bug->assignedTo = 'Assigned To';
$lang->bug->assignedDate = 'Assigned Date';
$lang->bug->resolvedBy = 'Resolved By';
module/dept/lang/en.php
+5 -5
View File
@@ -10,13 +10,13 @@
* @link http://www.zentao.net
*/
$lang->dept->common = 'Department';
$lang->dept->manageChild = "Child Dept";
$lang->dept->edit = "Edit Dept";
$lang->dept->delete = "Delete Dept";
$lang->dept->parent = "Parent Dept";
$lang->dept->manageChild = "Children";
$lang->dept->edit = "Edit";
$lang->dept->delete = "Delete";
$lang->dept->parent = "Parent";
$lang->dept->manager = "Manager";
$lang->dept->name = "Dept Name";
$lang->dept->browse = "View Dept";
$lang->dept->browse = "Departments";
$lang->dept->manage = "Maintain Dept";
$lang->dept->updateOrder = "Update/Order";
$lang->dept->add = "Add Dept";
module/dev/lang/en.php
+3 -3
View File
@@ -4,7 +4,7 @@ $lang->dev->api = 'API';
$lang->dev->db = 'Database';
$lang->dev->editor = 'Editor';
$lang->dev->dbList = 'Database';
$lang->dev->moduleList = 'ModuleList';
$lang->dev->moduleList = 'Modules';
$lang->dev->params = 'Parameters';
$lang->dev->type = 'Type';
$lang->dev->desc = 'Description';
@@ -35,7 +35,7 @@ $lang->dev->tableList['effort'] = 'Effort';
$lang->dev->tableList['extension'] = 'Extension';
$lang->dev->tableList['file'] = 'File';
$lang->dev->tableList['group'] = 'Group';
$lang->dev->tableList['grouppriv'] = 'Group Privilege';
$lang->dev->tableList['grouppriv'] = 'Privileges';
$lang->dev->tableList['history'] = 'History';
$lang->dev->tableList['lang'] = 'Language';
$lang->dev->tableList['module'] = 'Module';
@@ -46,7 +46,7 @@ $lang->dev->tableList['projectproduct'] = $lang->projectCommon . $lang->productC
$lang->dev->tableList['projectstory'] = $lang->projectCommon . 'Story';
$lang->dev->tableList['release'] = 'Release';
$lang->dev->tableList['story'] = 'Story';
$lang->dev->tableList['storyspec'] = 'StoryDescription';
$lang->dev->tableList['storyspec'] = ' Description';
$lang->dev->tableList['task'] = 'Task';
$lang->dev->tableList['taskestimate'] = 'Estimated Task';
$lang->dev->tableList['team'] = 'Team';
module/editor/lang/en.php
+2 -2
View File
@@ -1,7 +1,7 @@
<?php
$lang->editor->common = 'Editor';
$lang->editor->api = 'API';
$lang->editor->index = 'Homepage';
$lang->editor->index = 'Home';
$lang->editor->newMethod = 'New Method';
$lang->editor->extend = 'Extension';
$lang->editor->api = 'API';
@@ -15,7 +15,7 @@ $lang->editor->edit = 'Edit Extension';
$lang->editor->save = 'Save Page';
$lang->editor->delete = 'Delete Page';
$lang->editor->moduleList = 'Module List';
$lang->editor->moduleList = 'Modules';
$lang->editor->filePath = "Extension:";
$lang->editor->sourceFile = 'Source File:';
$lang->editor->fileName = "File Name:";
module/extension/lang/en.php
+3 -3
View File
@@ -67,9 +67,9 @@ $lang->extension->executeCommands = '<h3>Execute command lines below to
$lang->extension->successDownloadedPackage = 'Extension downloaded!';
$lang->extension->successCopiedFiles = 'File copied!';
$lang->extension->successInstallDB = 'Database installed!';
$lang->extension->viewInstalled = 'View Installed';
$lang->extension->viewAvailable = 'View Available';
$lang->extension->viewDeactivated = 'View Deactivated';
$lang->extension->viewInstalled = 'Installed';
$lang->extension->viewAvailable = 'Available';
$lang->extension->viewDeactivated = 'Deactivated';
$lang->extension->backDBFile = 'Extension related data has been backed up to %s!';
$lang->extension->noticeOkFile = '<h5>For security reasons, your Admin account has to be confirmed.</h5>
<h5>Plese Login your ZenTao server and create %s.</h5>
module/file/lang/en.php
+1 -1
View File
@@ -13,7 +13,7 @@ $lang->file = new stdclass();
$lang->file->common = 'Attachment';
$lang->file->uploadImages = 'Batch Upload Images';
$lang->file->download = 'Download Files';
$lang->file->uploadDate = 'UploadDate:';
$lang->file->uploadDate = 'Uploaded on';
$lang->file->edit = 'Rename';
$lang->file->inputFileName = 'Enter a File Name';
$lang->file->delete = 'Delete File';
module/group/lang/en.php
+13 -13
View File
@@ -9,21 +9,21 @@
* @version $Id: en.php 4719 2013-05-03 02:20:28Z chencongzhi520@gmail.com $
* @link http://www.zentao.net
*/
$lang->group->common = 'Group Privilege';
$lang->group->common = 'Privileges';
$lang->group->browse = 'View Group';
$lang->group->create = 'Add Group';
$lang->group->edit = 'Edit Group';
$lang->group->copy = 'Copy Group';
$lang->group->delete = 'Delete Group';
$lang->group->create = 'Add a Group';
$lang->group->edit = 'Edit';
$lang->group->copy = 'Copy';
$lang->group->delete = 'Delete';
$lang->group->manageView = 'View';
$lang->group->managePriv = 'Privilege ';
$lang->group->managePrivByGroup = 'Maintain by Group';
$lang->group->managePrivByModule = 'Maintain by Module';
$lang->group->byModuleTips = '<span class="tips">( Press shift/control to multi select)</span>';
$lang->group->managePriv = 'Privileges';
$lang->group->managePrivByGroup = 'Maintain by Groups';
$lang->group->managePrivByModule = 'Maintain by Moduls';
$lang->group->byModuleTips = '<span class="tips">(Press shift/control to multi select)</span>';
$lang->group->manageMember = 'Members';
$lang->group->confirmDelete = 'Do you want to delete this User Group?';
$lang->group->successSaved = 'Saved!';
$lang->group->errorNotSaved = 'Not saved. Please selected some actions and groups.';
$lang->group->errorNotSaved = 'Not saved. Please select actions and groups.';
$lang->group->viewList = 'Acess List';
$lang->group->productList = 'Access is allowed.' . $lang->productCommon;
$lang->group->projectList = 'Access is allowed.' . $lang->projectCommon;
@@ -32,13 +32,13 @@ $lang->group->noticeVisit = 'N/A means access is not restricted.';
$lang->group->id = 'ID';
$lang->group->name = 'Name';
$lang->group->desc = 'Description';
$lang->group->users = 'User List';
$lang->group->users = 'Users';
$lang->group->module = 'Module';
$lang->group->method = 'Method';
$lang->group->priv = 'Privilege';
$lang->group->option = 'Option';
$lang->group->inside = 'Group users';
$lang->group->outside = 'Other users';
$lang->group->inside = 'Group Users';
$lang->group->outside = 'Other Users';
$lang->group->other = 'Others';
$lang->group->all = 'All';
module/index/lang/en.php
+2 -2
View File
@@ -1,3 +1,3 @@
<?php
$lang->index->common = 'Homepage';
$lang->index->index = 'Homepage';
$lang->index->common = 'Home';
$lang->index->index = 'Home';
module/mail/lang/en.php
+4 -4
View File
@@ -19,7 +19,7 @@ $lang->mail->fromName = 'Sender';
$lang->mail->domain = 'Domain';
$lang->mail->host = 'SMTP Server';
$lang->mail->port = 'SMTP Port';
$lang->mail->auth = 'Verification Required';
$lang->mail->auth = 'Acceptance Required';
$lang->mail->username = 'SMTP Account';
$lang->mail->password = 'SMTP Password';
$lang->mail->secure = 'Secure';
@@ -75,15 +75,15 @@ $lang->mail->sendmailTips = 'Note: Email author will not receive this email.';
$lang->mail->needConfigure = 'Email configuration is not found. Please cinfigure the Email first.';
$lang->mail->nofsocket = 'fsocket related function has been deactivated. Mails cannot send out. Please modify allow_url_fopen in php.ini to turn on Onopenssl, and restart Apache.';
$lang->mail->noOpenssl = 'Please turn on Onopenssl, and restart Apache.';
$lang->mail->disableSecure = 'No openssl, disable ssl and tls.';
$lang->mail->disableSecure = 'No openssl. Disable ssl and tls.';
$lang->mail->sendCloudFail = 'Failed. Reason:';
$lang->mail->sendCloudHelp = <<<EOD
<p>1、Notice SendCloud是SendCloud的Team通知服务。具体可以到<a href="http://notice.sendcloud.net/" target="_blank">notice.sendcloud.net</a>查看</p>
<p>2、accessKey和secretKey可以到登陆后的"设置"页面查看。Email人地址和名称也在"设置"页面设置。</p>
<p>3、Email时，Notice SendCloudContact里面的昵称要跟Email一致，否则无法成功Email。可以到[<a href='%s'>同步Contact</a>]页面，将ZenTaoUser同步到SendCloudContact中</p>
EOD;
$lang->mail->sendCloudSuccess = 'Success';
$lang->mail->closeSendCloud = 'Close sendcloud';
$lang->mail->sendCloudSuccess = 'Done';
$lang->mail->closeSendCloud = 'Close';
$lang->mail->addressWhiteList = 'Please add the email to the whilte list on email server to avoid be treated as spam';
$lang->mail->placeholder = new stdclass();
module/my/lang/en.php
+9 -9
View File
@@ -2,17 +2,17 @@
$lang->my->common = 'My Zone';
/* Method List。*/
$lang->my->index = 'Homepage';
$lang->my->index = 'Home';
$lang->my->todo = 'My To-Dos';
$lang->my->task = 'My Task';
$lang->my->bug = 'My Bug';
$lang->my->testTask = 'My Version';
$lang->my->testCase = 'My Case';
$lang->my->story = 'My Story';
$lang->my->myProject = "My {$lang->projectCommon}";
$lang->my->task = 'My Tasks';
$lang->my->bug = 'My Bugs';
$lang->my->testTask = 'My Builds';
$lang->my->testCase = 'My Cases';
$lang->my->story = 'My Stories';
$lang->my->myProject = "My {$lang->projectCommon}s";
$lang->my->profile = 'My Profile';
$lang->my->dynamic = 'My Dynamic';
$lang->my->editProfile = 'Edi Profile';
$lang->my->editProfile = 'Edit Profile';
$lang->my->changePassword = 'Edit Password';
$lang->my->unbind = 'Unbind Ranger';
$lang->my->manageContacts = 'Maintain Contact';
@@ -32,7 +32,7 @@ $lang->my->storyMenu->reviewedByMe = 'Reviewed by Me';
$lang->my->storyMenu->closedByMe = 'Closed by Me';
$lang->my->home = new stdclass();
$lang->my->home->latest = 'Latest Dynamic';
$lang->my->home->latest = 'Dynamic';
$lang->my->home->action = "%s, %s <em>%s</em> %s <a href='%s'>%s</a>.";
$lang->my->home->projects = $lang->projectCommon;
$lang->my->home->products = $lang->productCommon;
module/product/lang/en.php
+17 -17
View File
@@ -10,10 +10,10 @@
* @link http://www.zentao.net
*/
$lang->product->common = $lang->productCommon . 'View';
$lang->product->index = $lang->productCommon . "Homepage";
$lang->product->browse = "View{$lang->productCommon}";
$lang->product->index = $lang->productCommon . "Home";
$lang->product->browse = "{$lang->productCommon}s";
$lang->product->dynamic = "Dynamic";
$lang->product->view = "{$lang->productCommon}Overview";
$lang->product->view = "{$lang->productCommon}s";
$lang->product->edit = "Edit {$lang->productCommon}";
$lang->product->batchEdit = "Batch Edit";
$lang->product->create = "Create {$lang->productCommon}";
@@ -24,21 +24,21 @@ $lang->product->select = "Please select {$lang->productCommon}";
$lang->product->mine = 'My responsibility:';
$lang->product->other = 'Other:';
$lang->product->closed = 'Closed';
$lang->product->updateOrder = 'Sort';
$lang->product->updateOrder = 'Ranking';
$lang->product->all = "All {$lang->productCommon}";
$lang->product->basicInfo = 'Basic Info';
$lang->product->otherInfo = 'Other Info';
$lang->product->plans = 'Planning Count';
$lang->product->releases = 'Release Count';
$lang->product->docs = 'Document Count';
$lang->product->plans = 'Plans';
$lang->product->releases = 'Releases';
$lang->product->docs = 'Documents';
$lang->product->bugs = 'Linked Bug';
$lang->product->projects = "Linked {$lang->projectCommon} Count";
$lang->product->cases = 'Case Count';
$lang->product->builds = 'Build Count';
$lang->product->projects = "Linked {$lang->projectCommon}s";
$lang->product->cases = 'Cases';
$lang->product->builds = 'Builds';
$lang->product->roadmap = 'Roadmap';
$lang->product->doc = 'Document List';
$lang->product->doc = 'Documents';
$lang->product->project = $lang->projectCommon . 'List';
$lang->product->confirmDelete = " Do you want to delete {$lang->productCommon}?";
@@ -51,11 +51,11 @@ $lang->product->code = "{$lang->productCommon} Code";
$lang->product->order = 'Sort';
$lang->product->type = "{$lang->productCommon} Type";
$lang->product->status = 'Status';
$lang->product->desc = 'Desc';
$lang->product->desc = 'Description';
$lang->product->PO = "{$lang->productCommon} owner";
$lang->product->QD = 'Quality director';
$lang->product->RD = 'Release director';
$lang->product->acl = 'Access limitation';
$lang->product->QD = 'Quality Director';
$lang->product->RD = 'Release Director';
$lang->product->acl = 'Acceptance';
$lang->product->whitelist = 'Whitelist';
$lang->product->branch = '%s';
@@ -71,7 +71,7 @@ $lang->product->willClose = 'To be Closed';
$lang->product->closedStory = 'Closed';
$lang->product->unclosed = 'Open';
$lang->product->allStory = 'AllStory';
$lang->product->allStory = 'All Stories';
$lang->product->allProduct = 'All' . $lang->productCommon;
$lang->product->allProductsOfProject = 'All related' . $lang->productCommon;
@@ -89,7 +89,7 @@ $lang->product->statusList['normal'] = 'Normal';
$lang->product->statusList['closed'] = 'Closed';
$lang->product->aclList['open'] = "Default({$lang->productCommon} with View permission can access to it)";
$lang->product->aclList['private'] = "Private {$lang->productCommon}({$lang->productCommon} of pesponsible person and {$lang->projectCommon} team members only)";
$lang->product->aclList['private'] = "Private{$lang->productCommon}({$lang->projectCommon}team members only)";
$lang->product->aclList['custom'] = 'Custom(Team members and Whitelisr members have access to it.)';
$lang->product->storySummary = " <strong>%s</strong> Story in total on this page, <strong>%s</strong> man-hour estimated. Case coverage is <strong>%s</strong>.";
module/productplan/lang/en.php
+6 -6
View File
@@ -33,24 +33,24 @@ $lang->productplan->batchUnlinkBug = "Batch Remove Bug";
$lang->productplan->linkedBugs = 'Linked Bug';
$lang->productplan->unlinkedBugs = 'Unlinked Bug';
$lang->productplan->confirmDelete = "Do you want to delete this Planning?";
$lang->productplan->confirmDelete = "Do you want to delete this Plan?";
$lang->productplan->confirmUnlinkStory = "Do you want to remove this Story?";
$lang->productplan->confirmUnlinkBug = "Do you want to remove this Bug?";
$lang->productplan->id = 'ID';
$lang->productplan->product = $lang->productCommon;
$lang->productplan->title = 'Title';
$lang->productplan->desc = 'Desc';
$lang->productplan->desc = 'Description';
$lang->productplan->begin = 'Begin';
$lang->productplan->end = 'End';
$lang->productplan->endList[7] = 'One Week';
$lang->productplan->endList[14] = 'Two Weeks';
$lang->productplan->endList[31] = 'One Month';
$lang->productplan->endList[7] = '1 Week';
$lang->productplan->endList[14] = '1 Weeks';
$lang->productplan->endList[31] = '1 Month';
$lang->productplan->endList[62] = '2 Months';
$lang->productplan->endList[93] = '3 Months';
$lang->productplan->endList[186] = '6 Months';
$lang->productplan->endList[365] = 'One Year';
$lang->productplan->endList[365] = '1 Year';
$lang->productplan->errorNoTitle = 'ID %s title should not be empty.';
$lang->productplan->errorNoBegin = 'ID %s begin time should not be empty.';
module/qa/lang/en.php
+1 -1
View File
@@ -9,5 +9,5 @@
* @version $Id: en.php 4129 2013-01-18 01:58:14Z wwccss $
* @link http://www.zentao.net
*/
$lang->qa->common = 'Testing View';
$lang->qa->common = 'Testing';
$lang->qa->index = 'Testing Home';
module/release/lang/en.php
+1 -1
View File
@@ -34,7 +34,7 @@ $lang->release->product = $lang->productCommon;
$lang->release->build = 'Build';
$lang->release->name = 'Name';
$lang->release->date = 'Date';
$lang->release->desc = 'Desc';
$lang->release->desc = 'Description';
$lang->release->status = 'Status';
$lang->release->last = 'Last Release';
$lang->release->unlinkStory = 'Remove Story';
module/report/lang/en.php
+8 -8
View File
@@ -14,7 +14,7 @@ $lang->report->index = 'Home';
$lang->report->list = 'List';
$lang->report->item = 'Item';
$lang->report->value = 'Value';
$lang->report->percent = 'Percentage';
$lang->report->percent = 'Percent';
$lang->report->undefined = 'Undefined';
$lang->report->colors[] = 'AFD8F8';
@@ -34,18 +34,18 @@ $lang->report->singleColor[] = 'F6BD0F';
$lang->report->projectDeviation = $lang->projectCommon . ' Deviation';
$lang->report->productSummary = $lang->productCommon . ' Summary';
$lang->report->bugCreate = 'Bug Summary';
$lang->report->bugCreate = 'Bugs';
$lang->report->bugAssign = 'Bug Assignment';
$lang->report->workload = 'Workload';
$lang->report->workloadAB = 'Workload';
$lang->report->bugOpenedDate = 'Bug Opened Date';
$lang->report->bugOpenedDate = 'Bug Open on';
$lang->report->taskAssignedDate = 'Time Frame';
$lang->report->beginAndEnd = 'Date';
$lang->report->dept = 'Dept';
$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 Summary|report|bugcreate';
$lang->reportList->test->lists[10] = 'Bugs|report|bugcreate';
$lang->reportList->test->lists[13] = 'Bug Assignment|report|bugassign';
$lang->reportList->staff->lists[10] = 'Workload|report|workload';
@@ -53,9 +53,9 @@ $lang->report->id = 'ID';
$lang->report->project = $lang->projectCommon;
$lang->report->product = $lang->productCommon;
$lang->report->user = 'Username';
$lang->report->bug = 'Bug';
$lang->report->bug = 'Bugs';
$lang->report->task = 'Tasks';
$lang->report->estimate = 'Estimation';
$lang->report->estimate = 'Est.';
$lang->report->consumed = 'Consumed';
$lang->report->remain = 'Remained';
$lang->report->deviation = 'Deviation';
@@ -67,10 +67,10 @@ $lang->report->manhourTotal = "Total Man-Hour";
$lang->report->validRate = "Efficiency";
$lang->report->validRateTips = "Solution is fixed/postponed or status is resolved/closed.";
$lang->report->unplanned = 'Unplanned';
$lang->report->workday = 'Man-Hour per Day';
$lang->report->workday = 'Man-Hour/Day';
$lang->report->diffDays = 'Work Days';
$lang->report->conditions = 'Conditions:';
$lang->report->conditions = 'Filter by:';
$lang->report->closedProduct = 'Closed ' . $lang->productCommon;
$lang->report->overduePlan = 'Overdue Plan';
module/search/lang/en.php
+3 -3
View File
@@ -17,9 +17,9 @@ $lang->search->group1 = '1';
$lang->search->group2 = '2';
$lang->search->buildForm = 'Search Form';
$lang->search->buildQuery = 'Execute Query';
$lang->search->saveQuery = 'Save Query';
$lang->search->deleteQuery = 'Delete Query';
$lang->search->setQueryTitle = 'Please enter the title( Please save before searching.):';
$lang->search->saveQuery = 'Save';
$lang->search->deleteQuery = 'Delete';
$lang->search->setQueryTitle = 'Please enter the title( Save it before searching.):';
$lang->search->select = 'Stories/Tasks Filter';
$lang->search->me = 'Me';
$lang->search->noQuery = 'No query saved!';
module/sso/lang/en.php
+5 -5
View File
@@ -11,8 +11,8 @@
*/
$lang->sso = new stdclass();
$lang->sso->settings = 'Settings';
$lang->sso->turnon = 'Turn On';
$lang->sso->code = 'Code';
$lang->sso->turnon = 'On';
$lang->sso->code = 'Alias';
$lang->sso->key = 'Key';
$lang->sso->addr = 'Address';
$lang->sso->bind = 'User Binding';
@@ -32,7 +32,7 @@ $lang->sso->help = <<<EOD
<p>1. Interface address is required. If use PATH_INFO, it is http://YOUR RANGER ADDRESS/sys/sso-check.html If GET, it is http://YOUR RANGER ADDRESS/sys/index.php?m=sso&f=check</p>
<p>2. Code and Key must be the same as set in Ranger.</p>
EOD;
$lang->sso->bindNotice = 'User just added has no rivilege. You have to ask ZenTao Admin to grant permissions to the User.';
$lang->sso->bindNoPassword = 'Password should not be blank.';
$lang->sso->bindNoUser = 'Password is wrong, or this User cannot be found!';
$lang->sso->bindNotice = 'User that is just added has no privilege. You have to ask ZenTao Admin to grant permissions to the User.';
$lang->sso->bindNoPassword = 'Password should not be empty.';
$lang->sso->bindNoUser = 'Password is wrong/User cannot be found!';
$lang->sso->bindHasAccount = 'This username already exists. Change your username or bind to it.';
module/story/lang/en.php
+12 -12
View File
@@ -48,31 +48,31 @@ $lang->story->product = $lang->productCommon;
$lang->story->module = 'Module';
$lang->story->moduleAB = 'Module';
$lang->story->source = 'Source';
$lang->story->sourceNote = 'Source Note';
$lang->story->sourceNote = 'Note';
$lang->story->fromBug = 'From Bug';
$lang->story->title = 'Title';
$lang->story->spec = 'Description';
$lang->story->verify = 'Verify';
$lang->story->verify = 'Acceptance';
$lang->story->pri = 'Priority';
$lang->story->estimate = 'Estimated Man-Hour';
$lang->story->estimateAB = 'Estimation';
$lang->story->estimateAB = 'Est.';
$lang->story->hour = 'Hour';
$lang->story->status = 'Status';
$lang->story->stage = 'Stage';
$lang->story->stageAB = 'Stage';
$lang->story->mailto = 'Mailto';
$lang->story->openedBy = 'Opened By';
$lang->story->openedDate = 'Opened Date';
$lang->story->openedBy = 'Open By';
$lang->story->openedDate = 'Open on';
$lang->story->assignedTo = 'Assigned To';
$lang->story->assignedDate = 'Assigned Date';
$lang->story->lastEditedBy = 'Last Edited By';
$lang->story->lastEditedDate = 'Last Edited Date';
$lang->story->lastEditedDate = 'Last Edited on';
$lang->story->closedBy = 'Closed By';
$lang->story->closedDate = 'Closed Date';
$lang->story->closedReason = 'Closed Reason';
$lang->story->rejectedReason = 'RejectED Reason';
$lang->story->reviewedBy = 'Reviewed By';
$lang->story->reviewedDate = 'Reviewed Date';
$lang->story->reviewedDate = 'Reviewed on';
$lang->story->version = 'Version';
$lang->story->plan = 'Planning';
$lang->story->planAB = 'Plan';
@@ -80,10 +80,10 @@ $lang->story->comment = 'Comment';
$lang->story->linkStories = 'Linke Story';
$lang->story->childStories = 'Subdivide Story';
$lang->story->duplicateStory = 'Duplicate Story';
$lang->story->reviewResult = 'Review Result';
$lang->story->reviewResult = 'Review Results';
$lang->story->preVersion = 'Previous Version';
$lang->story->keywords = 'Keyword';
$lang->story->newStory = 'Continue Add Story.';
$lang->story->keywords = 'Keywords';
$lang->story->newStory = 'Continue Adding Story.';
$lang->story->colorTag = 'Color Tag';
$lang->story->files = 'Files';
@@ -115,7 +115,7 @@ $lang->story->reasonList['done'] = 'Done';
$lang->story->reasonList['subdivided'] = 'Subdivided';
$lang->story->reasonList['duplicate'] = 'Duplicate';
$lang->story->reasonList['postponed'] = 'Postponed';
$lang->story->reasonList['willnotdo'] = "Won't do";
$lang->story->reasonList['willnotdo'] = "Ignore";
$lang->story->reasonList['cancel'] = 'Cancelled';
$lang->story->reasonList['bydesign'] = 'Default Design';
//$lang->story->reasonList['isbug'] = 'Bug!';
@@ -161,7 +161,7 @@ $lang->story->legendFromBug = 'From Bug';
$lang->story->legendCases = 'Linked Case';
$lang->story->legendLinkStories = 'Linked Story';
$lang->story->legendChildStories = 'Subdivide Story';
$lang->story->legendSpec = 'Story Desc';
$lang->story->legendSpec = 'Story Description';
$lang->story->legendVerify = 'Acceptance Criteria';
$lang->story->legendMisc = 'Misc ';
module/task/lang/en.php
+2 -2
View File
@@ -90,8 +90,8 @@ $lang->task->editEstimate = 'Edit Man-Hour';
$lang->task->deleteEstimate = 'Delete Man-Hour';
$lang->task->colorTag = 'Color Tag';
$lang->task->files = 'Files';
$lang->task->hasConsumed = 'Has Consumed';
$lang->task->thisConsume = 'This Consumption';
$lang->task->hasConsumed = 'Total Consumed';
$lang->task->thisConsume = 'This Consumed';
$lang->task->ditto = 'Ditto';
$lang->task->dittoNotice = "This Task does not belong to the Project as the previous one does!";
module/testcase/lang/en.php
+7 -7
View File
@@ -20,8 +20,8 @@ $lang->testcase->pri = 'Priority';
$lang->testcase->type = 'Type';
$lang->testcase->status = 'Status';
$lang->testcase->steps = 'Steps';
$lang->testcase->openedBy = 'Opened By';
$lang->testcase->openedDate = 'Opened Date';
$lang->testcase->openedBy = 'Open By';
$lang->testcase->openedDate = 'Open on';
$lang->testcase->lastEditedBy = 'Last Edited by';
$lang->testcase->result = 'Result';
$lang->testcase->real = 'Real';
@@ -32,8 +32,8 @@ $lang->testcase->linkCases = 'Link Cases';
$lang->testcase->unlinkCase = 'Unlink Case';
$lang->testcase->stage = 'Stage';
$lang->testcase->lastEditedByAB = 'Last Edited By';
$lang->testcase->lastEditedDateAB = 'Last Edited Date';
$lang->testcase->lastEditedDate = 'Last Edited Date';
$lang->testcase->lastEditedDateAB = 'Last Edited on';
$lang->testcase->lastEditedDate = 'Last Edited on';
$lang->testcase->version = 'Case Version';
$lang->testcase->lastRunner = 'Last Run By';
$lang->testcase->lastRunDate = 'Run Date';
@@ -62,8 +62,8 @@ $lang->testcase->batchEdit = "Batch Edit ";
$lang->testcase->batchChangeModule = "Batch Change Module";
$lang->testcase->delete = "Delete";
$lang->testcase->batchDelete = "Batch Delete ";
$lang->testcase->browse = "Case List";
$lang->testcase->groupCase = "Group View";
$lang->testcase->browse = "Cases";
$lang->testcase->groupCase = "View By";
$lang->testcase->import = "Import";
$lang->testcase->showImport = "Show Import";
$lang->testcase->exportTemplet = "Export Template";
@@ -74,7 +74,7 @@ $lang->testcase->copy = 'Duplicate Case';
$lang->testcase->new = 'New';
$lang->testcase->num = 'Case Count:';
$lang->testcase->num = 'Cases:';
$lang->testcase->deleteStep = 'Delete';
$lang->testcase->insertBefore = 'Inserted Before';
module/testtask/lang/en.php
+12 -12
View File
@@ -14,7 +14,7 @@ $lang->testtask->create = "Create";
$lang->testtask->delete = "Delete";
$lang->testtask->view = "Info";
$lang->testtask->edit = "Edit";
$lang->testtask->browse = "Browse";
$lang->testtask->browse = "Test Tasks";
$lang->testtask->linkCase = "Link Case";
$lang->testtask->unlinkCase = "Unlink Case";
$lang->testtask->batchAssign = "Batch Assign";
@@ -24,7 +24,7 @@ $lang->testtask->results = "Result";
$lang->testtask->createBug = "Bug(+)";
$lang->testtask->assign = 'Assign';
$lang->testtask->cases = 'Cases';
$lang->testtask->groupCase = "View by Group";
$lang->testtask->groupCase = "View By";
$lang->testtask->pre = 'Previous';
$lang->testtask->next = 'Next';
$lang->testtask->start = "Start";
@@ -39,9 +39,9 @@ $lang->testtask->build = 'Build';
$lang->testtask->owner = 'Owner';
$lang->testtask->pri = 'Priority';
$lang->testtask->name = 'Name';
$lang->testtask->begin = 'Begin Date';
$lang->testtask->end = 'End Date';
$lang->testtask->desc = 'Desc';
$lang->testtask->begin = 'Begin';
$lang->testtask->end = 'End';
$lang->testtask->desc = 'Description';
$lang->testtask->mailto = 'Mailto';
$lang->testtask->status = 'Status';
$lang->testtask->assignedTo = 'Assign';
@@ -50,14 +50,14 @@ $lang->testtask->lastRunAccount = "Run";
$lang->testtask->lastRunTime = 'Time';
$lang->testtask->lastRunResult = 'Result';
$lang->testtask->report = 'Report';
$lang->testtask->files = 'Upload Files';
$lang->testtask->files = 'Upload';
$lang->testtask->legendDesc = 'Desc';
$lang->testtask->legendReport = 'Report';
$lang->testtask->legendBasicInfo = 'Basic Info';
$lang->testtask->statusList['wait'] = 'Pending';
$lang->testtask->statusList['doing'] = 'Ongoing';
$lang->testtask->statusList['wait'] = 'Wait';
$lang->testtask->statusList['doing'] = 'Doing';
$lang->testtask->statusList['done'] = 'Done';
$lang->testtask->statusList['blocked'] = 'Blocked';
@@ -82,14 +82,14 @@ $lang->testtask->confirmUnlinkCase = 'Do you want to remove this Case?';
$lang->testtask->assignedToMe = 'Assigned to Me';
$lang->testtask->allCases = 'All Cases';
$lang->testtask->lblCases = 'Case List';
$lang->testtask->lblCases = 'Cases';
$lang->testtask->lblUnlinkCase = 'Remove Case';
$lang->testtask->lblRunCase = 'Run Case';
$lang->testtask->lblResults = 'Result';
$lang->testtask->lblResults = 'Results';
$lang->testtask->placeholder = new stdclass();
$lang->testtask->placeholder->begin = 'Begin Date';
$lang->testtask->placeholder->end = 'End Date';
$lang->testtask->placeholder->begin = 'Begin';
$lang->testtask->placeholder->end = 'End';
$lang->testtask->mail = new stdclass();
$lang->testtask->mail->create = new stdclass();
module/todo/lang/en.php
+2 -2
View File
@@ -39,8 +39,8 @@ $lang->todo->private = 'Private';
$lang->todo->confirmBug = 'This To-Do is linked to Bug #%s. Do you want to edit it?';
$lang->todo->confirmTask = 'This To-Do is linked to Task #%s，Do you want to edit it?';
$lang->todo->statusList['wait'] = 'Pending';
$lang->todo->statusList['doing'] = 'Ongoing';
$lang->todo->statusList['wait'] = 'Wait';
$lang->todo->statusList['doing'] = 'Doing';
$lang->todo->statusList['done'] = 'Done';
//$lang->todo->statusList['cancel'] = 'Cancelled';
//$lang->todo->statusList['postpone'] = 'Delayed';
module/tree/lang/en.php
+2 -2
View File
@@ -30,10 +30,10 @@ $lang->tree->manageCaseChild = 'Manage Child Case';
$lang->tree->manageTaskChild = "Manage Child {$lang->projectCommon}";
$lang->tree->syncFromProduct = 'Copy';
$lang->tree->dragAndSort = "Drag and Sort";
$lang->tree->sort = "Sort";
$lang->tree->sort = "Ranking";
$lang->tree->addChild = "Add Child Module";
$lang->tree->confirmDelete = 'Do you want to delete this Module and its Child?';
$lang->tree->confirmDelete = 'Do you want to delete this Module and its Children?';
$lang->tree->confirmRoot = "Changes on {$lang->productCommon} will change the Story, Bug, Case of {$lang->productCommon} it belongs to, as well as the realtion of {$lang->projectCommon} and {$lang->productCommon}, which is dangerous, please be aware of it. Do you want to change?";
$lang->tree->successSave = 'Saved.';
$lang->tree->successFixed = 'Fixed.';
module/upgrade/lang/en.php
+1 -1
View File
@@ -43,7 +43,7 @@ $lang->upgrade->toVersion = 'Upgrade to Version';
$lang->upgrade->confirm = 'Confirm SQL';
$lang->upgrade->sureExecute = 'Execute';
$lang->upgrade->forbiddenExt = 'Extension is not compatible with the upgraded version. It has been deactivated:';
$lang->upgrade->updateFile = 'Need to update the attachment information.';
$lang->upgrade->updateFile = 'Attachment information has to be updated.';
$lang->upgrade->fromVersions['0_3beta'] = '0.3 BETA';
$lang->upgrade->fromVersions['0_4beta'] = '0.4 BETA';
module/user/lang/en.php
+6 -6
View File
@@ -18,15 +18,15 @@ $lang->user->password = 'Password';
$lang->user->password2 = 'Repeat password';
$lang->user->role = 'Role';
$lang->user->group = 'Group';
$lang->user->realname = 'Real Name';
$lang->user->realname = 'Name';
$lang->user->nickname = 'Nickname';
$lang->user->commiter = 'Commit Account';
$lang->user->commiter = 'Commiter';
$lang->user->birthyear = 'Birth Year';
$lang->user->gender = 'Gender';
$lang->user->email = 'Email';
$lang->user->basicInfo = 'Basic Info';
$lang->user->accountInfo = 'Account';
$lang->user->verify = 'Verification';
$lang->user->verify = 'Acceptance';
$lang->user->contactInfo = 'Contact';
$lang->user->skype = 'Skype';
$lang->user->qq = 'QQ';
@@ -89,7 +89,7 @@ $lang->user->canceledBy = 'Cancelled by him';
$lang->user->testTask2Him = 'His Build';
$lang->user->case2Him = 'His Case';
$lang->user->caseByHim = 'Case Opened by Him';
$lang->user->caseByHim = 'Case Open by Him';
$lang->user->errorDeny = "Sorry, your access to <b>%s</b> Module <b>%s</b> Feature has been denied. Please contact Admin to get permission. Click Back to return.";
$lang->user->loginFailed = "Login failed. Please check your account and password.";
@@ -147,8 +147,8 @@ $lang->user->contacts = new stdclass();
$lang->user->contacts->common = 'Contact';
$lang->user->contacts->listName = 'List Name';
$lang->user->contacts->manage = 'Manage List';
$lang->user->contacts->contactsList = 'List';
$lang->user->contacts->manage = 'Manage';
$lang->user->contacts->contactsList = 'Contacts';
$lang->user->contacts->selectedUsers = 'Select User';
$lang->user->contacts->selectList = 'Select List';
$lang->user->contacts->createList = 'Create a List';
www/install.php
-37
View File
@@ -1,37 +0,0 @@
<?php
/**
* The install router file of ZenTaoPMS.
*
* @copyright Copyright 2009-2013 QingDao Nature Easy Soft Network Technology Co,LTD (www.cnezsoft.com)
* @license ZPL (http://zpl.pub/page/zplv12.html)
* @author Chunsheng Wang <chunsheng@cnezsoft.com>
* @package ZenTaoPMS
* @version $Id: install.php 4677 2013-04-26 06:23:58Z chencongzhi520@gmail.com $
* @link http://www.zentao.net
*/
error_reporting(0);
session_start();
define('IN_INSTALL', true);
/* Load the framework. */
include '../framework/router.class.php';
include '../framework/control.class.php';
include '../framework/model.class.php';
include '../framework/helper.class.php';
/* Instance the app. */
$app = router::createApp('pms', dirname(dirname(__FILE__)), 'router');
/* Check installed or not. */
if(!isset($_SESSION['installing']) and isset($config->installed) and $config->installed) die(header('location: index.php'));
/* Reset the config params to make sure the install program will be lauched. */
$config->set('requestType', 'GET');
$config->set('default.module', 'install');
$app->setDebug();
/* During the installation, if the database params is setted, auto connect the db. */
if(isset($config->installed) and $config->installed) $app->connectDB();
$app->parseRequest();
$app->loadModule();
www/upgrade.php
-46
View File
@@ -1,46 +0,0 @@
<?php
/**
* The upgrade router file of ZenTaoPMS.
*
* @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
* @license ZPL (http://zpl.pub/page/zplv12.html)
* @author Chunsheng Wang <chunsheng@cnezsoft.com>
* @package ZenTaoPMS
* @version $Id: upgrade.php 4677 2013-04-26 06:23:58Z chencongzhi520@gmail.com $
* @link http://www.zentao.net
*/
/* Judge my.php exists or not. */
define('IN_UPGRADE', true);
$myConfig = dirname(dirname(__FILE__)) . '/config/my.php';
if(!file_exists($myConfig))
{
echo "文件" . $myConfig . "不存在！ 提示：不要重命名原来的禅道安装目录，下载最新的源码包，覆盖即可。" . "<br />";
echo $myConfig . " doesn't exists! Please don't rename zentao before overriding the source code!";
exit;
}
error_reporting(0);
/* Load the framework. */
include '../framework/router.class.php';
include '../framework/control.class.php';
include '../framework/model.class.php';
include '../framework/helper.class.php';
/* Instance the app. */
$app = router::createApp('pms', dirname(dirname(__FILE__)), 'router');
$common = $app->loadCommon();
/* Reset the config params to make sure the install program will be lauched. */
$config->set('requestType', 'GET');
$config->set('default.module', 'upgrade');
$app->setDebug();
/* Check the installed version is the latest or not. */
$config->installedVersion = $common->loadModel('setting')->getVersion();
if(version_compare($config->version, $config->installedVersion) <= 0) die(header('location: index.php'));
/* Run it. */
$app->parseRequest();
$common->checkUpgradeStatus();
$app->loadModule();