diff --git a/module/block/lang/zh-tw.php b/module/block/lang/zh-tw.php index 8e98127a15..775b339d70 100644 --- a/module/block/lang/zh-tw.php +++ b/module/block/lang/zh-tw.php @@ -83,21 +83,33 @@ $lang->block->default['product']['4']['params']['num'] = 15; $lang->block->default['product']['4']['params']['orderBy'] = 'id_desc'; $lang->block->default['product']['4']['params']['type'] = 'assignedTo'; -$lang->block->default['project']['1']['title'] = '進行中的' . $lang->projectCommon; -$lang->block->default['project']['1']['block'] = 'list'; +$lang->block->default['project']['1']['title'] = $lang->projectCommon . '統計'; +$lang->block->default['project']['1']['block'] = 'statistic'; $lang->block->default['project']['1']['grid'] = 8; -$lang->block->default['project']['1']['params']['num'] = 15; $lang->block->default['project']['1']['params']['orderBy'] = 'id_desc'; -$lang->block->default['project']['1']['params']['type'] = 'undone'; +$lang->block->default['project']['1']['params']['type'] = 'noclosed'; +$lang->block->default['project']['1']['params']['num'] = 5; -$lang->block->default['project']['2']['title'] = '指派給我的任務'; -$lang->block->default['project']['2']['block'] = 'task'; +$lang->block->default['project']['2']['title'] = $lang->projectCommon . '總覽'; +$lang->block->default['project']['2']['block'] = 'overview'; $lang->block->default['project']['2']['grid'] = 4; -$lang->block->default['project']['2']['params']['num'] = 15; -$lang->block->default['project']['2']['params']['orderBy'] = 'id_desc'; -$lang->block->default['project']['2']['params']['type'] = 'assignedTo'; +$lang->block->default['project']['3']['title'] = '進行中的' . $lang->projectCommon; +$lang->block->default['project']['3']['block'] = 'list'; +$lang->block->default['project']['3']['grid'] = 8; + +$lang->block->default['project']['3']['params']['num'] = 15; +$lang->block->default['project']['3']['params']['orderBy'] = 'id_desc'; +$lang->block->default['project']['3']['params']['type'] = 'undone'; + +$lang->block->default['project']['4']['title'] = '指派給我的任務'; +$lang->block->default['project']['4']['block'] = 'task'; +$lang->block->default['project']['4']['grid'] = 4; + +$lang->block->default['project']['4']['params']['num'] = 15; +$lang->block->default['project']['4']['params']['orderBy'] = 'id_desc'; +$lang->block->default['project']['4']['params']['type'] = 'assignedTo'; $lang->block->default['qa']['1']['title'] = '指派給我的Bug'; $lang->block->default['qa']['1']['block'] = 'bug'; @@ -232,9 +244,11 @@ $lang->block->modules['product']->availableBlocks->plan = '計劃列表'; $lang->block->modules['product']->availableBlocks->release = '發佈列表'; $lang->block->modules['project'] = new stdclass(); $lang->block->modules['project']->availableBlocks = new stdclass(); -$lang->block->modules['project']->availableBlocks->list = $lang->projectCommon . '列表'; -$lang->block->modules['project']->availableBlocks->task = '任務列表'; -$lang->block->modules['project']->availableBlocks->build = '版本列表'; +$lang->block->modules['project']->availableBlocks->statistic = $lang->projectCommon . '統計'; +$lang->block->modules['project']->availableBlocks->overview = $lang->projectCommon . '總覽'; +$lang->block->modules['project']->availableBlocks->list = $lang->projectCommon . '列表'; +$lang->block->modules['project']->availableBlocks->task = '任務列表'; +$lang->block->modules['project']->availableBlocks->build = '版本列表'; $lang->block->modules['qa'] = new stdclass(); $lang->block->modules['qa']->availableBlocks = new stdclass(); $lang->block->modules['qa']->availableBlocks->bug = 'Bug列表'; diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php index d11e141768..8c1ede15c1 100644 --- a/module/bug/lang/en.php +++ b/module/bug/lang/en.php @@ -100,6 +100,7 @@ $lang->bug->setPublic = 'Set as Public Template'; $lang->bug->deleteTemplate = 'Delete Template'; $lang->bug->confirmStoryChange = 'Confirm Story Change'; $lang->bug->copy = 'Copy'; +$lang->bug->search = 'Search'; /* 查询条件列表。*/ $lang->bug->assignToMe = 'AssignedToMe'; @@ -128,13 +129,13 @@ $lang->bug->ditto = 'Ditto'; $lang->bug->dittoNotice = 'This bug is not linked to the same product as the last one!'; /* 页面标签。*/ -$lang->bug->lblAssignedTo = 'Assignee'; -$lang->bug->lblMailto = 'Mail To'; -$lang->bug->lblLastEdited = 'Last Edited'; -$lang->bug->lblResolved = 'Resolved By'; -$lang->bug->allUsers = 'All User'; -$lang->bug->allBuilds = 'All'; -$lang->bug->createBuild = 'New'; +$lang->bug->lblAssignedTo = 'Assignee'; +$lang->bug->lblMailto = 'Mail To'; +$lang->bug->lblLastEdited = 'Last Edited'; +$lang->bug->lblResolved = 'Resolved By'; +$lang->bug->allUsers = 'All User'; +$lang->bug->allBuilds = 'All'; +$lang->bug->createBuild = 'New'; /* legend列表。*/ $lang->bug->legendBasicInfo = 'Basic Info'; @@ -149,7 +150,7 @@ $lang->bug->legendMisc = 'Misc'; $lang->bug->legendRelated = 'Related Info'; /* 功能按钮。*/ -$lang->bug->buttonConfirm = 'Confirm'; +$lang->bug->buttonConfirm = 'Confirm'; /* 交互提示。*/ $lang->bug->confirmChangeProduct = "Change {$lang->productCommon} will cause linked {$lang->projectCommon},Story and Task change. Do you want to do this?"; @@ -233,10 +234,6 @@ $lang->bug->typeList['standard'] = 'Standard'; $lang->bug->typeList['automation'] = 'Testing Script'; $lang->bug->typeList['others'] = 'Other'; - - - - $lang->bug->statusList[''] = ''; $lang->bug->statusList['active'] = 'Active'; $lang->bug->statusList['resolved'] = 'Resolved'; @@ -376,8 +373,6 @@ $lang->bug->mySelects['resolvedbyme'] = $lang->bug->resolvedByMeAB; $lang->bug->featureBar['browse']['unclosed'] = $lang->bug->unclosed; $lang->bug->featureBar['browse']['all'] = $lang->bug->allBugs; - - $lang->bug->featureBar['browse']['my'] = $lang->bug->my; $lang->bug->featureBar['browse']['unconfirmed'] = $lang->bug->unconfirmed; $lang->bug->featureBar['browse']['assigntonull'] = $lang->bug->assignToNull; diff --git a/module/bug/lang/zh-cn.php b/module/bug/lang/zh-cn.php index d04c8a23da..56657065ad 100644 --- a/module/bug/lang/zh-cn.php +++ b/module/bug/lang/zh-cn.php @@ -100,6 +100,7 @@ $lang->bug->setPublic = '设为公共模板'; $lang->bug->deleteTemplate = '删除模板'; $lang->bug->confirmStoryChange = '确认需求变动'; $lang->bug->copy = '复制Bug'; +$lang->bug->search = '搜索'; /* 查询条件列表。*/ $lang->bug->assignToMe = '指派给我'; @@ -118,7 +119,7 @@ $lang->bug->allBugs = '所有'; $lang->bug->byQuery = '搜索'; $lang->bug->needConfirm = '需求变动'; $lang->bug->allProduct = '所有' . $lang->productCommon; - +$lang->bug->my = '我的'; $lang->bug->assignToMeAB = '指派给我'; $lang->bug->openedByMeAB = '由我创建'; @@ -128,13 +129,13 @@ $lang->bug->ditto = '同上'; $lang->bug->dittoNotice = '该bug与上一bug不属于同一产品!'; /* 页面标签。*/ -$lang->bug->lblAssignedTo = '当前指派'; -$lang->bug->lblMailto = '抄送给'; -$lang->bug->lblLastEdited = '最后修改'; -$lang->bug->lblResolved = '由谁解决'; -$lang->bug->allUsers = '所有用户'; -$lang->bug->allBuilds = '所有'; -$lang->bug->createBuild = '新建'; +$lang->bug->lblAssignedTo = '当前指派'; +$lang->bug->lblMailto = '抄送给'; +$lang->bug->lblLastEdited = '最后修改'; +$lang->bug->lblResolved = '由谁解决'; +$lang->bug->allUsers = '所有用户'; +$lang->bug->allBuilds = '所有'; +$lang->bug->createBuild = '新建'; /* legend列表。*/ $lang->bug->legendBasicInfo = '基本信息'; @@ -149,7 +150,7 @@ $lang->bug->legendMisc = '其他相关'; $lang->bug->legendRelated = '其他信息'; /* 功能按钮。*/ -$lang->bug->buttonConfirm = '确认'; +$lang->bug->buttonConfirm = '确认'; /* 交互提示。*/ $lang->bug->confirmChangeProduct = "修改{$lang->productCommon}会导致相应的{$lang->projectCommon}、需求和任务发生变化,确定吗?"; @@ -369,10 +370,6 @@ $lang->bug->placeholder = new stdclass(); $lang->bug->placeholder->chooseBuilds = '选择相关版本...'; $lang->bug->placeholder->newBuildName = '新版本名称'; - - - - $lang->bug->featureBar['browse']['unclosed'] = $lang->bug->unclosed; $lang->bug->featureBar['browse']['all'] = $lang->bug->allBugs; $lang->bug->featureBar['browse']['assigntome'] = $lang->bug->assignToMe; diff --git a/module/bug/lang/zh-tw.php b/module/bug/lang/zh-tw.php index 7051f98f04..c54d6bc22f 100644 --- a/module/bug/lang/zh-tw.php +++ b/module/bug/lang/zh-tw.php @@ -100,6 +100,7 @@ $lang->bug->setPublic = '設為公共模板'; $lang->bug->deleteTemplate = '刪除模板'; $lang->bug->confirmStoryChange = '確認需求變動'; $lang->bug->copy = '複製Bug'; +$lang->bug->search = '搜索'; /* 查詢條件列表。*/ $lang->bug->assignToMe = '指派給我'; @@ -118,7 +119,7 @@ $lang->bug->allBugs = '所有'; $lang->bug->byQuery = '搜索'; $lang->bug->needConfirm = '需求變動'; $lang->bug->allProduct = '所有' . $lang->productCommon; - +$lang->bug->my = '我的'; $lang->bug->assignToMeAB = '指派給我'; $lang->bug->openedByMeAB = '由我創建'; @@ -128,13 +129,13 @@ $lang->bug->ditto = '同上'; $lang->bug->dittoNotice = '該bug與上一bug不屬於同一產品!'; /* 頁面標籤。*/ -$lang->bug->lblAssignedTo = '當前指派'; -$lang->bug->lblMailto = '抄送給'; -$lang->bug->lblLastEdited = '最後修改'; -$lang->bug->lblResolved = '由誰解決'; -$lang->bug->allUsers = '所有用戶'; -$lang->bug->allBuilds = '所有'; -$lang->bug->createBuild = '新建'; +$lang->bug->lblAssignedTo = '當前指派'; +$lang->bug->lblMailto = '抄送給'; +$lang->bug->lblLastEdited = '最後修改'; +$lang->bug->lblResolved = '由誰解決'; +$lang->bug->allUsers = '所有用戶'; +$lang->bug->allBuilds = '所有'; +$lang->bug->createBuild = '新建'; /* legend列表。*/ $lang->bug->legendBasicInfo = '基本信息'; @@ -149,7 +150,7 @@ $lang->bug->legendMisc = '其他相關'; $lang->bug->legendRelated = '其他信息'; /* 功能按鈕。*/ -$lang->bug->buttonConfirm = '確認'; +$lang->bug->buttonConfirm = '確認'; /* 交互提示。*/ $lang->bug->confirmChangeProduct = "修改{$lang->productCommon}會導致相應的{$lang->projectCommon}、需求和任務發生變化,確定嗎?"; @@ -369,10 +370,6 @@ $lang->bug->placeholder = new stdclass(); $lang->bug->placeholder->chooseBuilds = '選擇相關版本...'; $lang->bug->placeholder->newBuildName = '新版本名稱'; - - - - $lang->bug->featureBar['browse']['unclosed'] = $lang->bug->unclosed; $lang->bug->featureBar['browse']['all'] = $lang->bug->allBugs; $lang->bug->featureBar['browse']['assigntome'] = $lang->bug->assignToMe; diff --git a/module/build/lang/zh-tw.php b/module/build/lang/zh-tw.php index a1b2c948d1..906c322a0c 100644 --- a/module/build/lang/zh-tw.php +++ b/module/build/lang/zh-tw.php @@ -9,17 +9,17 @@ * @version $Id: zh-tw.php 4129 2013-01-18 01:58:14Z wwccss $ * @link http://www.zentao.net */ -$lang->build->common = "版本"; -$lang->build->create = "創建版本"; -$lang->build->edit = "編輯版本"; -$lang->build->linkStory = "關聯需求"; -$lang->build->linkBug = "關聯Bug"; -$lang->build->delete = "刪除版本"; -$lang->build->deleted = "已刪除"; -$lang->build->view = "版本詳情"; -$lang->build->batchUnlink = '批量移除'; -$lang->build->batchUnlinkStory = '批量移除需求'; -$lang->build->batchUnlinkBug = '批量移除Bug'; +$lang->build->common = "版本"; +$lang->build->create = "創建版本"; +$lang->build->edit = "編輯版本"; +$lang->build->linkStory = "關聯需求"; +$lang->build->linkBug = "關聯Bug"; +$lang->build->delete = "刪除版本"; +$lang->build->deleted = "已刪除"; +$lang->build->view = "版本詳情"; +$lang->build->batchUnlink = '批量移除'; +$lang->build->batchUnlinkStory = '批量移除需求'; +$lang->build->batchUnlinkBug = '批量移除Bug'; $lang->build->confirmDelete = "您確認刪除該版本嗎?"; $lang->build->confirmUnlinkStory = "您確認移除該需求嗎?"; @@ -27,25 +27,26 @@ $lang->build->confirmUnlinkBug = "您確認移除該Bug嗎?"; $lang->build->basicInfo = '基本信息'; -$lang->build->id = 'ID'; -$lang->build->product = $lang->productCommon; -$lang->build->branch = '平台/分支'; -$lang->build->project = '所屬' . $lang->projectCommon; -$lang->build->name = '名稱編號'; -$lang->build->date = '打包日期'; -$lang->build->builder = '構建者'; -$lang->build->scmPath = '原始碼地址'; -$lang->build->filePath = '下載地址'; -$lang->build->desc = '描述'; -$lang->build->files = '上傳發行包'; -$lang->build->last = '上個版本'; -$lang->build->packageType = '包類型'; -$lang->build->unlinkStory = '移除需求'; -$lang->build->unlinkBug = '移除Bug'; -$lang->build->stories = '完成的需求'; -$lang->build->bugs = '解決的Bug'; -$lang->build->generatedBugs = '產生的Bug'; -$lang->build->noProduct = " 該{$lang->projectCommon}沒有關聯{$lang->productCommon},無法創建版本,請先關聯{$lang->productCommon}"; +$lang->build->id = 'ID'; +$lang->build->product = $lang->productCommon; +$lang->build->branch = '平台/分支'; +$lang->build->project = '所屬' . $lang->projectCommon; +$lang->build->name = '名稱編號'; +$lang->build->date = '打包日期'; +$lang->build->builder = '構建者'; +$lang->build->scmPath = '原始碼地址'; +$lang->build->filePath = '下載地址'; +$lang->build->desc = '描述'; +$lang->build->files = '上傳發行包'; +$lang->build->last = '上個版本'; +$lang->build->packageType = '包類型'; +$lang->build->unlinkStory = '移除需求'; +$lang->build->unlinkBug = '移除Bug'; +$lang->build->stories = '完成的需求'; +$lang->build->bugs = '解決的Bug'; +$lang->build->generatedBugs = '產生的Bug'; +$lang->build->noProduct = " 該{$lang->projectCommon}沒有關聯{$lang->productCommon},無法創建版本,請先關聯{$lang->productCommon}"; +$lang->build->noData = '暫無'; $lang->build->finishStories = ' 本次共完成 %s 個需求'; $lang->build->resolvedBugs = ' 本次共解決 %s 個Bug'; diff --git a/module/build/view/view.html.php b/module/build/view/view.html.php index 3faeb1c80c..582d09f336 100644 --- a/module/build/view/view.html.php +++ b/module/build/view/view.html.php @@ -297,7 +297,13 @@ tbody tr td:first-child input{display:none;} config->global->flow != 'onlyTest'):?>