diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php index 6cfa8b2611..b4820acc3b 100755 --- a/module/action/lang/zh-cn.php +++ b/module/action/lang/zh-cn.php @@ -32,6 +32,9 @@ $lang->action->editComment = '修改备注'; $lang->action->create = '添加备注'; $lang->action->comment = '备注'; +$lang->action->undeleteAction = '还原数据'; +$lang->action->hideOneAction = '隐藏数据'; + $lang->action->trashTips = '提示：为了保证系统的完整性，禅道系统的删除都是标记删除。'; $lang->action->textDiff = '文本格式'; $lang->action->original = '原始格式'; diff --git a/module/backup/lang/zh-cn.php b/module/backup/lang/zh-cn.php index 2b16e8cf41..f47c2a1137 100644 --- a/module/backup/lang/zh-cn.php +++ b/module/backup/lang/zh-cn.php @@ -1,5 +1,5 @@ backup->common = '备份'; +$lang->backup->common = '系统备份'; $lang->backup->index = '备份首页'; $lang->backup->history = '备份历史'; $lang->backup->delete = '删除备份'; @@ -8,6 +8,9 @@ $lang->backup->restore = '还原'; $lang->backup->change = '保留时间'; $lang->backup->changeAB = '修改'; $lang->backup->rmPHPHeader = '去除安全设置'; +$lang->backup->setting = '设置'; + +$lang->backup->settingAction = '备份设置'; $lang->backup->time = '备份时间'; $lang->backup->files = '备份文件'; @@ -19,7 +22,6 @@ $lang->backup->status = '状态'; $lang->backup->statusList['success'] = '成功'; $lang->backup->statusList['fail'] = '失败'; -$lang->backup->setting = '设置'; $lang->backup->settingDir = '备份目录'; $lang->backup->settingList['nofile'] = '不备份附件和代码'; $lang->backup->settingList['nosafe'] = '不需要防下载PHP文件头'; diff --git a/module/bug/model.php b/module/bug/model.php index c489d62260..bcd0e04bcd 100644 --- a/module/bug/model.php +++ b/module/bug/model.php @@ -1150,9 +1150,10 @@ class bugModel extends model $openedBuilds = $this->post->openedBuild; if($openedBuilds) { + $this->loadModel('build'); foreach($openedBuilds as $openedBuild) { - $build = $this->getByID($openedBuild); + $build = $this->build->getByID($openedBuild); $build->bugs = trim(str_replace(",$bugID,", ',', ",$build->bugs,"), ','); $this->dao->update(TABLE_BUILD)->set('bugs')->eq($build->bugs)->where('id')->eq((int)$openedBuild)->exec(); } diff --git a/module/caselib/lang/zh-cn.php b/module/caselib/lang/zh-cn.php index b3fe557eb8..90cc8b069e 100644 --- a/module/caselib/lang/zh-cn.php +++ b/module/caselib/lang/zh-cn.php @@ -15,7 +15,7 @@ $lang->caselib->all = '所有用例库'; $lang->caselib->index = "用例库首页"; $lang->caselib->create = "创建用例库"; $lang->caselib->edit = '编辑用例库'; -$lang->caselib->browse = '浏览库用例'; +$lang->caselib->browse = '浏览用例库'; $lang->caselib->view = '查看库概况'; $lang->caselib->createCase = '创建用例'; $lang->caselib->delete = "删除"; @@ -24,9 +24,13 @@ $lang->caselib->deleted = '已删除'; $lang->caselib->exportTemplet = '导出模板'; $lang->caselib->batchCreateCase = '批量创建用例'; $lang->caselib->import = '导入'; -$lang->caselib->importAction = '导入用例'; $lang->caselib->showImport = '显示导入数据'; +$lang->caselib->browseAction = '用例库列表'; +$lang->caselib->deleteAction = "删除用例库"; +$lang->caselib->importAction = '导入用例'; +$lang->caselib->linkVersion = "版本"; + $lang->caselib->id = '编号'; $lang->caselib->name = '名称'; $lang->caselib->desc = '描述'; diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php index f2b09ad06b..8c6c3047f5 100644 --- a/module/common/lang/menu.php +++ b/module/common/lang/menu.php @@ -509,22 +509,15 @@ $lang->navGroup->productplan = 'product'; $lang->navGroup->release = 'product'; $lang->navGroup->branch = 'product'; $lang->navGroup->story = 'product'; -$lang->navGroup->tree = 'product'; $lang->navGroup->project = 'project'; -$lang->navGroup->testcase = 'project'; -$lang->navGroup->testtask = 'project'; -$lang->navGroup->testreport = 'project'; -$lang->navGroup->testsuite = 'project'; -$lang->navGroup->caselib = 'project'; -$lang->navGroup->feedback = 'project'; $lang->navGroup->deploy = 'project'; $lang->navGroup->stakeholder = 'project'; +$lang->navGroup->projectbuild = 'project'; $lang->navGroup->projectstory = 'project'; $lang->navGroup->review = 'project'; $lang->navGroup->reviewissue = 'project'; -$lang->navGroup->milestone = 'project'; $lang->navGroup->pssp = 'project'; $lang->navGroup->auditplan = 'project'; $lang->navGroup->cm = 'project'; @@ -532,6 +525,7 @@ $lang->navGroup->nc = 'project'; $lang->navGroup->projectrelease = 'project'; $lang->navGroup->build = 'project'; $lang->navGroup->measrecord = 'project'; +$lang->navGroup->milestone = 'project'; $lang->navGroup->execution = 'execution'; $lang->navGroup->task = 'execution'; @@ -546,12 +540,20 @@ $lang->navGroup->bug = 'qa'; $lang->navGroup->testcase = 'qa'; $lang->navGroup->testtask = 'qa'; $lang->navGroup->automation = 'qa'; +$lang->navGroup->testreport = 'qa'; +$lang->navGroup->testcase = 'qa'; +$lang->navGroup->testtask = 'qa'; +$lang->navGroup->testsuite = 'qa'; +$lang->navGroup->caselib = 'qa'; $lang->navGroup->devops = 'devops'; $lang->navGroup->repo = 'devops'; $lang->navGroup->job = 'devops'; $lang->navGroup->jenkins = 'devops'; $lang->navGroup->compile = 'devops'; +$lang->navGroup->ci = 'devops'; +$lang->navGroup->svn = 'devops'; +$lang->navGroup->git = 'devops'; $lang->navGroup->company = 'system'; $lang->navGroup->sqlbuilder = 'system'; diff --git a/module/cron/lang/zh-cn.php b/module/cron/lang/zh-cn.php index ae73267a10..5f526482c7 100644 --- a/module/cron/lang/zh-cn.php +++ b/module/cron/lang/zh-cn.php @@ -1,5 +1,5 @@ cron->common = '计划任务'; +$lang->cron->common = '定时任务'; $lang->cron->index = '首页'; $lang->cron->list = '任务列表'; $lang->cron->create = '添加'; diff --git a/module/doc/lang/zh-cn.php b/module/doc/lang/zh-cn.php index f9e1b3a0a2..ddf398a44d 100644 --- a/module/doc/lang/zh-cn.php +++ b/module/doc/lang/zh-cn.php @@ -82,6 +82,8 @@ $lang->doc->collect = '收藏'; $lang->doc->cancelCollection = '取消收藏'; $lang->doc->deleteFile = '删除附件'; +$lang->doc->collectAction = '收藏文档'; + $lang->doc->libName = '文档库名称'; $lang->doc->libType = '文档库类型'; $lang->doc->custom = '自定义文档库'; diff --git a/module/extension/lang/zh-cn.php b/module/extension/lang/zh-cn.php index 6f64bbc913..164c06497d 100644 --- a/module/extension/lang/zh-cn.php +++ b/module/extension/lang/zh-cn.php @@ -29,6 +29,8 @@ $lang->extension->eraseAction = '清除插件'; $lang->extension->upgrade = '升级插件'; $lang->extension->agreeLicense = '我同意该授权'; +$lang->extension->browseAction = '插件列表'; + $lang->extension->structure = '目录结构'; $lang->extension->structureAction = '目录结构'; $lang->extension->installed = '已安装'; @@ -95,7 +97,7 @@ $lang->extension->noticeOkFile = '
为了安全起见，系统需
  1. 文件内容为空。
  2. 如果之前文件存在，删除之后重新创建。
    3. -
'; + '; $lang->extension->upgradeExt = '升级'; $lang->extension->installExt = '安装'; diff --git a/module/group/control.php b/module/group/control.php index 110fa34821..e8090b0030 100644 --- a/module/group/control.php +++ b/module/group/control.php @@ -146,6 +146,13 @@ class group extends control $this->view->projects = $this->dao->select('*')->from(TABLE_PROJECT)->where('deleted')->eq('0')->andWhere('type')->eq('project')->orderBy('order_desc')->fetchPairs('id', 'name'); $this->view->products = $this->dao->select('*')->from(TABLE_PRODUCT)->where('deleted')->eq('0')->orderBy('order_desc')->fetchPairs('id', 'name'); + $navGroup = array(); + foreach($this->lang->navGroup as $moduleName => $groupName) + { + if($groupName == $moduleName) continue; + $navGroup[$groupName][$moduleName] = $moduleName; + } + $this->view->navGroup = $navGroup; $this->display(); } diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index 9974ed4305..21a2bb1159 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -21,9 +21,9 @@ $lang->moduleOrder[25] = 'product'; $lang->moduleOrder[30] = 'story'; $lang->moduleOrder[35] = 'productplan'; $lang->moduleOrder[40] = 'release'; -$lang->moduleOrder[45] = 'projectstory'; -$lang->moduleOrder[50] = 'project'; +$lang->moduleOrder[45] = 'project'; +$lang->moduleOrder[50] = 'projectstory'; $lang->moduleOrder[55] = 'execution'; $lang->moduleOrder[60] = 'task'; $lang->moduleOrder[65] = 'build'; @@ -73,26 +73,28 @@ $lang->index->methodOrder[0] = 'index'; /* My module. */ $lang->resource->my = new stdclass(); -$lang->resource->my->index = 'index'; +$lang->resource->my->index = 'indexAction'; $lang->resource->my->todo = 'todo'; -$lang->resource->my->calendar = 'calendar'; -$lang->resource->my->work = 'work'; -$lang->resource->my->contribute = 'contribute'; +$lang->resource->my->calendar = 'calendarAction'; +$lang->resource->my->work = 'workAction'; +$lang->resource->my->contribute = 'contributeAction'; $lang->resource->my->project = 'project'; -$lang->resource->my->profile = 'profile'; +$lang->resource->my->profile = 'profileAction'; $lang->resource->my->uploadAvatar = 'uploadAvatar'; $lang->resource->my->preference = 'preference'; -$lang->resource->my->dynamic = 'dynamic'; +$lang->resource->my->dynamic = 'dynamicAction'; $lang->resource->my->editProfile = 'editProfile'; $lang->resource->my->changePassword = 'changePassword'; $lang->resource->my->manageContacts = 'manageContacts'; $lang->resource->my->deleteContacts = 'deleteContacts'; $lang->resource->my->score = 'score'; -$lang->resource->my->unbind = 'unbind'; $lang->resource->my->team = 'team'; $lang->resource->my->story = 'story'; $lang->resource->my->task = 'task'; $lang->resource->my->bug = 'bug'; +$lang->resource->my->doc = 'doc'; +$lang->resource->my->issue = 'issue'; +$lang->resource->my->risk = 'risk'; $lang->resource->my->testtask = 'testtask'; $lang->resource->my->testcase = 'testcase'; $lang->resource->my->execution = 'execution'; @@ -119,6 +121,9 @@ $lang->my->methodOrder[90] = 'bug'; $lang->my->methodOrder[95] = 'testtask'; $lang->my->methodOrder[100] = 'testcase'; $lang->my->methodOrder[105] = 'execution'; +$lang->my->methodOrder[110] = 'doc'; +$lang->my->methodOrder[115] = 'issue'; +$lang->my->methodOrder[120] = 'risk'; /* Todo. */ $lang->resource->todo = new stdclass(); @@ -145,6 +150,7 @@ if($config->systemMode == 'new') /* Program. */ $lang->resource->program = new stdclass(); $lang->resource->program->browse = 'browse'; + $lang->resource->program->view = 'view'; $lang->resource->program->product = 'product'; $lang->resource->program->create = 'create'; $lang->resource->program->edit = 'edit'; @@ -158,16 +164,18 @@ if($config->systemMode == 'new') $lang->resource->program->createStakeholder = 'createStakeholder'; $lang->resource->program->unlinkStakeholder = 'unlinkStakeholder'; $lang->resource->program->batchUnlinkStakeholders = 'batchUnlinkStakeholders'; + $lang->resource->program->unbindWhitelist = 'unbindWhitelist'; $lang->resource->program->export = 'export'; $lang->program->methodOrder[10] = 'browse'; $lang->program->methodOrder[15] = 'product'; $lang->program->methodOrder[20] = 'create'; $lang->program->methodOrder[25] = 'edit'; - $lang->program->methodOrder[30] = 'start'; - $lang->program->methodOrder[35] = 'suspend'; - $lang->program->methodOrder[40] = 'close'; - $lang->program->methodOrder[45] = 'activate'; + $lang->program->methodOrder[30] = 'view'; + $lang->program->methodOrder[35] = 'start'; + $lang->program->methodOrder[40] = 'suspend'; + $lang->program->methodOrder[45] = 'close'; + $lang->program->methodOrder[50] = 'activate'; $lang->program->methodOrder[55] = 'delete'; $lang->program->methodOrder[60] = 'project'; $lang->program->methodOrder[65] = 'stakeholder'; @@ -175,45 +183,48 @@ if($config->systemMode == 'new') $lang->program->methodOrder[70] = 'unlinkStakeholder'; $lang->program->methodOrder[75] = 'batchUnlinkStakeholders'; $lang->program->methodOrder[80] = 'export'; + $lang->program->methodOrder[85] = 'unbindWhitelist'; /* Project. */ $lang->resource->project = new stdclass(); - $lang->resource->project->index = 'index'; - $lang->resource->project->browse = 'browse'; - $lang->resource->project->programTitle = 'moduleOpen'; - $lang->resource->project->create = 'create'; - $lang->resource->project->edit = 'edit'; - $lang->resource->project->batchEdit = 'batchEdit'; - $lang->resource->project->group = 'group'; - $lang->resource->project->createGroup = 'createGroup'; - $lang->resource->project->manageView = 'manageView'; - $lang->resource->project->managePriv = 'managePriv'; - $lang->resource->project->manageMembers = 'manageMembers'; - $lang->resource->project->manageGroupMember = 'manageGroupMember'; - $lang->resource->project->copyGroup = 'copyGroup'; - $lang->resource->project->editGroup = 'editGroup'; - $lang->resource->project->start = 'start'; - $lang->resource->project->suspend = 'suspend'; - $lang->resource->project->close = 'close'; - $lang->resource->project->activate = 'activate'; - $lang->resource->project->delete = 'delete'; - $lang->resource->project->view = 'view'; - $lang->resource->project->whitelist = 'whitelist'; - $lang->resource->project->addWhitelist = 'addWhitelist'; - $lang->resource->project->unbindWhitelist = 'unbindWhitelist'; - $lang->resource->project->manageProducts = 'manageProducts'; - $lang->resource->project->view = 'view'; - $lang->resource->project->dynamic = 'dynamic'; - $lang->resource->project->build = 'build'; - $lang->resource->project->qa = 'qa'; - $lang->resource->project->bug = 'bug'; - $lang->resource->project->testcase = 'testcase'; - $lang->resource->project->testtask = 'testtask'; - $lang->resource->project->execution = 'execution'; + $lang->resource->project->index = 'index'; + $lang->resource->project->browse = 'browse'; + $lang->resource->project->projectTitle = 'moduleOpen'; + $lang->resource->project->create = 'create'; + $lang->resource->project->edit = 'edit'; + $lang->resource->project->batchEdit = 'batchEdit'; + $lang->resource->project->group = 'group'; + $lang->resource->project->createGroup = 'createGroup'; + $lang->resource->project->manageView = 'manageView'; + $lang->resource->project->managePriv = 'managePriv'; + $lang->resource->project->manageMembers = 'manageMembers'; + $lang->resource->project->manageGroupMember = 'manageGroupMember'; + $lang->resource->project->copyGroup = 'copyGroup'; + $lang->resource->project->editGroup = 'editGroup'; + $lang->resource->project->start = 'start'; + $lang->resource->project->suspend = 'suspend'; + $lang->resource->project->close = 'close'; + $lang->resource->project->activate = 'activate'; + $lang->resource->project->delete = 'delete'; + $lang->resource->project->view = 'view'; + $lang->resource->project->whitelist = 'whitelist'; + $lang->resource->project->addWhitelist = 'addWhitelist'; + $lang->resource->project->unbindWhitelist = 'unbindWhitelist'; + $lang->resource->project->manageProducts = 'manageProducts'; + $lang->resource->project->view = 'view'; + $lang->resource->project->dynamic = 'dynamic'; + $lang->resource->project->build = 'build'; + $lang->resource->project->qa = 'qa'; + $lang->resource->project->bug = 'bug'; + $lang->resource->project->testcase = 'testcase'; + $lang->resource->project->testtask = 'testtask'; + $lang->resource->project->execution = 'execution'; + $lang->resource->project->export = 'export'; + $lang->resource->project->createGuide = 'createGuide'; $lang->project->methodOrder[0] = 'index'; $lang->project->methodOrder[5] = 'browse'; - $lang->project->methodOrder[10] = 'programTitle'; + $lang->project->methodOrder[10] = 'projectTitle'; $lang->project->methodOrder[15] = 'create'; $lang->project->methodOrder[20] = 'edit'; $lang->project->methodOrder[25] = 'batchEdit'; @@ -244,6 +255,13 @@ if($config->systemMode == 'new') $lang->project->methodOrder[150] = 'testcase'; $lang->project->methodOrder[155] = 'testtask'; $lang->project->methodOrder[160] = 'execution'; + $lang->project->methodOrder[165] = 'export'; + $lang->project->methodOrder[175] = 'createGuide'; + + $lang->resource->projectbuild = new stdclass(); + $lang->resource->projectbuild->browse = 'browse'; + + $lang->projectbuild->methodOrder[5] = 'browse'; /* Personnel . */ $lang->resource->personnel = new stdclass(); @@ -262,7 +280,7 @@ if($config->systemMode == 'new') /* Project Story. */ $lang->resource->projectstory = new stdclass(); $lang->resource->projectstory->story = 'story'; - $lang->resource->projectstory->track = 'track'; + $lang->resource->projectstory->track = 'trackAction'; $lang->resource->projectstory->view = 'view'; $lang->resource->projectstory->linkStory = 'linkStory'; $lang->resource->projectstory->unlinkStory = 'unlinkStory'; @@ -277,7 +295,7 @@ if($config->systemMode == 'new') /* Release. */ $lang->resource->projectrelease = new stdclass(); - $lang->resource->projectrelease->browse = 'browse'; + $lang->resource->projectrelease->browse = 'browseAction'; $lang->resource->projectrelease->create = 'create'; $lang->resource->projectrelease->edit = 'edit'; $lang->resource->projectrelease->delete = 'delete'; @@ -308,7 +326,7 @@ if($config->systemMode == 'new') /* Product. */ $lang->resource->product = new stdclass(); -$lang->resource->product->index = 'index'; +$lang->resource->product->index = 'indexAction'; $lang->resource->product->browse = 'browse'; $lang->resource->product->create = 'create'; $lang->resource->product->view = 'view'; @@ -367,9 +385,9 @@ $lang->resource->stakeholder->create = 'create'; $lang->resource->stakeholder->batchCreate = 'batchCreate'; $lang->resource->stakeholder->edit = 'edit'; $lang->resource->stakeholder->delete = 'delete'; -$lang->resource->stakeholder->view = 'view'; +$lang->resource->stakeholder->view = 'viewAction'; $lang->resource->stakeholder->issue = 'issue'; -$lang->resource->stakeholder->viewIssue = 'viewIssue'; +$lang->resource->stakeholder->viewIssue = 'viewIssueAction'; $lang->resource->stakeholder->communicate = 'communicate'; $lang->resource->stakeholder->expect = 'expect'; $lang->resource->stakeholder->expectation = 'expectation'; @@ -400,7 +418,7 @@ $lang->stakeholder->methodOrder[80] = 'userIssue'; $lang->resource->story = new stdclass(); $lang->resource->story->create = 'create'; $lang->resource->story->batchCreate = 'batchCreate'; -$lang->resource->story->edit = 'edit'; +$lang->resource->story->edit = 'editAction'; $lang->resource->story->linkStory = 'linkStory'; $lang->resource->story->batchEdit = 'batchEdit'; $lang->resource->story->export = 'exportAction'; @@ -646,7 +664,7 @@ $lang->resource->task->delete = 'deleteAction'; $lang->resource->task->view = 'view'; $lang->resource->task->export = 'exportAction'; $lang->resource->task->confirmStoryChange = 'confirmStoryChange'; -$lang->resource->task->recordEstimate = 'recordEstimate'; +$lang->resource->task->recordEstimate = 'recordEstimateAction'; $lang->resource->task->editEstimate = 'editEstimate'; $lang->resource->task->deleteEstimate = 'deleteEstimate'; $lang->resource->task->report = 'reportChart'; @@ -701,13 +719,12 @@ $lang->build->methodOrder[50] = 'batchUnlinkBug'; /* QA. */ $lang->resource->qa = new stdclass(); -$lang->resource->qa->index = 'index'; +$lang->resource->qa->index = 'indexAction'; $lang->qa->methodOrder[0] = 'index'; /* Bug. */ $lang->resource->bug = new stdclass(); -$lang->resource->bug->index = 'index'; $lang->resource->bug->browse = 'browse'; $lang->resource->bug->create = 'create'; $lang->resource->bug->batchCreate = 'batchCreate'; @@ -759,7 +776,6 @@ $lang->bug->methodOrder[110] = 'batchChangeBranch'; /* Test case. */ $lang->resource->testcase = new stdclass(); -$lang->resource->testcase->index = 'index'; $lang->resource->testcase->browse = 'browse'; $lang->resource->testcase->groupCase = 'groupCase'; $lang->resource->testcase->create = 'create'; @@ -814,11 +830,10 @@ $lang->testcase->methodOrder[115] = 'batchCaseTypeChange'; /* Test task. */ $lang->resource->testtask = new stdclass(); -$lang->resource->testtask->index = 'index'; $lang->resource->testtask->create = 'create'; $lang->resource->testtask->browse = 'browse'; -$lang->resource->testtask->view = 'view'; -$lang->resource->testtask->cases = 'cases'; +$lang->resource->testtask->view = 'viewAction'; +$lang->resource->testtask->cases = 'casesAction'; $lang->resource->testtask->groupCase = 'groupCase'; $lang->resource->testtask->edit = 'edit'; $lang->resource->testtask->start = 'startAction'; @@ -897,10 +912,10 @@ $lang->testsuite->methodOrder[40] = 'batchUnlinkCases'; $lang->resource->caselib = new stdclass(); $lang->resource->caselib->index = 'index'; -$lang->resource->caselib->browse = 'browse'; +$lang->resource->caselib->browse = 'browseAction'; $lang->resource->caselib->create = 'create'; $lang->resource->caselib->edit = 'edit'; -$lang->resource->caselib->delete = 'delete'; +$lang->resource->caselib->delete = 'deleteAction'; $lang->resource->caselib->view = 'view'; $lang->resource->caselib->createCase = 'createCase'; $lang->resource->caselib->batchCreateCase = 'batchCreateCase'; @@ -926,7 +941,7 @@ $lang->resource->automation->browse = 'browse'; $lang->automation->methodOrder[0] = 'browse'; $lang->resource->repo = new stdclass(); -$lang->resource->repo->browse = 'browse'; +$lang->resource->repo->browse = 'browseAction'; $lang->resource->repo->view = 'view'; $lang->resource->repo->log = 'log'; $lang->resource->repo->revision = 'revisionAction'; @@ -936,7 +951,7 @@ $lang->resource->repo->edit = 'editAction'; $lang->resource->repo->delete = 'delete'; $lang->resource->repo->showSyncCommit = 'showSyncCommit'; $lang->resource->repo->diff = 'diffAction'; -$lang->resource->repo->download = 'download'; +$lang->resource->repo->download = 'downloadAction'; $lang->resource->repo->maintain = 'maintain'; $lang->resource->repo->setRules = 'setRules'; @@ -967,10 +982,10 @@ $lang->compile->methodOrder[5] = 'browse'; $lang->compile->methodOrder[10] = 'logs'; $lang->resource->jenkins = new stdclass(); -$lang->resource->jenkins->browse = 'browse'; +$lang->resource->jenkins->browse = 'browseAction'; $lang->resource->jenkins->create = 'create'; $lang->resource->jenkins->edit = 'edit'; -$lang->resource->jenkins->delete = 'delete'; +$lang->resource->jenkins->delete = 'deleteAction'; $lang->jenkins->methodOrder[5] = 'browse'; $lang->jenkins->methodOrder[10] = 'create'; @@ -978,7 +993,7 @@ $lang->jenkins->methodOrder[15] = 'edit'; $lang->jenkins->methodOrder[20] = 'delete'; $lang->resource->job = new stdclass(); -$lang->resource->job->browse = 'browse'; +$lang->resource->job->browse = 'browseAction'; $lang->resource->job->create = 'create'; $lang->resource->job->edit = 'edit'; $lang->resource->job->delete = 'delete'; @@ -1007,7 +1022,7 @@ $lang->resource->doc->allLibs = 'allLibs'; $lang->resource->doc->objectLibs = 'objectLibs'; $lang->resource->doc->showFiles = 'showFiles'; $lang->resource->doc->sort = 'sort'; -$lang->resource->doc->collect = 'collect'; +$lang->resource->doc->collect = 'collectAction'; //$lang->resource->doc->diff = 'diff'; $lang->doc->methodOrder[0] = 'index'; @@ -1071,6 +1086,7 @@ $lang->resource->custom->timezone = 'timezone'; $lang->resource->custom->setStoryConcept = 'setStoryConcept'; $lang->resource->custom->editStoryConcept = 'editStoryConcept'; $lang->resource->custom->browseStoryConcept = 'browseStoryConcept'; +$lang->resource->custom->setDefaultConcept = 'setDefaultConcept'; $lang->resource->custom->deleteStoryConcept = 'deleteStoryConcept'; $lang->custom->methodOrder[5] = 'index'; @@ -1082,10 +1098,11 @@ $lang->custom->methodOrder[30] = 'flow'; $lang->custom->methodOrder[35] = 'working'; $lang->custom->methodOrder[40] = 'setPublic'; $lang->custom->methodOrder[45] = 'timezone'; -$lang->custom->methodOrder[50] = 'setStoryContcept'; -$lang->custom->methodOrder[55] = 'editStoryContcept'; -$lang->custom->methodOrder[60] = 'browseStoryContcept'; -$lang->custom->methodOrder[65] = 'deleteStoryContcept'; +$lang->custom->methodOrder[50] = 'setStoryConcept'; +$lang->custom->methodOrder[55] = 'editStoryConcept'; +$lang->custom->methodOrder[60] = 'browseStoryConcept'; +$lang->custom->methodOrder[65] = 'setDefaultConcept'; +$lang->custom->methodOrder[70] = 'deleteStoryConcept'; $lang->resource->datatable = new stdclass(); $lang->resource->datatable->setGlobal = 'setGlobal'; @@ -1180,6 +1197,8 @@ $lang->resource->user->cropAvatar = 'cropAvatar'; $lang->resource->user->profile = 'profile'; $lang->resource->user->batchEdit = 'batchEdit'; $lang->resource->user->unbind = 'unbind'; +$lang->resource->user->issue = 'issue'; +$lang->resource->user->risk = 'risk'; $lang->resource->user->setPublicTemplate = 'setPublicTemplate'; $lang->user->methodOrder[5] = 'create'; @@ -1192,12 +1211,14 @@ $lang->user->methodOrder[30] = 'todo'; $lang->user->methodOrder[35] = 'task'; $lang->user->methodOrder[40] = 'bug'; $lang->user->methodOrder[45] = 'project'; -$lang->user->methodOrder[50] = 'dynamic'; -$lang->user->methodOrder[55] = 'cropAvatar'; -$lang->user->methodOrder[60] = 'profile'; -$lang->user->methodOrder[65] = 'batchEdit'; -$lang->user->methodOrder[70] = 'unbind'; -$lang->user->methodOrder[75] = 'setPublicTemplate'; +$lang->user->methodOrder[50] = 'issue'; +$lang->user->methodOrder[55] = 'risk'; +$lang->user->methodOrder[60] = 'dynamic'; +$lang->user->methodOrder[65] = 'cropAvatar'; +$lang->user->methodOrder[70] = 'profile'; +$lang->user->methodOrder[75] = 'batchEdit'; +$lang->user->methodOrder[80] = 'unbind'; +$lang->user->methodOrder[85] = 'setPublicTemplate'; /* Tree. */ $lang->resource->tree = new stdclass(); @@ -1269,7 +1290,7 @@ $lang->admin->methodOrder[30] = 'ztCompany'; /* Extension. */ $lang->resource->extension = new stdclass(); -$lang->resource->extension->browse = 'browse'; +$lang->resource->extension->browse = 'browseAction'; $lang->resource->extension->obtain = 'obtain'; $lang->resource->extension->structure = 'structureAction'; $lang->resource->extension->install = 'install'; @@ -1293,11 +1314,11 @@ $lang->extension->methodOrder[50] = 'upgrade'; /* Webhook. */ $lang->resource->webhook = new stdclass(); -$lang->resource->webhook->browse = 'browse'; +$lang->resource->webhook->browse = 'list'; $lang->resource->webhook->create = 'create'; $lang->resource->webhook->edit = 'edit'; $lang->resource->webhook->delete = 'delete'; -$lang->resource->webhook->log = 'log'; +$lang->resource->webhook->log = 'logAction'; $lang->resource->webhook->bind = 'bind'; $lang->resource->webhook->chooseDept = 'chooseDept'; @@ -1348,8 +1369,8 @@ $lang->message->methodOrder[15] = 'setting'; $lang->resource->action = new stdclass(); $lang->resource->action->trash = 'trash'; -$lang->resource->action->undelete = 'undelete'; -$lang->resource->action->hideOne = 'hideOne'; +$lang->resource->action->undelete = 'undeleteAction'; +$lang->resource->action->hideOne = 'hideOneAction'; $lang->resource->action->hideAll = 'hideAll'; $lang->resource->action->comment = 'comment'; $lang->resource->action->editComment = 'editComment'; @@ -1367,7 +1388,7 @@ $lang->resource->backup->backup = 'backup'; $lang->resource->backup->restore = 'restore'; $lang->resource->backup->change = 'change'; $lang->resource->backup->delete = 'delete'; -$lang->resource->backup->setting = 'setting'; +$lang->resource->backup->setting = 'settingAction'; $lang->resource->backup->rmPHPHeader = 'rmPHPHeader'; $lang->backup->methodOrder[5] = 'index'; diff --git a/module/group/view/manageview.html.php b/module/group/view/manageview.html.php index 3c90899db2..af5554b258 100644 --- a/module/group/view/manageview.html.php +++ b/module/group/view/manageview.html.php @@ -92,13 +92,14 @@ mainNav as $module => $title):?> + action->dynamicAction->$module) and !isset($navGroup[$module])) continue;?> @@ -115,6 +116,8 @@ + + action->dynamicAction->$subModule)):?>
action->dynamicAction->$subModule as $action => $actionTitle):?> @@ -127,6 +130,8 @@
+ + diff --git a/module/group/view/privbygroup.html.php b/module/group/view/privbygroup.html.php index c5b3eccd73..66c6b83b16 100644 --- a/module/group/view/privbygroup.html.php +++ b/module/group/view/privbygroup.html.php @@ -56,14 +56,14 @@ mainNav as $module => $title):?> - " . substr($title, 0, strpos($title, '|')) . '', '', "class='btn btn-link $active'")?> + " . strip_tags(substr($title, 0, strpos($title, '|'))) . '', '', "class='btn btn-link $active'")?> {$lang->group->other}", '', "class='btn btn-link $active'");?>
- lang->group->versions, $version, "onchange=showPriv(this.value) class='form-control chosen'");?> + lang->group->versions, $version, "onchange=showPriv(this.value) class='form-control chosen'");?>
diff --git a/module/jenkins/lang/zh-cn.php b/module/jenkins/lang/zh-cn.php index e06aed916e..1c64df3e28 100644 --- a/module/jenkins/lang/zh-cn.php +++ b/module/jenkins/lang/zh-cn.php @@ -6,6 +6,9 @@ $lang->jenkins->edit = '编辑Jenkins'; $lang->jenkins->delete = '删除'; $lang->jenkins->confirmDelete = '确认删除该Jenkins吗？'; +$lang->jenkins->browseAction = 'Jenkins列表'; +$lang->jenkins->deleteAction = '删除Jenkins'; + $lang->jenkins->id = 'ID'; $lang->jenkins->name = '名称'; $lang->jenkins->url = '服务地址'; diff --git a/module/job/lang/zh-cn.php b/module/job/lang/zh-cn.php index 680afdba97..366fb3c0de 100644 --- a/module/job/lang/zh-cn.php +++ b/module/job/lang/zh-cn.php @@ -10,6 +10,8 @@ $lang->job->confirmDelete = '确认删除该构建任务'; $lang->job->dirChange = '目录改动'; $lang->job->buildTag = '打标签'; +$lang->job->browseAction = '构建任务列表'; + $lang->job->id = 'ID'; $lang->job->name = '名称'; $lang->job->repo = '代码库'; diff --git a/module/my/lang/zh-cn.php b/module/my/lang/zh-cn.php index 84ed89ed58..474d3c1dbd 100644 --- a/module/my/lang/zh-cn.php +++ b/module/my/lang/zh-cn.php @@ -41,6 +41,13 @@ $lang->my->testtask = '我的测试单'; $lang->my->testcase = '我的用例'; $lang->my->storyConcept = $config->URAndSR ? '默认需求概念组合' : '默认需求概念'; +$lang->my->indexAction = '地盘仪表盘'; +$lang->my->calendarAction = '我的日程'; +$lang->my->workAction = '我的待处理'; +$lang->my->contributeAction = '我的贡献'; +$lang->my->profileAction = '个人档案'; +$lang->my->dynamicAction = '动态'; + $lang->my->myExecutions = "我参与的阶段/冲刺/迭代"; $lang->my->name = '名称'; $lang->my->code = '代号'; diff --git a/module/product/lang/zh-cn.php b/module/product/lang/zh-cn.php index a0fb147f20..ba563352fb 100644 --- a/module/product/lang/zh-cn.php +++ b/module/product/lang/zh-cn.php @@ -9,29 +9,33 @@ * @version $Id: zh-cn.php 5091 2013-07-10 06:06:46Z chencongzhi520@gmail.com $ * @link http://www.zentao.net */ -$lang->product->index = $lang->productCommon . '主页'; -$lang->product->browse = "{$lang->SRCommon}列表"; -$lang->product->dynamic = $lang->productCommon . '动态'; -$lang->product->view = "{$lang->productCommon}概况"; -$lang->product->edit = "编辑{$lang->productCommon}"; -$lang->product->batchEdit = '批量编辑'; -$lang->product->create = "添加{$lang->productCommon}"; -$lang->product->delete = "删除{$lang->productCommon}"; -$lang->product->deleted = '已删除'; -$lang->product->close = '关闭'; +$lang->product->index = $lang->productCommon . '主页'; +$lang->product->browse = "{$lang->SRCommon}列表"; +$lang->product->dynamic = $lang->productCommon . '动态'; +$lang->product->view = "{$lang->productCommon}概况"; +$lang->product->edit = "编辑{$lang->productCommon}"; +$lang->product->batchEdit = '批量编辑'; +$lang->product->create = "添加{$lang->productCommon}"; +$lang->product->delete = "删除{$lang->productCommon}"; +$lang->product->deleted = '已删除'; +$lang->product->close = '关闭'; +$lang->product->select = "请选择{$lang->productCommon}"; +$lang->product->mine = '我负责：'; +$lang->product->other = '其他：'; +$lang->product->closed = '已关闭'; +$lang->product->updateOrder = '排序'; +$lang->product->all = "所有{$lang->productCommon}"; +$lang->product->manageLine = "维护{$lang->productCommon}线"; +$lang->product->export = '导出数据'; +$lang->product->dashboard = "{$lang->productCommon}仪表盘"; +$lang->product->changeProgram = "{$lang->productCommon}调整所属项目集影响范围确认"; +$lang->product->addWhitelist = '添加白名单'; +$lang->product->unbindWhitelist = '移除白名单'; + +$lang->product->indexAction = "所有{$lang->productCommon}仪表盘"; $lang->product->closeAction = "关闭{$lang->productCommon}"; -$lang->product->select = "请选择{$lang->productCommon}"; -$lang->product->mine = '我负责：'; -$lang->product->other = '其他：'; -$lang->product->closed = '已关闭'; -$lang->product->updateOrder = '排序'; $lang->product->orderAction = "{$lang->productCommon}排序"; -$lang->product->all = "所有{$lang->productCommon}"; -$lang->product->manageLine = "维护{$lang->productCommon}线"; -$lang->product->export = '导出数据'; $lang->product->exportAction = "导出{$lang->productCommon}"; -$lang->product->dashboard = "{$lang->productCommon}仪表盘"; -$lang->product->changeProgram = "{$lang->productCommon}调整所属项目集影响范围确认"; $lang->product->basicInfo = '基本信息'; $lang->product->otherInfo = '其他信息'; @@ -90,8 +94,6 @@ $lang->product->QD = '测试负责人'; $lang->product->RD = '发布负责人'; $lang->product->acl = '访问控制'; $lang->product->whitelist = '白名单'; -$lang->product->addWhitelist = '添加白名单'; -$lang->product->unbindWhitelist = '删除白名单'; $lang->product->branch = '所属%s'; $lang->product->qa = '测试'; $lang->product->release = '发布'; diff --git a/module/program/lang/zh-cn.php b/module/program/lang/zh-cn.php index 6a86bfedf4..5f958595b8 100644 --- a/module/program/lang/zh-cn.php +++ b/module/program/lang/zh-cn.php @@ -43,6 +43,8 @@ $lang->program->confirmBatchUnlink = "您确定要批量移除这些干系 $lang->program->stakeholderType = '干系人类型'; $lang->program->isStakeholderKey = '关键干系人'; $lang->program->importStakeholder = '从父项目集导入'; +$lang->program->unbindWhitelist = '移除白名单'; +$lang->program->importStakeholder = '从父项目集导入'; $lang->program->manageMembers = '项目集团队'; $lang->program->beyondParentBudget = '已超出所属项目集的剩余预算'; $lang->program->parentBudget = '所属项目集剩余预算：'; diff --git a/module/projectbuild/lang/de.php b/module/projectbuild/lang/de.php new file mode 100644 index 0000000000..91d431abba --- /dev/null +++ b/module/projectbuild/lang/de.php @@ -0,0 +1,13 @@ + + * @package projectrelease + * @version $Id: zh-cn.php 4129 2020-11-27 01:58:14Z wwccss $ + * @link http://www.zentao.net + */ +$lang->projectbuild->common = 'Project Build'; +$lang->projectbuild->browse = 'Build List'; diff --git a/module/projectbuild/lang/en.php b/module/projectbuild/lang/en.php new file mode 100644 index 0000000000..91d431abba --- /dev/null +++ b/module/projectbuild/lang/en.php @@ -0,0 +1,13 @@ + + * @package projectrelease + * @version $Id: zh-cn.php 4129 2020-11-27 01:58:14Z wwccss $ + * @link http://www.zentao.net + */ +$lang->projectbuild->common = 'Project Build'; +$lang->projectbuild->browse = 'Build List'; diff --git a/module/projectbuild/lang/fr.php b/module/projectbuild/lang/fr.php new file mode 100644 index 0000000000..91d431abba --- /dev/null +++ b/module/projectbuild/lang/fr.php @@ -0,0 +1,13 @@ + + * @package projectrelease + * @version $Id: zh-cn.php 4129 2020-11-27 01:58:14Z wwccss $ + * @link http://www.zentao.net + */ +$lang->projectbuild->common = 'Project Build'; +$lang->projectbuild->browse = 'Build List'; diff --git a/module/projectbuild/lang/vi.php b/module/projectbuild/lang/vi.php new file mode 100644 index 0000000000..91d431abba --- /dev/null +++ b/module/projectbuild/lang/vi.php @@ -0,0 +1,13 @@ + + * @package projectrelease + * @version $Id: zh-cn.php 4129 2020-11-27 01:58:14Z wwccss $ + * @link http://www.zentao.net + */ +$lang->projectbuild->common = 'Project Build'; +$lang->projectbuild->browse = 'Build List'; diff --git a/module/projectbuild/lang/zh-cn.php b/module/projectbuild/lang/zh-cn.php new file mode 100644 index 0000000000..802e90f069 --- /dev/null +++ b/module/projectbuild/lang/zh-cn.php @@ -0,0 +1,13 @@ + + * @package projectrelease + * @version $Id: zh-cn.php 4129 2020-11-27 01:58:14Z wwccss $ + * @link http://www.zentao.net + */ +$lang->projectbuild->common = '项目版本'; +$lang->projectbuild->browse = '版本列表'; diff --git a/module/projectbuild/lang/zh-tw.php b/module/projectbuild/lang/zh-tw.php new file mode 100644 index 0000000000..1af64da7db --- /dev/null +++ b/module/projectbuild/lang/zh-tw.php @@ -0,0 +1,27 @@ + + * @package release + * @version $Id: zh-tw.php 4129 2020-11-27 01:58:14Z wwccss $ + * @link http://www.zentao.net + */ +$lang->projectrelease->common = '項目發佈'; +$lang->projectrelease->create = "創建發佈"; +$lang->projectrelease->edit = "編輯發佈"; +$lang->projectrelease->linkStory = "關聯{$lang->SRCommon}"; +$lang->projectrelease->linkBug = "關聯Bug"; +$lang->projectrelease->delete = "刪除發佈"; +$lang->projectrelease->deleted = '已刪除'; +$lang->projectrelease->view = "發佈詳情"; +$lang->projectrelease->browse = "瀏覽發佈"; +$lang->projectrelease->changeStatus = "修改狀態"; +$lang->projectrelease->batchUnlink = "批量移除"; +$lang->projectrelease->batchUnlinkStory = "批量移除{$lang->SRCommon}"; +$lang->projectrelease->batchUnlinkBug = "批量移除Bug"; +$lang->projectrelease->unlinkStory = "移除{$lang->SRCommon}"; +$lang->projectrelease->unlinkBug = '移除Bug'; +$lang->projectrelease->export = '導出HTML'; diff --git a/module/projectrelease/lang/zh-cn.php b/module/projectrelease/lang/zh-cn.php index dd028508fe..d7bdc6e73a 100644 --- a/module/projectrelease/lang/zh-cn.php +++ b/module/projectrelease/lang/zh-cn.php @@ -25,3 +25,5 @@ $lang->projectrelease->batchUnlinkBug = "批量移除Bug"; $lang->projectrelease->unlinkStory = "移除{$lang->SRCommon}"; $lang->projectrelease->unlinkBug = '移除Bug'; $lang->projectrelease->export = '导出HTML'; + +$lang->projectrelease->browseAction = "发布列表"; diff --git a/module/projectstory/lang/zh-cn.php b/module/projectstory/lang/zh-cn.php index 57e2e30b7a..3fbb63603e 100644 --- a/module/projectstory/lang/zh-cn.php +++ b/module/projectstory/lang/zh-cn.php @@ -9,6 +9,8 @@ $lang->projectstory->unlinkStory = '移除' . $lang->SRCommon; $lang->projectstory->importplanstories = '按计划关联' . $lang->SRCommon; $lang->projectstory->whyNoStories = "看起来没有{$lang->SRCommon}可以关联。请检查下项目关联的{$lang->productCommon}中有没有{$lang->SRCommon}，而且要确保它们已经审核通过。"; +$lang->projectstory->trackAction = '跟踪矩阵'; + global $app; $app->loadLang('product'); $lang->projectstory->featureBar['story']['allstory'] = $lang->product->allStory; diff --git a/module/qa/lang/zh-cn.php b/module/qa/lang/zh-cn.php index 831ba6a5ff..4666e2fd36 100644 --- a/module/qa/lang/zh-cn.php +++ b/module/qa/lang/zh-cn.php @@ -10,3 +10,5 @@ * @link http://www.zentao.net */ $lang->qa->index = '测试主页'; + +$lang->qa->indexAction = '测试仪表盘'; diff --git a/module/release/lang/de.php b/module/release/lang/de.php index 668cdae08a..7ad42950d8 100644 --- a/module/release/lang/de.php +++ b/module/release/lang/de.php @@ -9,7 +9,7 @@ * @version $Id: en.php 4129 2013-01-18 01:58:14Z wwccss $ * @link http://www.zentao.net */ -$lang->release->common = 'Release'; +$lang->release->common = 'Product Release'; $lang->release->create = "Erstellen"; $lang->release->edit = "Bearbeiten"; $lang->release->linkStory = "Story verknüpfen"; diff --git a/module/release/lang/en.php b/module/release/lang/en.php index b8c0f7a668..614f409cc5 100644 --- a/module/release/lang/en.php +++ b/module/release/lang/en.php @@ -9,7 +9,7 @@ * @version $Id: en.php 4129 2013-01-18 01:58:14Z wwccss $ * @link http://www.zentao.net */ -$lang->release->common = 'Release'; +$lang->release->common = 'Product Release'; $lang->release->create = "Create Release"; $lang->release->edit = "Edit Release"; $lang->release->linkStory = "Link Story"; diff --git a/module/release/lang/fr.php b/module/release/lang/fr.php index 08a8186be9..794a18a0cb 100644 --- a/module/release/lang/fr.php +++ b/module/release/lang/fr.php @@ -9,7 +9,7 @@ * @version $Id: en.php 4129 2013-01-18 01:58:14Z wwccss $ * @link https://www.zentao.pm */ -$lang->release->common = 'Release'; +$lang->release->common = 'Product Release'; $lang->release->create = "Créer Release"; $lang->release->edit = "Editer Release"; $lang->release->linkStory = "Intégrer Story"; diff --git a/module/release/lang/vi.php b/module/release/lang/vi.php index aca0ed642b..57607a8d2a 100644 --- a/module/release/lang/vi.php +++ b/module/release/lang/vi.php @@ -9,7 +9,7 @@ * @version $Id: vi.php 4129 2013-01-18 01:58:14Z wwccss $ * @link http://www.zentao.net */ -$lang->release->common = 'Phát hành'; +$lang->release->common = 'Product Release'; $lang->release->create = "Tạo phát hành"; $lang->release->edit = "Sửa phát hành"; $lang->release->linkStory = "Liên kết câu chuyện"; diff --git a/module/release/lang/zh-cn.php b/module/release/lang/zh-cn.php index 81a9260366..e108611d91 100644 --- a/module/release/lang/zh-cn.php +++ b/module/release/lang/zh-cn.php @@ -9,7 +9,7 @@ * @version $Id: zh-cn.php 4129 2013-01-18 01:58:14Z wwccss $ * @link http://www.zentao.net */ -$lang->release->common = '发布'; +$lang->release->common = '产品发布'; $lang->release->create = "创建发布"; $lang->release->edit = "编辑发布"; $lang->release->linkStory = "关联{$lang->SRCommon}"; diff --git a/module/repo/lang/zh-cn.php b/module/repo/lang/zh-cn.php index 456ef979d0..eba6fe4af5 100644 --- a/module/repo/lang/zh-cn.php +++ b/module/repo/lang/zh-cn.php @@ -4,19 +4,14 @@ $lang->repo->browse = '浏览'; $lang->repo->viewRevision = '查看修订'; $lang->repo->product = '所属产品'; $lang->repo->create = '创建'; -$lang->repo->createAction = '创建版本库'; $lang->repo->maintain = '版本库列表'; $lang->repo->edit = '编辑'; -$lang->repo->editAction = '编辑版本库'; $lang->repo->delete = '删除版本库'; $lang->repo->showSyncCommit = '显示同步进度'; $lang->repo->ajaxSyncCommit = '接口：AJAX同步注释'; $lang->repo->setRules = '指令配置'; $lang->repo->download = '下载'; $lang->repo->downloadDiff = '下载Diff'; -$lang->repo->diffAction = '版本对比'; -$lang->repo->revisionAction = '版本详情'; -$lang->repo->blameAction = '版本追溯'; $lang->repo->addBug = '添加评审'; $lang->repo->editBug = '编辑评审'; $lang->repo->deleteBug = '删除评审'; @@ -24,6 +19,15 @@ $lang->repo->addComment = '添加备注'; $lang->repo->editComment = '编辑备注'; $lang->repo->deleteComment = '删除备注'; +$lang->repo->browseAction = '浏览版本库'; +$lang->repo->createAction = '创建版本库'; +$lang->repo->editAction = '编辑版本库'; +$lang->repo->diffAction = '版本对比'; +$lang->repo->downloadAction = '下载代码库文件'; +$lang->repo->revisionAction = '版本详情'; +$lang->repo->blameAction = '版本追溯'; +$lang->repo->reviewAction = '评审列表'; + $lang->repo->submit = '提交'; $lang->repo->cancel = '取消'; $lang->repo->addComment = '添加评论'; diff --git a/module/stakeholder/lang/zh-cn.php b/module/stakeholder/lang/zh-cn.php index 567a5ab5b1..7c2dd53148 100644 --- a/module/stakeholder/lang/zh-cn.php +++ b/module/stakeholder/lang/zh-cn.php @@ -26,6 +26,9 @@ $lang->stakeholder->issue = '问题管理'; $lang->stakeholder->viewIssue = '活动问题列表'; $lang->stakeholder->userIssue = '干系人问题列表'; +$lang->stakeholder->viewAction = '干系人详情'; +$lang->stakeholder->viewIssueAction = '问题列表'; + /* Fields. */ $lang->stakeholder->id = '编号'; $lang->stakeholder->user = '用户'; diff --git a/module/story/lang/zh-cn.php b/module/story/lang/zh-cn.php index 547ba377bf..1064a32491 100644 --- a/module/story/lang/zh-cn.php +++ b/module/story/lang/zh-cn.php @@ -22,12 +22,9 @@ $lang->story->affectedStories = "影响的{$lang->story->story}"; $lang->story->batchCreate = "批量创建"; $lang->story->change = "变更"; -$lang->story->changeAction = "变更{$lang->SRCommon}"; $lang->story->changed = "{$lang->SRCommon}变更"; $lang->story->assignTo = '指派'; -$lang->story->assignAction = "指派{$lang->SRCommon}"; $lang->story->review = '评审'; -$lang->story->reviewAction = "评审{$lang->SRCommon}"; $lang->story->needReview = '需要评审'; $lang->story->batchReview = '批量评审'; $lang->story->edit = "编辑"; @@ -37,15 +34,11 @@ $lang->story->link = '关联'; $lang->story->unlink = '移除'; $lang->story->track = '跟踪矩阵'; $lang->story->processStoryChange = '处理需求变更'; -$lang->story->subdivideAction = "细分{$lang->SRCommon}"; $lang->story->splitRequirent = '拆分'; $lang->story->close = '关闭'; -$lang->story->closeAction = "关闭{$lang->SRCommon}"; $lang->story->batchClose = '批量关闭'; $lang->story->activate = '激活'; -$lang->story->activateAction = "激活{$lang->SRCommon}"; $lang->story->delete = "删除"; -$lang->story->deleteAction = "删除{$lang->SRCommon}"; $lang->story->view = "{$lang->SRCommon}详情"; $lang->story->setting = "设置"; $lang->story->tasks = "相关任务"; @@ -60,11 +53,9 @@ $lang->story->caseCountAB = 'C'; $lang->story->linkStory = "关联{$lang->SRCommon}"; $lang->story->unlinkStory = "移除相关{$lang->SRCommon}"; $lang->story->export = "导出数据"; -$lang->story->exportAction = "导出{$lang->SRCommon}"; $lang->story->zeroCase = "零用例{$lang->SRCommon}"; $lang->story->zeroTask = "只列零任务{$lang->SRCommon}"; $lang->story->reportChart = "统计报表"; -$lang->story->reportAction = "统计报表"; $lang->story->copyTitle = "同{$lang->SRCommon}名称"; $lang->story->batchChangePlan = "批量修改计划"; $lang->story->batchChangeBranch = "批量修改分支"; @@ -76,6 +67,17 @@ $lang->story->toTask = '转任务'; $lang->story->batchToTask = '批量转任务'; $lang->story->convertRelations = '换算关系'; +$lang->story->editAction = "编辑{$lang->SRCommon}"; +$lang->story->changeAction = "变更{$lang->SRCommon}"; +$lang->story->assignAction = "指派{$lang->SRCommon}"; +$lang->story->reviewAction = "评审{$lang->SRCommon}"; +$lang->story->subdivideAction = "细分{$lang->SRCommon}"; +$lang->story->closeAction = "关闭{$lang->SRCommon}"; +$lang->story->activateAction = "激活{$lang->SRCommon}"; +$lang->story->deleteAction = "删除{$lang->SRCommon}"; +$lang->story->exportAction = "导出{$lang->SRCommon}"; +$lang->story->reportAction = "统计报表"; + $lang->story->skipStory = '需求：%s 为父需求，将不会被关闭。'; $lang->story->closedStory = '需求：%s 已关闭，将不会被关闭。'; $lang->story->batchToTaskTips = "此操作会创建与所选{$lang->SRCommon}同名的任务，并将{$lang->SRCommon}关联到任务中，已关闭的需求不会转为任务。"; diff --git a/module/task/lang/zh-cn.php b/module/task/lang/zh-cn.php index ceecb0892e..2ad7786c67 100644 --- a/module/task/lang/zh-cn.php +++ b/module/task/lang/zh-cn.php @@ -131,6 +131,8 @@ $lang->task->lblPri = 'P'; $lang->task->lblHour = '(h)'; $lang->task->lblTestStory = "测试{$lang->SRCommon}"; +$lang->task->recordEstimateAction = '添加工时'; + $lang->task->ditto = '同上'; $lang->task->dittoNotice = "该任务与上一任务不属于同一%s！"; $lang->task->selectTestStory = "选择测试{$lang->SRCommon}"; diff --git a/module/testtask/lang/zh-cn.php b/module/testtask/lang/zh-cn.php index 0c66996a4c..beb1e98585 100644 --- a/module/testtask/lang/zh-cn.php +++ b/module/testtask/lang/zh-cn.php @@ -12,7 +12,6 @@ $lang->testtask->index = "测试单首页"; $lang->testtask->create = "提交测试"; $lang->testtask->reportChart = '报表统计'; -$lang->testtask->reportAction = '用例报表统计'; $lang->testtask->delete = "删除测试单"; $lang->testtask->importUnitResult = "导入单元测试结果"; $lang->testtask->importunitresult = "导入单元测试"; //Fix bug custom required testtask. @@ -29,7 +28,6 @@ $lang->testtask->batchAssign = "批量指派"; $lang->testtask->runCase = "执行"; $lang->testtask->batchRun = "批量执行"; $lang->testtask->results = "结果"; -$lang->testtask->resultsAction = "用例结果"; $lang->testtask->createBug = "提Bug"; $lang->testtask->assign = '指派'; $lang->testtask->cases = '用例'; @@ -37,14 +35,10 @@ $lang->testtask->groupCase = "分组浏览用例"; $lang->testtask->pre = '上一个'; $lang->testtask->next = '下一个'; $lang->testtask->start = "开始"; -$lang->testtask->startAction = "开始测试单"; $lang->testtask->close = "关闭"; -$lang->testtask->closeAction = "关闭测试单"; $lang->testtask->wait = "待测测试单"; $lang->testtask->block = "阻塞"; -$lang->testtask->blockAction = "阻塞测试单"; $lang->testtask->activate = "激活"; -$lang->testtask->activateAction = "激活测试单"; $lang->testtask->testing = "测试中测试单"; $lang->testtask->blocked = "被阻塞测试单"; $lang->testtask->done = "已测测试单"; @@ -54,6 +48,15 @@ $lang->testtask->allTasks = '所有测试'; $lang->testtask->collapseAll = '全部折叠'; $lang->testtask->expandAll = '全部展开'; +$lang->testtask->viewAction = "测试单概况"; +$lang->testtask->casesAction = '查看用例'; +$lang->testtask->activateAction = "激活测试单"; +$lang->testtask->blockAction = "阻塞测试单"; +$lang->testtask->closeAction = "关闭测试单"; +$lang->testtask->startAction = "开始测试单"; +$lang->testtask->resultsAction = "用例结果"; +$lang->testtask->reportAction = '用例报表统计'; + $lang->testtask->id = '编号'; $lang->testtask->common = '测试单'; $lang->testtask->product = '所属' . $lang->productCommon; diff --git a/module/tree/view/edit.html.php b/module/tree/view/edit.html.php index ea8b1c1625..a73ca853ed 100644 --- a/module/tree/view/edit.html.php +++ b/module/tree/view/edit.html.php @@ -134,6 +134,12 @@ $(function() }) $('#dataform .chosen').chosen(); + $("#dataform .picker-select[data-pickertype!='remote']").picker({chosenMode: true}); + $("#dataform [data-pickertype='remote']").each(function() + { + var pickerremote = $(this).attr('data-pickerremote'); + $(this).picker({chosenMode: true, remote: pickerremote}); + }) // hide #parent chosen dropdown on root dropdown show $('#root').on('chosen:showing_dropdown', function() @@ -144,8 +150,8 @@ $(function() /** * Load branches by product. - * - * @param object $obj + * + * @param object $obj * @access public * @return void */ diff --git a/module/upgrade/model.php b/module/upgrade/model.php index ee8b018591..e35412500e 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -3998,6 +3998,46 @@ class upgradeModel extends model $this->dao->replace(TABLE_GROUPPRIV)->data($grouppriv)->exec(); } + $stmt = $this->dao->select('*')->from(TABLE_GROUPPRIV)->where('module')->eq('project')->andWhere('method')->eq('story')->query(); + while($grouppriv = $stmt->fetch()) + { + $grouppriv->module = 'projectstory'; + $grouppriv->method = 'story'; + $this->dao->replace(TABLE_GROUPPRIV)->data($grouppriv)->exec(); + } + + $stmt = $this->dao->select('*')->from(TABLE_GROUPPRIV)->where('module')->eq('story')->andWhere('method')->eq('view')->query(); + while($grouppriv = $stmt->fetch()) + { + $grouppriv->module = 'projectstory'; + $grouppriv->method = 'view'; + $this->dao->replace(TABLE_GROUPPRIV)->data($grouppriv)->exec(); + } + + $stmt = $this->dao->select('*')->from(TABLE_GROUPPRIV)->where('module')->eq('project')->andWhere('method')->eq('linkstory')->query(); + while($grouppriv = $stmt->fetch()) + { + $grouppriv->module = 'projectstory'; + $grouppriv->method = 'linkstory'; + $this->dao->replace(TABLE_GROUPPRIV)->data($grouppriv)->exec(); + } + + $stmt = $this->dao->select('*')->from(TABLE_GROUPPRIV)->where('module')->eq('project')->andWhere('method')->eq('unlinkstory')->query(); + while($grouppriv = $stmt->fetch()) + { + $grouppriv->module = 'projectstory'; + $grouppriv->method = 'unlinkstory'; + $this->dao->replace(TABLE_GROUPPRIV)->data($grouppriv)->exec(); + } + + $stmt = $this->dao->select('*')->from(TABLE_GROUPPRIV)->where('module')->eq('execution')->andWhere('method')->eq('all')->query(); + while($grouppriv = $stmt->fetch()) + { + $grouppriv->module = 'project'; + $grouppriv->method = 'execution'; + $this->dao->replace(TABLE_GROUPPRIV)->data($grouppriv)->exec(); + } + return true; } diff --git a/module/user/model.php b/module/user/model.php index f815e0033e..f0eb29bcc7 100644 --- a/module/user/model.php +++ b/module/user/model.php @@ -814,6 +814,7 @@ class userModel extends model $user->rights = $this->authorize($account); $user->groups = $this->getGroups($account); + $user->view = $this->grantUserView($user->account, $user->rights['acls']); $this->session->set('user', $user); $this->app->user = $this->session->user; $this->loadModel('action')->create('user', $user->id, 'login'); @@ -836,6 +837,7 @@ class userModel extends model $user->rights = $this->authorize($account); $user->groups = $this->getGroups($account); + $user->view = $this->grantUserView($user->account, $user->rights['acls']); $this->session->set('user', $user); $this->app->user = $this->session->user; $this->loadModel('action')->create('user', $user->id, 'login'); diff --git a/module/webhook/lang/zh-cn.php b/module/webhook/lang/zh-cn.php index 61dd3df00c..53eae669b0 100644 --- a/module/webhook/lang/zh-cn.php +++ b/module/webhook/lang/zh-cn.php @@ -9,6 +9,8 @@ $lang->webhook->chooseDept = '选择同步部门'; $lang->webhook->assigned = '指派给'; $lang->webhook->setting = '设置'; +$lang->webhook->logAction = 'Webhook日志'; + $lang->webhook->browse = '浏览Webhook'; $lang->webhook->create = '添加Webhook'; $lang->webhook->edit = '编辑Webhook'; diff --git a/tools/check.php b/tools/check.php index 88d92e13f0..9d832e4a6a 100755 --- a/tools/check.php +++ b/tools/check.php @@ -11,6 +11,7 @@ $config->programLink = '-'; $config->productLink = '-'; $config->projectLink = '-'; $config->executionLink = '-'; +$config->systemMode = 'new'; /* set module root path and included the resource of group module. */ $moduleRoot = '../module/'; @@ -48,8 +49,8 @@ $whiteList[] = 'help-field'; $whiteList[] = 'index-testext'; $whiteList[] = 'productplan-commonaction'; $whiteList[] = 'project-managechilds'; -$whiteList[] = 'project-tips'; -$whiteList[] = 'project-commonaction'; +$whiteList[] = 'execution-tips'; +$whiteList[] = 'execution-commonaction'; $whiteList[] = 'project-sendmail'; $whiteList[] = 'release-commonaction'; $whiteList[] = 'task-commonaction'; @@ -293,7 +294,7 @@ foreach($demoSQL as $line => $sql) if(strpos($sql, $config->db->prefix . 'config') !== false or strpos($sql, $config->db->prefix . 'company') !== false or - strpos($sql, $config->db->prefix . 'group') !== false) + strpos($sql, $config->db->prefix . 'group') !== false) { die('line ' . ($line + 1) . " has error\n"); } diff --git a/xuanxuan/module/client/ext/lang/zh-cn/xuanxuan.php b/xuanxuan/module/client/ext/lang/zh-cn/xuanxuan.php index 5de92c78a6..604db89fe1 100644 --- a/xuanxuan/module/client/ext/lang/zh-cn/xuanxuan.php +++ b/xuanxuan/module/client/ext/lang/zh-cn/xuanxuan.php @@ -1,4 +1,4 @@ client->menu = $lang->admin->menu; +$lang->client->common = '客户端版本更新'; $lang->client->browseVersion = '版本列表'; diff --git a/xuanxuan/module/common/ext/lang/zh-cn/xuanxuan.php b/xuanxuan/module/common/ext/lang/zh-cn/xuanxuan.php index d5f6e13271..b6303f7842 100644 --- a/xuanxuan/module/common/ext/lang/zh-cn/xuanxuan.php +++ b/xuanxuan/module/common/ext/lang/zh-cn/xuanxuan.php @@ -3,14 +3,17 @@ $lang->xuanxuan = new stdclass(); $lang->admin->menu->xuanxuan = array('link' => '客户端|admin|xuanxuan', 'subModule' => 'client,setting'); $lang->admin->menuOrder[6] = 'xuanxuan'; -$lang->admin->subMenu->xuanxuan = new stdclass(); -$lang->admin->subMenu->xuanxuan->index = array('link' => '首页|admin|xuanxuan'); -$lang->admin->subMenu->xuanxuan->setting = array('link' => '参数|setting|xuanxuan'); -$lang->admin->subMenu->xuanxuan->update = array('link' => '更新|client|browse', 'subModule' => 'client'); -$lang->admin->subMenuOrder->xuanxuan[0] = 'index'; -$lang->admin->subMenuOrder->xuanxuan[5] = 'setting'; -$lang->admin->subMenuOrder->xuanxuan[10] = 'update'; +$lang->admin->menu->xuanxuan['subMenu'] = new stdclass(); +$lang->admin->menu->xuanxuan['subMenu']->index = array('link' => '首页|admin|xuanxuan'); +$lang->admin->menu->xuanxuan['subMenu']->setting = array('link' => '参数|setting|xuanxuan'); +$lang->admin->menu->xuanxuan['subMenu']->update = array('link' => '更新|client|browse', 'subModule' => 'client'); -$lang->menugroup->client = 'admin'; +$lang->admin->menu->xuanxuan['menuOrder'][0] = 'index'; +$lang->admin->menu->xuanxuan['menuOrder'][5] = 'setting'; +$lang->admin->menu->xuanxuan['menuOrder'][10] = 'update'; + +$lang->navGroup->im = 'admin'; +$lang->navGroup->setting = 'admin'; +$lang->navGroup->client = 'admin'; $lang->confirmDelete = '您确定要执行删除操作吗？';
- +