From b1b04fde82727a9b59e04314e4bf5fec8646962f Mon Sep 17 00:00:00 2001
From: "shiyangyangwork@yahoo.cn" <shiyangyang@cnezsoft.com>
Date: Fri, 10 Feb 2012 01:31:52 +0000
Subject: [PATCH]  * finish the task #692.

---
 module/common/lang/zh-cn.php          | 2 +-
 module/project/lang/en.php            | 2 ++
 module/project/lang/zh-cn.php         | 4 +++-
 module/project/view/testtask.html.php | 8 ++++----
 module/testtask/lang/zh-cn.php        | 2 +-
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index a748bfe424..0d7517e274 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -153,7 +153,7 @@ $lang->project->menu->story     = array('link' => '需求|project|story|projectI
 $lang->project->menu->bug       = 'Bug|project|bug|projectID=%s';
 $lang->project->menu->dynamic   = '动态|project|dynamic|projectID=%s';
 $lang->project->menu->build     = array('link' => 'Build|project|build|projectID=%s', 'subModule' => 'build');
-$lang->project->menu->testtask  = '测试任务|project|testtask|projectID=%s';
+$lang->project->menu->testtask  = '测试申请|project|testtask|projectID=%s';
 $lang->project->menu->burn      = '燃尽图|project|burn|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');
diff --git a/module/project/lang/en.php b/module/project/lang/en.php
index 5fe8b6bab5..0dd2626d36 100644
--- a/module/project/lang/en.php
+++ b/module/project/lang/en.php
@@ -46,6 +46,8 @@ $lang->project->totalConsumed = 'Done';
 $lang->project->totalLeft     = 'Left';
 $lang->project->progess       = 'Progess';
 $lang->project->viewBug       = 'View bug';
+$lang->project->testtaskBrowse= 'Testtask browse';
+$lang->project->createTesttask= 'Create testtask';
 $lang->project->noProduct     = 'No product';
 $lang->project->select        = '--select project--';
 
diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php
index 6b3aa498bd..b910ee7bc2 100644
--- a/module/project/lang/zh-cn.php
+++ b/module/project/lang/zh-cn.php
@@ -46,6 +46,8 @@ $lang->project->totalConsumed = '总消耗';
 $lang->project->totalLeft     = '总剩余';
 $lang->project->progess       = '进度';
 $lang->project->viewBug       = '查看bug';
+$lang->project->testtaskBrowse= '待测列表';
+$lang->project->createTesttask= '提交测试';
 $lang->project->noProduct     = '无产品项目';
 $lang->project->select        = '--请选择项目--';
 
@@ -74,7 +76,7 @@ $lang->project->story           = '需求列表';
 $lang->project->bug             = 'Bug列表';
 $lang->project->dynamic         = '动态';
 $lang->project->build           = 'Build列表';
-$lang->project->testtask        = '测试任务';
+$lang->project->testtask        = '测试申请';
 $lang->project->burn            = '燃尽图';
 $lang->project->computeBurn     = '更新燃尽图';
 $lang->project->burnData        = '燃尽图数据';
diff --git a/module/project/view/testtask.html.php b/module/project/view/testtask.html.php
index 2594d4a75e..11e81c88a8 100644
--- a/module/project/view/testtask.html.php
+++ b/module/project/view/testtask.html.php
@@ -14,8 +14,8 @@
 <?php include '../../common/view/tablesorter.html.php';?>
 <table class='table-1 colored tablesorter fixed'>
   <caption class='caption-tl'>
-    <div class='f-left'><?php echo $lang->testtask->browse;?></div>
-    <div class='f-right'><?php common::printLink('testtask', 'create', "product=0&project=$projectID", $lang->testtask->create);?></div>
+    <div class='f-left'><?php echo $lang->project->testtaskBrowse;?></div>
+    <div class='f-right'><?php common::printLink('testtask', 'create', "product=0&project=$projectID", $lang->project->createTesttask);?></div>
   </caption>
   <thead>
   <tr class='colhead'>
@@ -32,8 +32,8 @@
   <tbody>
   <?php foreach($tasks as $task):?>
   <tr class='a-center'>
-    <td><?php echo html::a(inlink('view', "taskID=$task->id"), sprintf('%03d', $task->id));?></td>
-    <td class='a-left nobr'><?php echo html::a(inlink('view', "taskID=$task->id"), $task->name);?></td>
+    <td><?php echo html::a($this->createLink('testtask', 'view', "taskID=$task->id"), sprintf('%03d', $task->id));?></td>
+    <td class='a-left nobr'><?php echo html::a($this->createLink('testtask', 'view', "taskID=$task->id"), $task->name);?></td>
     <td class='nobr'><?php $task->build == 'trunk' ? print('Trunk') : print(html::a($this->createLink('build', 'view', "buildID=$task->build"), $task->buildName));?></td>
     <td><?php echo $users[$task->owner];?></td>
     <td><?php echo $task->begin?></td>
diff --git a/module/testtask/lang/zh-cn.php b/module/testtask/lang/zh-cn.php
index 72f4496a3b..76961d8524 100644
--- a/module/testtask/lang/zh-cn.php
+++ b/module/testtask/lang/zh-cn.php
@@ -12,7 +12,7 @@
 $lang->testtask->index          = "测试任务首页";
 $lang->testtask->create         = "创建测试任务";
 $lang->testtask->delete         = "删除测试任务";
-$lang->testtask->view           = "测试任务详情";
+$lang->testtask->view           = "详情";
 $lang->testtask->edit           = "编辑测试任务";
 $lang->testtask->browse         = "测试任务列表";
 $lang->testtask->linkCase       = "关联用例";