diff --git a/module/admin/lang/en.php b/module/admin/lang/en.php index 2891b54bda..588ea5665b 100644 --- a/module/admin/lang/en.php +++ b/module/admin/lang/en.php @@ -19,27 +19,24 @@ $lang->admin->welcome = 'Welcome to ZenTaoPMS.'; $lang->admin->browseCompany = 'Browse Company'; -$lang->admin->clearData = 'Clear Data'; -$lang->admin->pleaseInputYes = "Input 'yes' to clear data:"; -$lang->admin->confirmClearData = 'Are you sure to clear data?'; -$lang->admin->clearDataFailed = 'Failed to clear data!'; -$lang->admin->clearDataSuccessfully = 'Succeed in clearing data!'; +$lang->admin->clearData = 'Reset'; +$lang->admin->pleaseInputYes = "Input 'yes' to reset zentao:"; +$lang->admin->confirmClearData = 'Are you sure to reset zentao?'; +$lang->admin->clearDataFailed = 'Failed to reset zentao!'; +$lang->admin->clearDataSuccessfully = 'Successfully reset zentao'; $lang->admin->clearDataDesc = <<Clear data is dangerous. Be sure to backup your database and other data files and sure nobody is using pms when importing.\n -The impact of clearing data: -1、Clearing data will have no effect on table company,table group,and table groupPriv. -2、If you have choosed import demo data when installing,then clearing data will delete the item where key equals showDemoUsers on config table, and delete all demo users on user table. -3、For others tables:clear all data. +When you finish testing zentao, you can reset data inf zentao by using the reset feature. All data in database will be cleared except the data of company, department, user, group and priviledge.
+This action is very dangerous, think over before you do it! EOT; $lang->admin->info = new stdclass(); -$lang->admin->info->caption = 'ZentaoPMS information'; +$lang->admin->info->caption = 'zentao information'; $lang->admin->info->version = 'The current version of the system is %s,'; $lang->admin->info->links = 'You can visit the following link:'; $lang->admin->info->account = 'Your account in zentao community is %s. '; $lang->admin->notice = new stdclass(); -$lang->admin->notice->register = "Tips: You have not registered in Zentao community (www.zentao.net), %s to register and get the latest information about ZentaoPMS."; +$lang->admin->notice->register = "Tips: You have not registered in zentao community (www.zentao.net), %s to register and get the latest information about ZentaoPMS."; $lang->admin->notice->ignore = "ignore"; $lang->admin->register = new stdclass(); diff --git a/module/admin/lang/zh-cn.php b/module/admin/lang/zh-cn.php index c8347fb6cc..6135f3d129 100644 --- a/module/admin/lang/zh-cn.php +++ b/module/admin/lang/zh-cn.php @@ -19,17 +19,14 @@ $lang->admin->welcome = '欢迎使用禅道管理软件后台管理系统'; $lang->admin->browseCompany = '浏览公司'; -$lang->admin->clearData = '清除数据'; -$lang->admin->pleaseInputYes = '确认清除数据请输入yes：'; -$lang->admin->confirmClearData = '您确认要清除数据吗?'; -$lang->admin->clearDataFailed = '清除数据失败！'; -$lang->admin->clearDataSuccessfully = '清除数据成功！'; +$lang->admin->clearData = '重置禅道'; +$lang->admin->pleaseInputYes = '确认重置禅道数据请输入yes：'; +$lang->admin->confirmClearData = '您确认要重置禅道数据吗?'; +$lang->admin->clearDataFailed = '禅道重置失败！'; +$lang->admin->clearDataSuccessfully = '禅道重置成功！'; $lang->admin->clearDataDesc = <<清除数据存在一定的风险，清楚数据之前，我们强烈建议您备份数据库及相应的数据文件，并保证清除数据的时候，没有其他人进行操作。\n -清除数据对数据库的影响如下： -1、清除数据不会对company, group, groupPriv表进行操作。 -2、如果安装的时候有导入demo数据，则会删除config表key=showDemoUsers的记录，并删除user表中的所有demo用户。 -3、对于其他表则进行全部清除操作。 +当您测试禅道完毕之后，可以使用重置功能清除测试数据。该操作会保留公司、部门、用户和权限分组的数据，其他的数据会被清空。
+该功能存在极大的风险，执行之前务必三思! EOT; $lang->admin->info = new stdclass(); diff --git a/module/common/lang/en.php b/module/common/lang/en.php index 42cc13e0df..8c69f7297b 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -170,8 +170,8 @@ $lang->product->menu->plan = array('link' => 'Plan|productplan|browse|product $lang->product->menu->release = array('link' => 'Release|release|browse|productID=%s', 'subModule' => 'release'); $lang->product->menu->roadmap = 'Roadmap|product|roadmap|productID=%s'; $lang->product->menu->doc = array('link' => 'Doc|product|doc|productID=%s', 'subModule' => 'doc'); -$lang->product->menu->view = array('link' => 'Manage|product|view|productID=%s', 'alias' => 'edit'); $lang->product->menu->module = 'Modules|tree|browse|productID=%s&view=story'; +$lang->product->menu->view = array('link' => 'Info|product|view|productID=%s', 'alias' => 'edit'); $lang->product->menu->project = 'Projects|product|project|status=all&productID=%s'; $lang->product->menu->create = array('link' => ' New|product|create', 'float' => 'right'); $lang->product->menu->all = array('link' => ' All|product|index|locate=no&productID=%s', 'float' => 'right'); @@ -198,7 +198,7 @@ $lang->project->menu->testtask = 'Testtask|project|testtask|projectID=%s'; $lang->project->menu->team = array('link' => 'Team|project|team|projectID=%s', 'alias' => 'managemembers'); $lang->project->menu->doc = array('link' => 'Doc|project|doc|porjectID=%s', 'subModule' => 'doc'); $lang->project->menu->product = array('link' => 'Product|project|manageproducts|projectID=%s', 'alias' => 'edit,start,suspend,delay,close'); -$lang->project->menu->view = 'Manage|project|view|projectID=%s'; +$lang->project->menu->view = 'Info|project|view|projectID=%s'; $lang->project->menu->create = array('link' => ' New|project|create', 'float' => 'right'); $lang->project->menu->all = array('link' => ' Projects|project|index|locate=no&status=all&projectID=%s', 'float' => 'right'); @@ -282,7 +282,7 @@ $lang->admin->menu->index = array('link' => 'Index|admin|index'); $lang->admin->menu->extension = array('link' => 'Extension|extension|browse', 'subModule' => 'extension,editor'); $lang->admin->menu->custom = array('link' => 'Custom|custom|index', 'subModule' => 'custom'); $lang->admin->menu->mail = array('link' => 'Email|mail|index', 'subModule' => 'mail'); -$lang->admin->menu->clearData = array('link' => 'Clear data|admin|cleardata'); +$lang->admin->menu->clearData = array('link' => 'Reset|admin|cleardata'); $lang->admin->menu->convert = array('link' => 'Import|convert|index', 'subModule' => 'convert'); $lang->admin->menu->trashes = array('link' => 'Trash|action|trash', 'subModule' => 'action'); $lang->admin->menu->sso = array('link' => 'SSO|sso|browse', 'subModule' => 'sso'); diff --git a/module/common/lang/menuOrder.php b/module/common/lang/menuOrder.php index 653733efd9..13d73681b0 100644 --- a/module/common/lang/menuOrder.php +++ b/module/common/lang/menuOrder.php @@ -36,8 +36,8 @@ $lang->product->menuOrder[20] = 'release'; $lang->product->menuOrder[25] = 'roadmap'; $lang->product->menuOrder[30] = 'doc'; $lang->product->menuOrder[35] = 'project'; -$lang->product->menuOrder[40] = 'view'; -$lang->product->menuOrder[45] = 'module'; +$lang->product->menuOrder[40] = 'module'; +$lang->product->menuOrder[45] = 'view'; $lang->product->menuOrder[50] = 'order'; $lang->product->menuOrder[55] = 'create'; $lang->product->menuOrder[60] = 'all'; diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index d30f83811c..732cceecc0 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -170,8 +170,8 @@ $lang->product->menu->plan = array('link' => '计划|productplan|browse|produ $lang->product->menu->release = array('link' => '发布|release|browse|productID=%s', 'subModule' => 'release'); $lang->product->menu->roadmap = '路线图|product|roadmap|productID=%s'; $lang->product->menu->doc = array('link' => '文档|product|doc|productID=%s', 'subModule' => 'doc'); -$lang->product->menu->view = array('link' => '维护|product|view|productID=%s', 'alias' => 'edit'); $lang->product->menu->module = '模块|tree|browse|productID=%s&view=story'; +$lang->product->menu->view = array('link' => '概况|product|view|productID=%s', 'alias' => 'edit'); $lang->product->menu->project = '项目|product|project|status=all&productID=%s'; $lang->product->menu->create = array('link' => ' 添加产品|product|create', 'float' => 'right'); $lang->product->menu->all = array('link' => ' 所有产品|product|index|locate=no&productID=%s', 'float' => 'right'); @@ -198,7 +198,7 @@ $lang->project->menu->testtask = '测试|project|testtask|projectID=%s'; $lang->project->menu->team = array('link' => '团队|project|team|projectID=%s', 'alias' => 'managemembers'); $lang->project->menu->doc = array('link' => '文档|project|doc|porjectID=%s', 'subModule' => 'doc'); $lang->project->menu->product = '产品|project|manageproducts|projectID=%s'; -$lang->project->menu->view = array('link' => '维护|project|view|projectID=%s', 'alias' => 'edit,start,suspend,putoff,close'); +$lang->project->menu->view = array('link' => '概况|project|view|projectID=%s', 'alias' => 'edit,start,suspend,putoff,close'); $lang->project->menu->create = array('link' => ' 添加项目|project|create', 'float' => 'right'); $lang->project->menu->all = array('link' => ' 所有项目|project|index|locate=no&status=all&projectID=%s', 'float' => 'right'); @@ -282,7 +282,7 @@ $lang->admin->menu->index = array('link' => '首页|admin|index'); $lang->admin->menu->extension = array('link' => '扩展|extension|browse', 'subModule' => 'extension,editor'); $lang->admin->menu->custom = array('link' => '自定义|custom|index', 'subModule' => 'custom'); $lang->admin->menu->mail = array('link' => '发信|mail|index', 'subModule' => 'mail'); -$lang->admin->menu->clearData = array('link' => '清除数据|admin|cleardata'); +$lang->admin->menu->clearData = array('link' => '重置禅道|admin|cleardata'); $lang->admin->menu->convert = array('link' => '导入|convert|index', 'subModule' => 'convert'); $lang->admin->menu->trashes = array('link' => '回收站|action|trash', 'subModule' => 'action'); $lang->admin->menu->sso = array('link' => '单点登录|sso|browse', 'subModule' => 'sso'); diff --git a/module/product/lang/zh-cn.php b/module/product/lang/zh-cn.php index d37883d28a..90e874fdbd 100644 --- a/module/product/lang/zh-cn.php +++ b/module/product/lang/zh-cn.php @@ -13,7 +13,7 @@ $lang->product->common = '产品视图'; $lang->product->index = "产品首页"; $lang->product->browse = "浏览产品"; $lang->product->dynamic = "动态"; -$lang->product->view = "产品信息"; +$lang->product->view = "产品概况"; $lang->product->edit = "编辑产品"; $lang->product->batchEdit = "批量编辑"; $lang->product->create = "新增产品"; diff --git a/module/productplan/view/view.html.php b/module/productplan/view/view.html.php index 22f17f3e2d..fd5e704fb7 100644 --- a/module/productplan/view/view.html.php +++ b/module/productplan/view/view.html.php @@ -213,6 +213,4 @@ - - diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php index 0d281dbede..bc2154eb49 100644 --- a/module/project/lang/zh-cn.php +++ b/module/project/lang/zh-cn.php @@ -115,7 +115,7 @@ $lang->project->team = '团队成员'; $lang->project->doc = '文档列表'; $lang->project->manageProducts = '关联产品'; $lang->project->linkStory = '关联需求'; -$lang->project->view = "基本信息"; +$lang->project->view = "项目概况"; $lang->project->create = "添加项目"; $lang->project->copy = "复制项目"; $lang->project->delete = "删除项目"; diff --git a/module/testcase/view/browse.html.php b/module/testcase/view/browse.html.php index a15ee27f16..d72a99feca 100644 --- a/module/testcase/view/browse.html.php +++ b/module/testcase/view/browse.html.php @@ -45,8 +45,8 @@ js::set('confirmDelete', $lang->testcase->confirmDelete); ?> - diff --git a/module/testtask/view/results.html.php b/module/testtask/view/results.html.php index 02fc50f474..3fec4132a6 100644 --- a/module/testtask/view/results.html.php +++ b/module/testtask/view/results.html.php @@ -28,7 +28,7 @@ diff --git a/module/user/view/featurebar.html.php b/module/user/view/featurebar.html.php index 51a31c92fd..c04f22d20c 100755 --- a/module/user/view/featurebar.html.php +++ b/module/user/view/featurebar.html.php @@ -1,3 +1,4 @@ +getExtViewFile(__FILE__)){include $extView; return helper::cd();}?>
- +
-
testtask->build . $lang->colon . $build;?>
+
testtask->build . $lang->colon . $build;?>
RESULT#id . ' ' . $result->date . ' ' . $users[$result->lastRunner] . ' ' . $lang->testtask->runCase . ':'. " " . $lang->testcase->resultList[$result->caseResult] . '';?>
idAB;?>project->code;?>project->code;?> project->name;?> project->begin;?> project->end;?>