From 64a7dabcfedfb2538515c2c6eb0973b1a1de5160 Mon Sep 17 00:00:00 2001 From: wangchunsheng Date: Wed, 14 Apr 2010 08:40:07 +0000 Subject: [PATCH] * adjust the priv names. --- db/update1.0.beta.sql | 2 +- module/dept/lang/zh-cn.php | 2 +- module/group/lang/zh-cn.php | 16 ++++++++-------- module/product/lang/zh-cn.php | 4 ++-- module/story/lang/zh-cn.php | 5 +++++ module/testtask/lang/zh-cn.php | 5 +++++ module/tree/lang/zh-cn.php | 2 +- 7 files changed, 23 insertions(+), 13 deletions(-) diff --git a/db/update1.0.beta.sql b/db/update1.0.beta.sql index f798d6508c..5ce5891085 100644 --- a/db/update1.0.beta.sql +++ b/db/update1.0.beta.sql @@ -14,7 +14,7 @@ ALTER TABLE `zt_testTask` ADD `deleted` ENUM( '0', '1' ) NOT NULL DEFAULT '0'; ALTER TABLE `zt_user` ADD `deleted` ENUM( '0', '1' ) NOT NULL DEFAULT '0'; -- 处理user表。 -UPDATE zt_user SET deleted = '1' WHERE STATUS = 'delete' +UPDATE zt_user SET deleted = '1' WHERE STATUS = 'delete'; ALTER TABLE `zt_user` DROP `status`; INSERT INTO zt_action(`company`, `objecttype`, `objectID`, `actor`, action, `date`, `comment` , `extra`) SELECT `company`, 'user', `id`, 'system', 'deleted', now( ) , '', 1 FROM zt_user WHERE zt_user.deleted ='1' diff --git a/module/dept/lang/zh-cn.php b/module/dept/lang/zh-cn.php index 67d352ed1d..00210166db 100644 --- a/module/dept/lang/zh-cn.php +++ b/module/dept/lang/zh-cn.php @@ -26,7 +26,7 @@ $lang->dept->add = "添加"; $lang->dept->addChild = "添加下级部门"; $lang->dept->manageChild = "下级部门"; $lang->dept->delete = "删除部门"; -$lang->dept->browse = "部门列表"; +$lang->dept->browse = "部门维护"; $lang->dept->manage = "维护部门结构"; $lang->dept->updateOrder = "更新排序"; $lang->dept->users = "成员列表"; diff --git a/module/group/lang/zh-cn.php b/module/group/lang/zh-cn.php index 97ae87280d..3e386bd798 100644 --- a/module/group/lang/zh-cn.php +++ b/module/group/lang/zh-cn.php @@ -86,10 +86,10 @@ $lang->resource->story->create = 'create'; $lang->resource->story->edit = 'edit'; $lang->resource->story->delete = 'delete'; $lang->resource->story->view = 'view'; -$lang->resource->story->change = 'change'; -$lang->resource->story->review = 'review'; -$lang->resource->story->close = 'close'; -$lang->resource->story->activate= 'activate'; +$lang->resource->story->change = 'lblChange'; +$lang->resource->story->review = 'lblReview'; +$lang->resource->story->close = 'lblClose'; +$lang->resource->story->activate= 'lblActivate'; $lang->resource->story->tasks = 'tasks'; $lang->resource->story->ajaxGetProjectStories = 'ajaxGetProjectStories'; $lang->resource->story->ajaxGetProductStories = 'ajaxGetProductStories'; @@ -181,14 +181,14 @@ $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->cases = 'lblCases'; $lang->resource->testtask->edit = 'edit'; $lang->resource->testtask->delete = 'delete'; $lang->resource->testtask->batchAssign = 'batchAssign'; $lang->resource->testtask->linkcase = 'linkCase'; -$lang->resource->testtask->unlinkcase = 'unlinkCase'; -$lang->resource->testtask->runcase = 'runCase'; -$lang->resource->testtask->results = 'results'; +$lang->resource->testtask->unlinkcase = 'lblUnlinkCase'; +$lang->resource->testtask->runcase = 'lblRunCase'; +$lang->resource->testtask->results = 'lblResults'; /* 组织视图。*/ $lang->resource->company->index = 'index'; diff --git a/module/product/lang/zh-cn.php b/module/product/lang/zh-cn.php index a9037653dc..d8015fa520 100644 --- a/module/product/lang/zh-cn.php +++ b/module/product/lang/zh-cn.php @@ -36,8 +36,8 @@ $lang->product->roadmap = '路线图'; $lang->product->selectProduct = "请选择产品"; $lang->product->saveButton = " 保存 (S) "; $lang->product->confirmDelete = " 您确定删除该产品吗？"; -$lang->product->ajaxGetProjects = "接口:获得项目列表"; -$lang->product->ajaxGetPlans = "接口:获得计划列表"; +$lang->product->ajaxGetProjects = "接口:项目列表"; +$lang->product->ajaxGetPlans = "接口:计划列表"; $lang->product->errorFormat = '产品数据格式不正确'; $lang->product->errorEmptyName = '产品名称不能为空'; diff --git a/module/story/lang/zh-cn.php b/module/story/lang/zh-cn.php index 87bbd81637..71f4195927 100644 --- a/module/story/lang/zh-cn.php +++ b/module/story/lang/zh-cn.php @@ -128,6 +128,11 @@ $lang->story->legendHistory = '历史记录'; $lang->story->legendVersion = '历史版本'; $lang->story->legendMisc = '其他相关'; +$lang->story->lblChange = '变更需求'; +$lang->story->lblReview = '评审需求'; +$lang->story->lblActivate = '激活需求'; +$lang->story->lblClose = '关闭需求'; + $lang->story->affectedProjects = '影响的项目'; $lang->story->affectedBugs = '影响的Bug'; $lang->story->affectedCases = '影响的用例'; diff --git a/module/testtask/lang/zh-cn.php b/module/testtask/lang/zh-cn.php index 9f1da35f01..d113460bcd 100644 --- a/module/testtask/lang/zh-cn.php +++ b/module/testtask/lang/zh-cn.php @@ -61,3 +61,8 @@ $lang->testtask->unlinkedCases = '未关联用例列表'; $lang->testtask->linkedCases = '已关联用例列表'; $lang->testtask->confirmDelete = '您确认要删除该测试任务吗？'; $lang->testtask->passAll = '全部通过'; + +$lang->testtask->lblCases = '用例列表'; +$lang->testtask->lblUnlinkCase = '移除用例'; +$lang->testtask->lblRunCase = '执行用例'; +$lang->testtask->lblResults = '执行结果'; diff --git a/module/tree/lang/zh-cn.php b/module/tree/lang/zh-cn.php index 3d0081226f..dd82974830 100644 --- a/module/tree/lang/zh-cn.php +++ b/module/tree/lang/zh-cn.php @@ -26,7 +26,7 @@ $lang->tree->add = "添加"; $lang->tree->edit = "编辑"; $lang->tree->addChild = "添加子模块"; $lang->tree->delete = "删除模块"; -$lang->tree->browse = "模块列表"; +$lang->tree->browse = "模块维护"; $lang->tree->manage = "维护模块"; $lang->tree->manageProduct= "维护产品视图模块"; $lang->tree->manageProject= "维护项目视图模块";