From f65262b09483dfb9f83242e17959ad8b37ff7f91 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Wed, 4 May 2016 17:19:59 +0800 Subject: [PATCH] * change for zh-tw and en lang. --- module/admin/lang/zh-tw.php | 5 --- module/block/lang/en.php | 1 - module/block/lang/zh-tw.php | 60 +++++++++++++++++++-------------- module/bug/lang/zh-tw.php | 6 ++-- module/common/lang/zh-tw.php | 14 ++++---- module/custom/lang/zh-tw.php | 6 ++-- module/datatable/lang/zh-tw.php | 6 ++-- module/file/lang/en.php | 1 + module/file/lang/zh-tw.php | 2 ++ module/group/lang/zh-tw.php | 1 + module/misc/lang/zh-tw.php | 13 ++++--- module/project/lang/en.php | 5 ++- module/project/lang/zh-tw.php | 23 ++++++------- module/search/lang/en.php | 1 + module/search/lang/zh-tw.php | 4 +-- module/task/lang/en.php | 3 ++ module/task/lang/zh-tw.php | 6 +++- module/testcase/lang/zh-tw.php | 4 +-- module/tutorial/lang/zh-tw.php | 8 ++++- module/upgrade/lang/zh-tw.php | 1 + tools/check.php | 8 +++++ 21 files changed, 105 insertions(+), 73 deletions(-) diff --git a/module/admin/lang/zh-tw.php b/module/admin/lang/zh-tw.php index c5096cb10a..521eafaa40 100644 --- a/module/admin/lang/zh-tw.php +++ b/module/admin/lang/zh-tw.php @@ -42,7 +42,6 @@ $lang->admin->safe = new stdclass(); $lang->admin->safe->common = '安全'; $lang->admin->safe->set = '密碼安全設置'; $lang->admin->safe->password = '密碼安全'; -$lang->admin->safe->md5Pwd = '密碼加密'; $lang->admin->safe->weak = '常用弱口令'; $lang->admin->safe->reason = '類型'; $lang->admin->safe->checkWeak = '弱口令掃瞄'; @@ -51,9 +50,6 @@ $lang->admin->safe->modeList[0] = '不檢查'; $lang->admin->safe->modeList[1] = '中'; $lang->admin->safe->modeList[2] = '強'; -$lang->admin->safe->md5PwdList[0] = '不加密'; -$lang->admin->safe->md5PwdList[1] = '加密'; - $lang->admin->safe->reasonList['weak'] = '常用弱口令'; $lang->admin->safe->reasonList['account'] = '與賬號相同'; $lang->admin->safe->reasonList['mobile'] = '與手機相同'; @@ -61,5 +57,4 @@ $lang->admin->safe->reasonList['phone'] = '與電話相同'; $lang->admin->safe->reasonList['birthday'] = '與生日相同'; $lang->admin->safe->noticeMode = '系統會在登錄、創建和修改用戶、修改密碼的時候檢查用戶口令。'; -$lang->admin->safe->noticeMd5Pwd = '系統會在登錄的時候，對密碼做加密後再提交。'; $lang->admin->safe->noticeStrong = '密碼長度越長，含有大寫字母或數字或特殊符合越多，密碼字母越不重複，安全度越強！'; diff --git a/module/block/lang/en.php b/module/block/lang/en.php index 662da3e202..8f4f5f6ab3 100644 --- a/module/block/lang/en.php +++ b/module/block/lang/en.php @@ -31,7 +31,6 @@ $lang->block->createBlock = 'Add block'; $lang->block->editBlock = 'Edit block'; $lang->block->ordersSaved = 'Sort have been saved'; $lang->block->confirmRemoveBlock = 'Are you sure remove block [{0}] ?'; -$lang->block->emptyMessage = 'Nothing here, custom it now!'; $lang->block->refresh = 'Refresh'; $lang->block->hidden = 'Hidden'; $lang->block->dynamicInfo = "%s, %s %s %s %s."; diff --git a/module/block/lang/zh-tw.php b/module/block/lang/zh-tw.php index e44b647831..9e60d13bfb 100644 --- a/module/block/lang/zh-tw.php +++ b/module/block/lang/zh-tw.php @@ -16,11 +16,12 @@ $lang->block->style = '外觀'; $lang->block->grid = '寬度'; $lang->block->color = '顏色'; -$lang->block->lblModule = '模組'; -$lang->block->lblBlock = '區塊'; -$lang->block->lblNum = '條數'; -$lang->block->lblHtml = 'HTML內容'; -$lang->block->dynamic = '最新動態'; +$lang->block->lblModule = '模組'; +$lang->block->lblBlock = '區塊'; +$lang->block->lblNum = '條數'; +$lang->block->lblHtml = 'HTML內容'; +$lang->block->dynamic = '最新動態'; +$lang->block->lblFlowchart = '流程圖'; $lang->block->params = new stdclass(); $lang->block->params->name = '參數名稱'; @@ -30,11 +31,11 @@ $lang->block->createBlock = '添加區塊'; $lang->block->editBlock = '編輯區塊'; $lang->block->ordersSaved = '排序已保存'; $lang->block->confirmRemoveBlock = '確定移除區塊【{0}】嗎？'; -$lang->block->emptyMessage = '這裡什麼也沒有。快來定製你的頁面！'; $lang->block->refresh = '刷新'; +$lang->block->hidden = '隱藏'; $lang->block->dynamicInfo = "%s, %s %s %s %s。"; -$lang->block->default['product']['1']['title'] = $lang->productCommon . '列表'; +$lang->block->default['product']['1']['title'] = '未關閉的' . $lang->productCommon; $lang->block->default['product']['1']['block'] = 'list'; $lang->block->default['product']['1']['grid'] = 8; @@ -49,7 +50,7 @@ $lang->block->default['product']['2']['params']['num'] = 15; $lang->block->default['product']['2']['params']['orderBy'] = 'id_desc'; $lang->block->default['product']['2']['params']['type'] = 'assignedTo'; -$lang->block->default['project']['1']['title'] = $lang->projectCommon . '列表'; +$lang->block->default['project']['1']['title'] = '進行中的' . $lang->projectCommon; $lang->block->default['project']['1']['block'] = 'list'; $lang->block->default['project']['1']['grid'] = 8; @@ -79,7 +80,7 @@ $lang->block->default['qa']['2']['grid'] = 4; $lang->block->default['qa']['2']['params']['num'] = 15; $lang->block->default['qa']['2']['params']['orderBy'] = 'id_desc'; -$lang->block->default['qa']['2']['params']['type'] = 'assignedTo'; +$lang->block->default['qa']['2']['params']['type'] = 'assigntome'; $lang->block->default['qa']['3']['title'] = '待測版本列表'; $lang->block->default['qa']['3']['block'] = 'testtask'; @@ -89,23 +90,23 @@ $lang->block->default['qa']['3']['params']['num'] = 15; $lang->block->default['qa']['3']['params']['orderBy'] = 'id_desc'; $lang->block->default['qa']['3']['params']['type'] = 'wait'; -$lang->block->default['my']['1'] = $lang->block->default['project']['1']; -$lang->block->default['my']['1']['source'] = 'project'; +$lang->block->default['my']['1']['title'] = '流程圖'; +$lang->block->default['my']['1']['block'] = 'flowchart'; +$lang->block->default['my']['1']['grid'] = 8; +$lang->block->default['my']['1']['source'] = ''; $lang->block->default['my']['2']['title'] = '最新動態'; $lang->block->default['my']['2']['block'] = 'dynamic'; $lang->block->default['my']['2']['grid'] = 4; $lang->block->default['my']['2']['source'] = ''; -$lang->block->default['my']['3'] = $lang->block->default['product']['1']; -$lang->block->default['my']['3']['source'] = 'product'; +$lang->block->default['my']['3'] = $lang->block->default['project']['1']; +$lang->block->default['my']['3']['source'] = 'project'; $lang->block->default['my']['4']['title'] = '我的待辦'; $lang->block->default['my']['4']['block'] = 'list'; $lang->block->default['my']['4']['grid'] = 4; $lang->block->default['my']['4']['source'] = 'todo'; $lang->block->default['my']['4']['params']['num'] = '20'; -$lang->block->default['my']['5']['title'] = '流程圖'; -$lang->block->default['my']['5']['block'] = 'flowchart'; -$lang->block->default['my']['5']['grid'] = 8; -$lang->block->default['my']['5']['source'] = ''; +$lang->block->default['my']['5'] = $lang->block->default['product']['1']; +$lang->block->default['my']['5']['source'] = 'product'; $lang->block->default['my']['6'] = $lang->block->default['project']['2']; $lang->block->default['my']['6']['source'] = 'project'; $lang->block->default['my']['7'] = $lang->block->default['qa']['1']; @@ -121,13 +122,17 @@ $lang->block->orderBy = '排序'; $lang->block->availableBlocks = new stdclass(); -$lang->block->availableBlocks->todo = '我的待辦'; -$lang->block->availableBlocks->task = '我的任務'; -$lang->block->availableBlocks->bug = '我的Bug'; -$lang->block->availableBlocks->case = '我的用例'; -$lang->block->availableBlocks->story = '我的需求'; -$lang->block->availableBlocks->product = $lang->productCommon . '列表'; -$lang->block->availableBlocks->project = $lang->projectCommon . '列表'; +$lang->block->availableBlocks->todo = '我的待辦'; +$lang->block->availableBlocks->task = '我的任務'; +$lang->block->availableBlocks->bug = '我的Bug'; +$lang->block->availableBlocks->case = '我的用例'; +$lang->block->availableBlocks->story = '我的需求'; +$lang->block->availableBlocks->product = $lang->productCommon . '列表'; +$lang->block->availableBlocks->project = $lang->projectCommon . '列表'; +$lang->block->availableBlocks->plan = '計劃列表'; +$lang->block->availableBlocks->release = '發佈列表'; +$lang->block->availableBlocks->build = '版本列表'; +$lang->block->availableBlocks->testtask = '測試版本列表'; $lang->block->moduleList['product'] = $lang->productCommon; $lang->block->moduleList['project'] = $lang->projectCommon; @@ -237,9 +242,12 @@ $lang->block->modules['qa']->moreLinkList->case = 'my|testcase|type=%s'; $lang->block->modules['qa']->moreLinkList->testtask = 'my|testtask|type=%s'; $lang->block->modules['todo']->moreLinkList = new stdclass(); $lang->block->modules['todo']->moreLinkList->list = 'my|todo|type=all'; +$lang->block->modules['common'] = new stdclass(); +$lang->block->modules['common']->moreLinkList = new stdclass(); +$lang->block->modules['common']->moreLinkList->dynamic = 'company|dynamic|'; -$lang->block->flowchart = array(); -$lang->block->flowchart[] = array('管理員', '維護公司', '添加用戶', '維護權限'); +$lang->block->flowchart = array(); +$lang->block->flowchart[] = array('管理員', '維護公司', '添加用戶', '維護權限'); $lang->block->flowchart[] = array('產品經理', '創建產品', '維護模組', '維護計劃', '維護需求', '創建發佈'); $lang->block->flowchart[] = array('項目經理', '創建項目', '維護團隊', '關聯產品', '關聯需求', '分解任務'); $lang->block->flowchart[] = array('研發人員', '領取任務和Bug', '更新狀態', '完成任務和Bug'); diff --git a/module/bug/lang/zh-tw.php b/module/bug/lang/zh-tw.php index ba30b7a772..391311d585 100644 --- a/module/bug/lang/zh-tw.php +++ b/module/bug/lang/zh-tw.php @@ -63,6 +63,7 @@ $lang->bug->lastEditedDateAB = '修改日期'; $lang->bug->lastEditedDate = '修改日期'; $lang->bug->fromCase = '來源用例'; $lang->bug->toCase = '生成用例'; +$lang->bug->colorTag = '顏色標籤'; /* 方法列表。*/ $lang->bug->index = '首頁'; @@ -72,6 +73,7 @@ $lang->bug->confirmBug = '確認'; $lang->bug->batchConfirm = '批量確認'; $lang->bug->edit = '編輯'; $lang->bug->batchEdit = '批量編輯'; +$lang->bug->batchChangeModule = '批量修改模組'; $lang->bug->batchClose = '批量關閉'; $lang->bug->assignTo = '指派'; $lang->bug->batchAssignTo = '批量指派'; @@ -86,11 +88,9 @@ $lang->bug->export = '導出數據'; $lang->bug->delete = '刪除'; $lang->bug->deleted = '已刪除'; $lang->bug->saveTemplate = '保存模板'; +$lang->bug->setPublic = '設為公共模板'; $lang->bug->deleteTemplate = '刪除模板'; $lang->bug->confirmStoryChange = '確認需求變動'; -$lang->bug->setPublic = '設為公共模板'; -$lang->bug->colorTag = '顏色標籤'; -$lang->bug->batchChangeModule = '批量修改模組'; /* 查詢條件列表。*/ $lang->bug->assignToMe = '指派給我'; diff --git a/module/common/lang/zh-tw.php b/module/common/lang/zh-tw.php index a6e49105cf..9d1f3d2233 100644 --- a/module/common/lang/zh-tw.php +++ b/module/common/lang/zh-tw.php @@ -65,10 +65,10 @@ $lang->duplicate = '已有相同標題的%s'; $lang->ipLimited = "抱歉，管理員限制當前IP登錄，請聯繫管理員解除限制。"; $lang->unfold = '+'; $lang->fold = '-'; -$lang->hideNotCheck = '頁面隱藏取消選中欄位'; $lang->homepage = '設為主頁'; $lang->tutorial = '新手教程'; -$lang->feature = '瞭解新功能'; +$lang->changeLog = '修改日誌'; +$lang->manual = '手冊'; $lang->customMenu = '自定義導航'; $lang->tutorialConfirm = '檢測到你尚未退出新手教程模式，是否現在退出？'; @@ -178,7 +178,6 @@ $lang->product = new stdclass(); $lang->product->menu = new stdclass(); $lang->product->menu->list = array('link' => '%s', 'fixed' => true); -$lang->product->menu->index = '首頁|product|index|locate=no'; $lang->product->menu->story = array('link' => '需求|product|browse|productID=%s', 'alias' => 'batchedit', 'subModule' => 'story'); $lang->product->menu->dynamic = '動態|product|dynamic|productID=%s'; $lang->product->menu->plan = array('link' => '計劃|productplan|browse|productID=%s', 'subModule' => 'productplan'); @@ -191,6 +190,7 @@ $lang->product->menu->view = array('link' => '概況|product|view|productID=% $lang->product->menu->project = "{$lang->projectCommon}|product|project|status=all&productID=%s"; $lang->product->menu->create = array('link' => " 添加{$lang->productCommon}|product|create", 'float' => 'right'); $lang->product->menu->all = array('link' => " 所有{$lang->productCommon}|product|all|productID=%s", 'float' => 'right'); +$lang->product->menu->index = array('link' => "產品主頁|product|index|locate=no", 'float' => 'right'); $lang->story = new stdclass(); $lang->productplan = new stdclass(); @@ -207,7 +207,6 @@ $lang->project = new stdclass(); $lang->project->menu = new stdclass(); $lang->project->menu->list = array('link' => '%s', 'fixed' => true); -$lang->project->menu->index = '首頁|project|index|locate=no'; $lang->project->menu->task = array('link' => '任務|project|task|projectID=%s', 'subModule' => 'task,tree', 'alias' => 'grouptask,importtask,burn,importbug,kanban,printkanban,tree'); $lang->project->menu->story = array('link' => '需求|project|story|projectID=%s', 'subModule' => 'story', 'alias' => 'linkstory'); $lang->project->menu->bug = 'Bug|project|bug|projectID=%s'; @@ -220,6 +219,7 @@ $lang->project->menu->product = $lang->productCommon . '|project|manageproduct $lang->project->menu->view = array('link' => '概況|project|view|projectID=%s', 'alias' => 'edit,start,suspend,putoff,close'); $lang->project->menu->create = array('link' => " 添加{$lang->projectCommon}|project|create", 'float' => 'right'); $lang->project->menu->all = array('link' => " 所有{$lang->projectCommon}|project|all|status=undone&projectID=%s", 'float' => 'right'); +$lang->project->menu->index = array('link' => "項目主頁|project|index|locate=no", 'float' => 'right'); $lang->task = new stdclass(); $lang->build = new stdclass(); @@ -231,28 +231,28 @@ $lang->qa = new stdclass(); $lang->qa->menu = new stdclass(); $lang->qa->menu->product = array('link' => '%s', 'fixed' => true); -$lang->qa->menu->index = '首頁|qa|index|locate=no&productID=%s'; $lang->qa->menu->bug = array('link' => 'Bug|bug|browse|productID=%s'); $lang->qa->menu->testcase = array('link' => '用例|testcase|browse|productID=%s'); $lang->qa->menu->testtask = array('link' => '版本|testtask|browse|productID=%s'); +$lang->qa->menu->index = array('link' => "測試主頁|qa|index|locate=no&productID=%s", 'float' => 'right'); $lang->bug = new stdclass(); $lang->bug->menu = new stdclass(); $lang->bug->menu->product = array('link' => '%s', 'fixed' => true); -$lang->bug->menu->index = '首頁|qa|index|locate=no&productID=%s'; $lang->bug->menu->bug = array('link' => 'Bug|bug|browse|productID=%s', 'alias' => 'view,create,batchcreate,edit,resolve,close,activate,report,batchedit,confirmbug,assignto', 'subModule' => 'tree'); $lang->bug->menu->testcase = array('link' => '用例|testcase|browse|productID=%s'); $lang->bug->menu->testtask = array('link' => '版本|testtask|browse|productID=%s'); +$lang->bug->menu->index = array('link' => "測試主頁|qa|index|locate=no&productID=%s", 'float' => 'right'); $lang->testcase = new stdclass(); $lang->testcase->menu = new stdclass(); $lang->testcase->menu->product = array('link' => '%s', 'fixed' => true); -$lang->testcase->menu->index = '首頁|qa|index|locate=no&productID=%s'; $lang->testcase->menu->bug = array('link' => 'Bug|bug|browse|productID=%s'); $lang->testcase->menu->testcase = array('link' => '用例|testcase|browse|productID=%s', 'alias' => 'view,create,batchcreate,edit,batchedit,showimport,groupcase', 'subModule' => 'tree'); $lang->testcase->menu->testtask = array('link' => '版本|testtask|browse|productID=%s', 'alias' => 'view,create,edit,linkcase,cases,start,close,batchrun,groupcase'); +$lang->testcase->menu->index = array('link' => "測試主頁|qa|index|locate=no&productID=%s", 'float' => 'right'); $lang->testtask = new stdclass(); $lang->testtask->menu = $lang->testcase->menu; diff --git a/module/custom/lang/zh-tw.php b/module/custom/lang/zh-tw.php index ea37e9e8d4..7dfc0aeeb8 100644 --- a/module/custom/lang/zh-tw.php +++ b/module/custom/lang/zh-tw.php @@ -68,7 +68,9 @@ $lang->custom->confirmRestore = '是否要恢復預設配置？'; $lang->custom->notice = new stdclass(); $lang->custom->notice->userRole = '鍵的長度必須小於20個字元！'; -$lang->custom->notice->indexPage = "%s增加首頁頁面，是否設該頁面為主頁？"; +$lang->custom->notice->indexPage['product'] = "從8.2版本起增加了產品主頁視圖，是否預設進入產品主頁？"; +$lang->custom->notice->indexPage['project'] = "從8.2版本起增加了項目主頁視圖，是否預設進入項目主頁？"; +$lang->custom->notice->indexPage['qa'] = "從8.2版本起增加了測試主頁視圖，是否預設進入測試主頁？"; $lang->custom->storyReview = '評審流程'; $lang->custom->reviewList[1] = '開啟'; @@ -81,5 +83,5 @@ $lang->custom->productProject->relation['1_1'] = '項目 - 迭代'; $lang->custom->productProject->notice = '請根據實際情況選擇適合自己團隊的概念。'; -$lang->custom->menuTip = '點擊導航項目來切換顯示或隱藏，拖動導航項目來更改顯示順序。'; +$lang->custom->menuTip = '點擊顯示或隱藏導航條目，拖拽來更改顯示順序。'; $lang->custom->saveFail = '保存失敗！'; diff --git a/module/datatable/lang/zh-tw.php b/module/datatable/lang/zh-tw.php index 18a192be2d..377c02d253 100644 --- a/module/datatable/lang/zh-tw.php +++ b/module/datatable/lang/zh-tw.php @@ -14,7 +14,7 @@ $lang->datatable->required = '必選'; $lang->datatable->branch = '分支'; $lang->datatable->platform = '平台'; -$lang->datatable->showModule = '標題是否顯示模組'; +$lang->datatable->showModule = '列表頁是否顯示模組名'; $lang->datatable->showModuleList[] = '不顯示'; -$lang->datatable->showModuleList['base'] = '根節點'; -$lang->datatable->showModuleList['end'] = '終極節點'; +$lang->datatable->showModuleList['base'] = '只顯示一級模組'; +$lang->datatable->showModuleList['end'] = '只顯示最後一級模組'; diff --git a/module/file/lang/en.php b/module/file/lang/en.php index 3f16f2ef65..b0aea92a7a 100644 --- a/module/file/lang/en.php +++ b/module/file/lang/en.php @@ -23,6 +23,7 @@ $lang->file->tplTitle = "Title"; $lang->file->setPublic = "Set public template"; $lang->file->exportFields = "To export fields"; $lang->file->defaultTPL = "Default template"; +$lang->file->setExportTPL = "Setting"; $lang->file->errorNotExists = "The directory '%s' is no exist"; $lang->file->errorCanNotWrite = "The directory '%s' is unwritable, please change it's permission. Command in linux:sudo -R chmod 777 '%s'"; diff --git a/module/file/lang/zh-tw.php b/module/file/lang/zh-tw.php index c9717d715d..5712f9b9c3 100644 --- a/module/file/lang/zh-tw.php +++ b/module/file/lang/zh-tw.php @@ -22,6 +22,8 @@ $lang->file->applyTemplate = "應用模板"; $lang->file->tplTitle = "模板名稱"; $lang->file->setPublic = "設置公共模板"; $lang->file->exportFields = "要導出欄位"; +$lang->file->defaultTPL = "預設模板"; +$lang->file->setExportTPL = "設置"; $lang->file->errorNotExists = "檔案夾 '%s' 不存在"; $lang->file->errorCanNotWrite = "檔案夾 '%s' 不可寫,請改變檔案夾的權限。在linux中輸入指令:sudo chmod -R 777 '%s'"; diff --git a/module/group/lang/zh-tw.php b/module/group/lang/zh-tw.php index f8b50f3bb4..018466aa2d 100644 --- a/module/group/lang/zh-tw.php +++ b/module/group/lang/zh-tw.php @@ -46,6 +46,7 @@ $lang->group->copyOptions['copyPriv'] = '複製權限'; $lang->group->copyOptions['copyUser'] = '複製用戶'; $lang->group->versions[''] = '修改歷史'; +$lang->group->versions['8_2_beta'] = '禪道8.2.beta'; $lang->group->versions['8_0_1'] = '禪道8.0.1'; $lang->group->versions['8_0'] = '禪道8.0'; $lang->group->versions['7_4_beta'] = '禪道7.4.beta'; diff --git a/module/misc/lang/zh-tw.php b/module/misc/lang/zh-tw.php index 59082c018c..4ee239e923 100644 --- a/module/misc/lang/zh-tw.php +++ b/module/misc/lang/zh-tw.php @@ -62,8 +62,13 @@ $lang->misc->tableStatus = "狀態"; $lang->misc->novice = "您可能初次使用禪道，是否進入新手模式？"; $lang->misc->feature = new stdclass(); -$lang->misc->feature->lastest = '最新版本'; -$lang->misc->feature->all = array(); +$lang->misc->feature->lastest = '最新版本'; +$lang->misc->feature->all = array(); $lang->misc->feature->all['latest'] = array(); -$lang->misc->feature->all['latest'][] = array('title'=>'可自定義內容的首頁', 'desc' => '

你的地盤由你做主。現在開始，你可以向首頁添加多種多樣的內容區塊，而且還可以決定如何排列和顯示他們。

', 'img' => '1.gif'); -$lang->misc->feature->all['latest'][] = array('title'=>'完全定製所有導航內容', 'desc' => '

導航上顯示的項目現在完全由你來決定。將滑鼠懸浮在導航上稍後會在右側顯示定製按鈕，點擊打開定製對話框，通過點擊切換項目是否顯示，拖拽導航項目來更改顯示順序。

', 'img' => '2.gif'); +$lang->misc->feature->all['latest'][] = array('title'=>'首頁自定義', 'desc' => '

我的地盤由我做主。現在開始，你可以向首頁添加多種多樣的內容區塊，而且還可以決定如何排列和顯示他們。

我的地盤、產品、項目、測試模組下均支持首頁自定義功能。

'); +$lang->misc->feature->all['latest'][] = array('title'=>'導航定製', 'desc' => '

導航上顯示的項目現在完全由你來決定，不僅僅可以決定在導航上展示哪些內容，還可以決定展示的順序。

將滑鼠懸浮在導航上稍後會在右側顯示定製按鈕，點擊打開定製對話框，通過點擊切換是否顯示，拖放操作來更改顯示順序。

'); +$lang->misc->feature->all['latest'][] = array('title'=>'批量添加、編輯自定義', 'desc' => '

可以在批量添加和批量編輯頁面自定義操作的欄位。

'); +$lang->misc->feature->all['latest'][] = array('title'=>'添加需求、任務、Bug、用例自定義', 'desc' => '

可以在添加需求、任務、Bug、用例頁面，自定義部分欄位是否顯示。

'); +$lang->misc->feature->all['latest'][] = array('title'=>'導出自定義', 'desc' => '

在導出需求、任務、Bug、用例的時候，用戶可以自定義導出的欄位，也可以保存模板方便每次導出。

'); +$lang->misc->feature->all['latest'][] = array('title'=>'需求、任務、Bug、用例組合檢索功能', 'desc' => '

在需求、任務、Bug、用例列表頁面，可以實現模組和標籤的組合檢索。

'); +$lang->misc->feature->all['latest'][] = array('title'=>'增加新手教程', 'desc' => '

增加新手教程，方便新用戶瞭解禪道使用。

'); diff --git a/module/project/lang/en.php b/module/project/lang/en.php index 925b91f650..fd75911877 100644 --- a/module/project/lang/en.php +++ b/module/project/lang/en.php @@ -124,7 +124,6 @@ $lang->project->importTask = 'Transfer task'; $lang->project->importBug = 'Import bug'; $lang->project->updateOrder = 'Order'; $lang->project->tree = 'Tree'; -$lang->project->list = 'List'; /* Browse. */ $lang->project->allTasks = 'All'; @@ -153,10 +152,10 @@ $lang->project->groupFilter['pri']['all'] = $lang->project->all; $lang->project->groupFilter['pri']['setted'] = 'Setted'; $lang->project->groupFilter['assignedTo']['undone'] = 'Undone'; $lang->project->groupFilter['assignedTo']['all'] = $lang->project->all; -$lang->project->groupFilter['finishedBy']['all'] = $lang->project->all; $lang->project->groupFilter['finishedBy']['done'] = 'Done'; -$lang->project->groupFilter['closedBy']['all'] = $lang->project->all; +$lang->project->groupFilter['finishedBy']['all'] = $lang->project->all; $lang->project->groupFilter['closedBy']['closed'] = 'Closed'; +$lang->project->groupFilter['closedBy']['all'] = $lang->project->all; $lang->project->groupFilter['deadline']['all'] = $lang->project->all; $lang->project->groupFilter['deadline']['setted'] = '已设置'; diff --git a/module/project/lang/zh-tw.php b/module/project/lang/zh-tw.php index 496ae02432..64cd2ef7b4 100644 --- a/module/project/lang/zh-tw.php +++ b/module/project/lang/zh-tw.php @@ -123,8 +123,7 @@ $lang->project->batchUnlinkStory = '批量移除需求'; $lang->project->importTask = '轉入任務'; $lang->project->importBug = '導入Bug'; $lang->project->updateOrder = '排序'; -$lang->project->tree = '樹視圖'; -$lang->project->list = '列表'; +$lang->project->tree = '樹狀圖'; /* 分組瀏覽。*/ $lang->project->allTasks = '所有'; @@ -148,15 +147,15 @@ $lang->project->groups['type'] = '類型分組'; $lang->project->groups['deadline'] = '截止分組'; $lang->project->groupFilter['story']['all'] = $lang->project->all; -$lang->project->groupFilter['story']['linked'] = '關聯需求的任務'; +$lang->project->groupFilter['story']['linked'] = '已關聯需求的任務'; $lang->project->groupFilter['pri']['all'] = $lang->project->all; $lang->project->groupFilter['pri']['setted'] = '已設置'; $lang->project->groupFilter['assignedTo']['undone'] = '未完成'; $lang->project->groupFilter['assignedTo']['all'] = $lang->project->all; -$lang->project->groupFilter['finishedBy']['all'] = $lang->project->all; $lang->project->groupFilter['finishedBy']['done'] = '已完成'; -$lang->project->groupFilter['closedBy']['all'] = $lang->project->all; +$lang->project->groupFilter['finishedBy']['all'] = $lang->project->all; $lang->project->groupFilter['closedBy']['closed'] = '已關閉'; +$lang->project->groupFilter['closedBy']['all'] = $lang->project->all; $lang->project->groupFilter['deadline']['all'] = $lang->project->all; $lang->project->groupFilter['deadline']['setted'] = '已設置'; @@ -171,16 +170,18 @@ $lang->project->aboveAllProject = "以上所有{$lang->projectCommon}"; $lang->project->selectProject = "請選擇{$lang->projectCommon}"; $lang->project->beginAndEnd = '起止時間'; $lang->project->lblStats = '工時統計'; +$lang->project->workHours = '7.0'; $lang->project->stats = '可用工時%s工時
總共預計%s工時
已經消耗%s工時
預計剩餘%s工時'; -$lang->project->taskSummary = "本頁共 %s 個任務，未開始%s，進行中%s，總預計%s工時，已消耗%s工時，剩餘%s工時。"; +$lang->project->taskSummary = "本頁共 %s 個任務，未開始 %s，進行中 %s，總預計%s工時，已消耗%s工時，剩餘%s工時。"; $lang->project->memberHours = "%s共有 %s 個可用工時，"; -$lang->project->groupSummary = "本組共 %s 個任務，未開始%s，進行中%s，總預計%s工時，已消耗%s工時，剩餘%s工時。"; -$lang->project->noTimeSummary = "本組共 %s 個任務，未開始%s，進行中%s"; +$lang->project->groupSummary = "本組共 %s 個任務，未開始 %s，進行中 %s，總預計%s工時，已消耗%s工時，剩餘%s工時。"; +$lang->project->noTimeSummary = "本組共 %s 個任務，未開始 %s，進行中 %s"; $lang->project->wbs = "分解任務"; $lang->project->batchWBS = "批量分解"; $lang->project->howToUpdateBurn = "幫助"; $lang->project->whyNoStories = "看起來沒有需求可以關聯。請檢查下{$lang->projectCommon}關聯的{$lang->productCommon}中有沒有需求，而且要確保它們已經審核通過。"; $lang->project->doneProjects = '已結束'; +$lang->project->selectDept = '請選擇部門'; $lang->project->copyTeam = '複製團隊'; $lang->project->copyFromTeam = "複製自{$lang->projectCommon}團隊： %s"; $lang->project->noMatched = "找不到包含'%s'的$lang->projectCommon"; @@ -257,7 +258,5 @@ $lang->project->featureBar['task']['needconfirm'] = '需求變動'; $lang->project->featureBar['task']['status'] = $lang->project->statusSelects['']; $lang->project->treeLevel = array(); -$lang->project->treeLevel['product'] = array('icon' => 'icon-cube', 'text' => '產品視圖'); -$lang->project->treeLevel['module'] = array('icon' => 'icon-bookmark-empty', 'text' => '模組視圖'); -$lang->project->treeLevel['story'] = array('icon' => 'icon-lightbulb', 'text' => '需求視圖'); -$lang->project->treeLevel['task'] = array('icon' => 'icon-tasks', 'text' => '任務視圖'); +$lang->project->treeLevel['story'] = '顯示需求'; +$lang->project->treeLevel['task'] = '顯示任務'; diff --git a/module/search/lang/en.php b/module/search/lang/en.php index 2818df75ec..5a464f0fb4 100644 --- a/module/search/lang/en.php +++ b/module/search/lang/en.php @@ -23,6 +23,7 @@ $lang->search->setQueryTitle = 'Please input the title（execute searching befor $lang->search->select = 'Stories/Tasks filter'; $lang->search->me = 'Me'; $lang->search->noQuery = 'Save no query!'; +$lang->search->onMenuBar = 'Show on menu bar'; $lang->search->operators['='] = '='; $lang->search->operators['!='] = '!='; diff --git a/module/search/lang/zh-tw.php b/module/search/lang/zh-tw.php index 23bff12b0f..4478df4ec8 100644 --- a/module/search/lang/zh-tw.php +++ b/module/search/lang/zh-tw.php @@ -22,10 +22,8 @@ $lang->search->deleteQuery = '刪除查詢'; $lang->search->setQueryTitle = '請輸入查詢標題（保存之前請先查詢）：'; $lang->search->select = '需求/任務篩選'; $lang->search->me = '自己'; -$lang->search->shortcut = '快捷'; $lang->search->noQuery = '還沒有保存查詢！'; - -$lang->search->noticeShortcut = '設置快捷訪問，可以將保存的查詢固定到列表導航，方便查看！'; +$lang->search->onMenuBar = '顯示在菜單欄'; $lang->search->operators['='] = '='; $lang->search->operators['!='] = '!='; diff --git a/module/task/lang/en.php b/module/task/lang/en.php index eca28a485c..738fb28ead 100644 --- a/module/task/lang/en.php +++ b/module/task/lang/en.php @@ -93,6 +93,9 @@ $lang->task->ditto = 'Ditto'; $lang->task->dittoNotice = "Current task and task above it do not belong to same project!"; $lang->task->selectAllUser = 'All'; $lang->task->noStory = 'No Story'; +$lang->task->noAssigned = 'No assigned'; +$lang->task->noFinished = 'No finished'; +$lang->task->noClosed = 'No closed'; $lang->task->statusList[''] = ''; $lang->task->statusList['wait'] = 'Pending'; diff --git a/module/task/lang/zh-tw.php b/module/task/lang/zh-tw.php index 9cff72681d..c77434ecf6 100644 --- a/module/task/lang/zh-tw.php +++ b/module/task/lang/zh-tw.php @@ -13,6 +13,7 @@ $lang->task->index = "任務一覽"; $lang->task->create = "建任務"; $lang->task->batchCreate = "批量添加"; $lang->task->batchEdit = "批量編輯"; +$lang->task->batchChangeModule = "批量修改模組"; $lang->task->edit = "編輯"; $lang->task->delete = "刪除"; $lang->task->deleted = "已刪除"; @@ -31,7 +32,6 @@ $lang->task->export = "導出數據"; $lang->task->reportChart = "報表統計"; $lang->task->fromBug = '來源Bug'; $lang->task->confirmStoryChange = "確認需求變動"; -$lang->task->batchChangeModule = "批量修改模組"; $lang->task->common = '任務'; $lang->task->id = '編號'; @@ -92,6 +92,10 @@ $lang->task->files = '附件'; $lang->task->ditto = '同上'; $lang->task->dittoNotice = "該任務與上一任務不屬於同一項目！"; $lang->task->selectAllUser = '全部'; +$lang->task->noStory = '無需求'; +$lang->task->noAssigned = '未指派'; +$lang->task->noFinished = '未完成'; +$lang->task->noClosed = '未關閉'; $lang->task->statusList[''] = ''; $lang->task->statusList['wait'] = '未開始'; diff --git a/module/testcase/lang/zh-tw.php b/module/testcase/lang/zh-tw.php index b777e5baec..eefca26085 100644 --- a/module/testcase/lang/zh-tw.php +++ b/module/testcase/lang/zh-tw.php @@ -38,6 +38,7 @@ $lang->testcase->version = '用例版本'; $lang->testcase->lastRunner = '執行人'; $lang->testcase->lastRunDate = '執行時間'; $lang->testcase->assignedTo = '指派給'; +$lang->testcase->colorTag = '顏色標籤'; $lang->testcase->lastRunResult = '結果'; $lang->testcase->allProduct = "所有{$lang->productCommon}"; $lang->testcase->fromBug = '來源Bug'; @@ -58,6 +59,7 @@ $lang->testcase->delete = "刪除用例"; $lang->testcase->view = "用例詳情"; $lang->testcase->edit = "編輯"; $lang->testcase->batchEdit = "批量編輯 "; +$lang->testcase->batchChangeModule = "批量修改模組"; $lang->testcase->delete = "刪除"; $lang->testcase->batchDelete = "批量刪除 "; $lang->testcase->browse = "用例列表"; @@ -68,8 +70,6 @@ $lang->testcase->exportTemplet = "導出模板"; $lang->testcase->export = "導出數據"; $lang->testcase->confirmChange = '確認用例變動'; $lang->testcase->confirmStoryChange = '確認需求變動'; -$lang->testcase->colorTag = '顏色標籤'; -$lang->testcase->batchChangeModule = "批量修改模組"; $lang->testcase->new = '新增'; diff --git a/module/tutorial/lang/zh-tw.php b/module/tutorial/lang/zh-tw.php index 3bb628d4f7..fb896c389d 100644 --- a/module/tutorial/lang/zh-tw.php +++ b/module/tutorial/lang/zh-tw.php @@ -14,7 +14,7 @@ $lang->tutorial = new stdclass(); $lang->tutorial->common = '新手教程'; $lang->tutorial->desc = '通過完成一系列任務，快速瞭解禪道的基本使用方法。這可能會花費您10分鐘，你可以隨時退出任務。'; $lang->tutorial->start = '立即開始'; -$lang->tutorial->exit = '退出任務'; +$lang->tutorial->exit = '退出教程'; $lang->tutorial->congratulation = '恭喜，你已完成了所有任務！'; $lang->tutorial->restart = '重新開始'; $lang->tutorial->currentTask = '當前任務'; @@ -29,6 +29,8 @@ $lang->tutorial->targetPageTip = '按此指示打開【%s】頁面'; $lang->tutorial->requiredTip = '【%s】為必填項'; $lang->tutorial->congratulateTask = '恭喜，你完成了任務 【】！'; $lang->tutorial->serverErrorTip = '發生了一些錯誤。'; +$lang->tutorial->ajaxSetError = '必須指定已完成的任務，如果要重置任務，請設置值為空。'; +$lang->tutorial->novice = "您可能初次使用禪道，是否進入新手教程"; $lang->tutorial->tasks = array(); @@ -48,6 +50,10 @@ $lang->tutorial->tasks['createProject'] = array('title' => '創建項目 $lang->tutorial->tasks['createProject']['nav'] = array('module' => 'project', 'method' => 'create', 'menu' => 'create', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => '添加項目'); $lang->tutorial->tasks['createProject']['desc'] = "

在系統創建一個新的項目：

"; +$lang->tutorial->tasks['manageTeam'] = array('title' => '管理團隊'); +$lang->tutorial->tasks['manageTeam']['nav'] = array('module' => 'project', 'method' => 'managemembers', 'menu' => 'team', 'target' => '.manage-team-btn', 'form' => '#teamForm', 'requiredFields' => 'account1', 'submit' => '#submit', 'targetPageName' => '團隊管理'); +$lang->tutorial->tasks['manageTeam']['desc'] = "

管理項目團隊成員：

"; + $lang->tutorial->tasks['linkStory'] = array('title' => '關聯需求'); $lang->tutorial->tasks['linkStory']['nav'] = array('module' => 'project', 'method' => 'linkStory', 'menu' => 'story', 'target' => '.link-story-btn', 'form' => '#linkStoryForm', 'formType' => 'table', 'submit' => '#submit', 'targetPageName' => '關聯需求'); $lang->tutorial->tasks['linkStory']['desc'] = "

將需求關聯到項目：

"; diff --git a/module/upgrade/lang/zh-tw.php b/module/upgrade/lang/zh-tw.php index 0faebd83fe..a9dfd1f877 100644 --- a/module/upgrade/lang/zh-tw.php +++ b/module/upgrade/lang/zh-tw.php @@ -99,3 +99,4 @@ $lang->upgrade->fromVersions['7_4_beta'] = '7.4.beta'; $lang->upgrade->fromVersions['8_0'] = '8.0'; $lang->upgrade->fromVersions['8_0_1'] = '8.0.1'; $lang->upgrade->fromVersions['8_1'] = '8.1'; +$lang->upgrade->fromVersions['8_1_3'] = '8.1.3'; diff --git a/tools/check.php b/tools/check.php index d006764402..4b49ba411c 100755 --- a/tools/check.php +++ b/tools/check.php @@ -21,8 +21,10 @@ $whiteList[] = 'admin-setflow'; $whiteList[] = 'bug-buildtemplates'; $whiteList[] = 'bug-sendmail'; $whiteList[] = 'board-managechild'; +$whiteList[] = 'custom-menu'; $whiteList[] = 'company-create'; $whiteList[] = 'company-delete'; +$whiteList[] = 'file-buildexporttpl'; $whiteList[] = 'file-buildform'; $whiteList[] = 'file-printfiles'; $whiteList[] = 'file-export2csv'; @@ -68,6 +70,12 @@ $whiteList[] = 'sso-binduser'; $whiteList[] = 'sso-createuser'; $whiteList[] = 'mail-asyncsend'; $whiteList[] = 'user-reset'; +$whiteList[] = 'product-showerrornone'; +$whiteList[] = 'tutorial-start'; +$whiteList[] = 'tutorial-index'; +$whiteList[] = 'tutorial-quit'; +$whiteList[] = 'tutorial-wizard'; +$whiteList[] = 'my-buildcontactlists'; /* checking actions of every module. */ echo '-------------action checking-----------------' . "\n";