From 520d121bdf11459c0e5796603059f91024245f99 Mon Sep 17 00:00:00 2001 From: reneeteng Date: Tue, 11 Jun 2019 09:53:11 +0800 Subject: [PATCH 1/4] * Lang file optimized. --- module/branch/lang/en.php | 2 +- module/common/lang/en.php | 2 +- module/dept/lang/en.php | 2 +- module/dev/lang/en.php | 4 ++-- module/doc/lang/en.php | 2 +- module/productplan/lang/en.php | 2 +- module/project/lang/en.php | 4 ++-- module/score/lang/en.php | 4 ++-- module/tree/lang/en.php | 6 +++--- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/module/branch/lang/en.php b/module/branch/lang/en.php index 76dc4438fc..eb3443e2bc 100644 --- a/module/branch/lang/en.php +++ b/module/branch/lang/en.php @@ -1,7 +1,7 @@ branch->common = 'Branch'; $lang->branch->manage = 'Manage Branch'; -$lang->branch->sort = 'Sort'; +$lang->branch->sort = 'Order'; $lang->branch->delete = 'Delete Branch'; $lang->branch->add = 'Add'; diff --git a/module/common/lang/en.php b/module/common/lang/en.php index d5063bd92c..c8a826a3d1 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -375,7 +375,7 @@ $lang->admin->menu->message = array('link' => 'Notification|message|index', 's $lang->admin->menu->custom = array('link' => 'Custom|custom|set', 'subModule' => 'custom'); $lang->admin->menu->sso = array('link' => 'Integration|admin|sso'); -$lang->admin->menu->dev = array('link' => 'Develop|dev|api', 'alias' => 'db', 'subModule' => 'dev,editor,entry'); +$lang->admin->menu->dev = array('link' => 'CSD|dev|api', 'alias' => 'db', 'subModule' => 'dev,editor,entry'); $lang->admin->menu->data = array('link' => 'Data|backup|index', 'subModule' => 'backup,action'); $lang->admin->menu->safe = array('link' => 'Security|admin|safe', 'alias' => 'checkweak'); $lang->admin->menu->system = array('link' => 'System|cron|index', 'subModule' => 'cron'); diff --git a/module/dept/lang/en.php b/module/dept/lang/en.php index 5754c6eeb8..a65f0870db 100644 --- a/module/dept/lang/en.php +++ b/module/dept/lang/en.php @@ -18,7 +18,7 @@ $lang->dept->manager = "Manager"; $lang->dept->name = "Department Name"; $lang->dept->browse = "Manage"; $lang->dept->manage = "Manage Department"; -$lang->dept->updateOrder = "Sort"; +$lang->dept->updateOrder = "Order"; $lang->dept->add = "Add Department"; $lang->dept->dragAndSort = "Drag to order"; diff --git a/module/dev/lang/en.php b/module/dev/lang/en.php index 01c38f0c76..85a8ec6cdc 100644 --- a/module/dev/lang/en.php +++ b/module/dev/lang/en.php @@ -1,5 +1,5 @@ dev->common = 'Develop'; +$lang->dev->common = 'CSD'; $lang->dev->api = 'API'; $lang->dev->db = 'Database'; $lang->dev->editor = 'Editor'; @@ -70,7 +70,7 @@ $lang->dev->tableList['api'] = 'API'; $lang->dev->tableList['backup'] = 'Backup'; $lang->dev->tableList['common'] = 'Common'; $lang->dev->tableList['convert'] = 'Convert'; -$lang->dev->tableList['dev'] = 'Develop'; +$lang->dev->tableList['dev'] = 'CSD'; $lang->dev->tableList['git'] = 'GIT'; $lang->dev->tableList['index'] = 'Home'; $lang->dev->tableList['install'] = 'Install'; diff --git a/module/doc/lang/en.php b/module/doc/lang/en.php index a8f46ddcc3..a58efcd95e 100644 --- a/module/doc/lang/en.php +++ b/module/doc/lang/en.php @@ -71,7 +71,7 @@ $lang->doc->delete = 'Delete'; $lang->doc->browse = 'List'; $lang->doc->view = 'Detail'; $lang->doc->diff = 'Diff'; -$lang->doc->sort = 'Sort'; +$lang->doc->sort = 'Order'; $lang->doc->manageType = 'Manage Category'; $lang->doc->editType = 'Edit'; $lang->doc->deleteType = 'Delete'; diff --git a/module/productplan/lang/en.php b/module/productplan/lang/en.php index 123565a0cd..71d3cafdf0 100644 --- a/module/productplan/lang/en.php +++ b/module/productplan/lang/en.php @@ -16,7 +16,7 @@ $lang->productplan->create = "Create Plan"; $lang->productplan->edit = "Edit Plan"; $lang->productplan->delete = "Delete"; $lang->productplan->view = "Detail"; -$lang->productplan->bugSummary = "Total %s Bugs on this page."; +$lang->productplan->bugSummary = "Total %s bugs on this page."; $lang->productplan->basicInfo = 'Basic Info'; $lang->productplan->batchEdit = 'Batch Edit'; diff --git a/module/project/lang/en.php b/module/project/lang/en.php index 490da7e453..6933bc5e62 100644 --- a/module/project/lang/en.php +++ b/module/project/lang/en.php @@ -150,7 +150,7 @@ $lang->project->treeStory = 'Show Story Only'; $lang->project->treeOnlyTask = 'Show Task Only'; $lang->project->treeOnlyStory = 'Show Story Only'; $lang->project->storyKanban = 'Story Kanban'; -$lang->project->storySort = 'Sort Story'; +$lang->project->storySort = 'Order Story'; $lang->project->importPlanStory = '' . $lang->projectCommon . ' is created!\nDo you want to import stories that have been linked to the plan?'; $lang->project->iteration = 'Iterations'; $lang->project->iterationInfo = '%s Iterations'; @@ -211,7 +211,7 @@ $lang->project->wbs = "Create Task"; $lang->project->batchWBS = "Batch Create"; $lang->project->howToUpdateBurn = "Help "; $lang->project->whyNoStories = "No story can be linked. Please check whether there is any story in {$lang->projectCommon} which is linked to {$lang->productCommon} and make sure it has been reviewed."; -$lang->project->productStories = "Stories linked to {$lang->projectCommon} are the subeset of stories linked to {$lang->productCommon}. Stories can only be linked after they pass the review. Link Story now."; +$lang->project->productStories = "Stories linked to {$lang->projectCommon} are the subeset of stories linked to {$lang->productCommon}. Stories can only be linked after they pass the review. Link Stories now."; $lang->project->haveDraft = "%s stories in draft, so they can't be linked."; $lang->project->doneProjects = 'Finished'; $lang->project->selectDept = 'Select Department'; diff --git a/module/score/lang/en.php b/module/score/lang/en.php index 391f966e47..384dca4e6c 100644 --- a/module/score/lang/en.php +++ b/module/score/lang/en.php @@ -8,7 +8,7 @@ $lang->score->tips = 'Point added yesterday: %d
To $lang->score->resetTips = 'It will take a while. Do not close the window.'; $lang->score->resetStart = 'Start'; $lang->score->resetLoading = 'Processing: '; -$lang->score->resetFinish = 'Completed'; +$lang->score->resetFinish = 'Finish'; $lang->score->id = 'ID'; $lang->score->userID = 'UserID'; @@ -73,7 +73,7 @@ $lang->score->methods['testtask']['runCase'] = 'Run Test Case'; $lang->score->methods['testcase']['create'] = 'Create Test Case'; $lang->score->methods['build']['create'] = 'Create Build'; $lang->score->methods['project']['create'] = 'Create Project'; -$lang->score->methods['project']['close'] = 'Complete Project'; +$lang->score->methods['project']['close'] = 'Finish Project'; $lang->score->methods['productplan']['create'] = 'Create Plan'; $lang->score->methods['release']['create'] = 'Create Release'; $lang->score->methods['block']['set'] = 'Custom Block'; diff --git a/module/tree/lang/en.php b/module/tree/lang/en.php index 3ca92f8e54..060971fe76 100644 --- a/module/tree/lang/en.php +++ b/module/tree/lang/en.php @@ -24,7 +24,7 @@ $lang->tree->manageBug = 'Manage Bug'; $lang->tree->manageCase = 'Manage Case'; $lang->tree->manageCaseLib = 'Manage Library'; $lang->tree->manageCustomDoc = 'Manage Document Library'; -$lang->tree->updateOrder = 'Sort'; +$lang->tree->updateOrder = 'Order'; $lang->tree->manageChild = 'Manage Child Modules'; $lang->tree->manageStoryChild = 'Manage Child Modules'; $lang->tree->manageLineChild = 'Manage Product Line'; @@ -33,8 +33,8 @@ $lang->tree->manageCaseChild = 'Manage Child Cases'; $lang->tree->manageCaselibChild = 'Manage Child Libraries'; $lang->tree->manageTaskChild = "Manage Child {$lang->projectCommon}s"; $lang->tree->syncFromProduct = 'Copy Other Product Module'; -$lang->tree->dragAndSort = "Drag and Sort"; -$lang->tree->sort = "Sort"; +$lang->tree->dragAndSort = "Drag to order"; +$lang->tree->sort = "Order"; $lang->tree->addChild = "Add Child Module"; $lang->tree->confirmDelete = 'Do you want to delete this module and its child modules?'; $lang->tree->confirmDeleteLine = 'Do you want to delete this product line?'; From e5e51fa82f9f9e4dee49dd60c2f8be644622e173 Mon Sep 17 00:00:00 2001 From: reneeteng Date: Tue, 11 Jun 2019 11:29:50 +0800 Subject: [PATCH 2/4] + add en lang. --- module/productplan/lang/en.php | 76 ++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 module/productplan/lang/en.php diff --git a/module/productplan/lang/en.php b/module/productplan/lang/en.php new file mode 100644 index 0000000000..e757dac632 --- /dev/null +++ b/module/productplan/lang/en.php @@ -0,0 +1,76 @@ + + * @package productplan + * @version $Id: en.php 4659 2013-04-17 06:45:08Z chencongzhi520@gmail.com $ + * @link http://www.zentao.net + */ +$lang->productplan->common = $lang->productCommon . ' Plan'; +$lang->productplan->browse = "Plans"; +$lang->productplan->index = "List"; +$lang->productplan->create = "Create Plan"; +$lang->productplan->edit = "Edit Plan"; +$lang->productplan->delete = "Delete Plan"; +$lang->productplan->view = "Plan Detail"; +$lang->productplan->bugSummary = "Total %s Bugs on this page."; +$lang->productplan->basicInfo = 'Basic Info'; +$lang->productplan->batchEdit = 'Batch Edit'; + +$lang->productplan->batchUnlink = "Batch Unlink"; +$lang->productplan->linkStory = "Link Story"; +$lang->productplan->unlinkStory = "Unlink Story"; +$lang->productplan->batchUnlinkStory = "Batch Unlink"; +$lang->productplan->linkedStories = 'Linked Stories'; +$lang->productplan->unlinkedStories = 'Unlinked Stories'; +$lang->productplan->updateOrder = 'Rank'; +$lang->productplan->createChildren = "Create Child Plans"; + +$lang->productplan->linkBug = "Link Bug"; +$lang->productplan->unlinkBug = "Unlink Bug"; +$lang->productplan->batchUnlinkBug = "Batch Unlink Bugs"; +$lang->productplan->linkedBugs = 'Linked Bugs'; +$lang->productplan->unlinkedBugs = 'Unlinked Bugs'; +$lang->productplan->unexpired = 'Unexpired Plans'; +$lang->productplan->all = 'All Plans'; + +$lang->productplan->confirmDelete = "Do you want to delete this plan?"; +$lang->productplan->confirmUnlinkStory = "Do you want to unlink this story?"; +$lang->productplan->confirmUnlinkBug = "Do you want to unlink this bug?"; +$lang->productplan->noPlan = 'No plans yet. '; + +$lang->productplan->id = 'ID'; +$lang->productplan->product = $lang->productCommon; +$lang->productplan->branch = 'Platform/Branch'; +$lang->productplan->title = 'Title'; +$lang->productplan->desc = 'Description'; +$lang->productplan->begin = 'Begin'; +$lang->productplan->end = 'End'; +$lang->productplan->last = 'Last Plan'; +$lang->productplan->future = 'TBD'; +$lang->productplan->stories = 'Story'; +$lang->productplan->bugs = 'Bug'; +$lang->productplan->hour = 'Hours'; +$lang->productplan->project = $lang->projectCommon; +$lang->productplan->parent = "Parent Plan"; +$lang->productplan->children= "Child Plan"; + +$lang->productplan->endList[7] = '1 Week'; +$lang->productplan->endList[14] = '2 Weeks'; +$lang->productplan->endList[31] = '1 Month'; +$lang->productplan->endList[62] = '2 Months'; +$lang->productplan->endList[93] = '3 Months'; +$lang->productplan->endList[186] = '6 Months'; +$lang->productplan->endList[365] = '1 Year'; + +$lang->productplan->errorNoTitle = 'ID %s title should not be empty.'; +$lang->productplan->errorNoBegin = 'ID %s begin time should not be empty.'; +$lang->productplan->errorNoEnd = 'ID %s end time should not be empty.'; +$lang->productplan->beginGeEnd = 'ID %s begin time should not be >= end time.'; + +$lang->productplan->featureBar['browse']['all'] = 'All'; +$lang->productplan->featureBar['browse']['unexpired'] = 'Unexpired'; +$lang->productplan->featureBar['browse']['overdue'] = 'Expired'; From 04c138ba061220475ae4e56f8920c3961fa6f4a3 Mon Sep 17 00:00:00 2001 From: reneeteng Date: Tue, 11 Jun 2019 11:30:44 +0800 Subject: [PATCH 3/4] * Lang file update. --- module/productplan/lang/en.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/productplan/lang/en.php b/module/productplan/lang/en.php index e757dac632..1b6c92e6ef 100644 --- a/module/productplan/lang/en.php +++ b/module/productplan/lang/en.php @@ -26,7 +26,7 @@ $lang->productplan->unlinkStory = "Unlink Story"; $lang->productplan->batchUnlinkStory = "Batch Unlink"; $lang->productplan->linkedStories = 'Linked Stories'; $lang->productplan->unlinkedStories = 'Unlinked Stories'; -$lang->productplan->updateOrder = 'Rank'; +$lang->productplan->updateOrder = 'Order'; $lang->productplan->createChildren = "Create Child Plans"; $lang->productplan->linkBug = "Link Bug"; From 80fe80c41cb63d0b14454c40a79d7a3ac3c31389 Mon Sep 17 00:00:00 2001 From: reneeteng Date: Tue, 11 Jun 2019 13:09:45 +0800 Subject: [PATCH 4/4] * Change module lang file. --- module/tree/lang/en.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/module/tree/lang/en.php b/module/tree/lang/en.php index 060971fe76..0948fdc309 100644 --- a/module/tree/lang/en.php +++ b/module/tree/lang/en.php @@ -17,8 +17,8 @@ $lang->tree->browse = 'Manage General Module'; $lang->tree->browseTask = 'Manage Task Module'; $lang->tree->manage = 'Manage Module'; $lang->tree->fix = 'Fix'; -$lang->tree->manageProduct = "Manage {$lang->productCommon}"; -$lang->tree->manageProject = "Manage {$lang->projectCommon}"; +$lang->tree->manageProduct = "Manage {$lang->productCommon} Modules"; +$lang->tree->manageProject = "Manage {$lang->projectCommon} Modules"; $lang->tree->manageLine = 'Manage Product Line'; $lang->tree->manageBug = 'Manage Bug'; $lang->tree->manageCase = 'Manage Case'; @@ -31,8 +31,8 @@ $lang->tree->manageLineChild = 'Manage Product Line'; $lang->tree->manageBugChild = 'Manage Child Bugs'; $lang->tree->manageCaseChild = 'Manage Child Cases'; $lang->tree->manageCaselibChild = 'Manage Child Libraries'; -$lang->tree->manageTaskChild = "Manage Child {$lang->projectCommon}s"; -$lang->tree->syncFromProduct = 'Copy Other Product Module'; +$lang->tree->manageTaskChild = "Manage Child {$lang->projectCommon} Modules"; +$lang->tree->syncFromProduct = 'Copy Other Product Modules'; $lang->tree->dragAndSort = "Drag to order"; $lang->tree->sort = "Order"; $lang->tree->addChild = "Add Child Module";