diff --git a/module/block/lang/zh-cn.php b/module/block/lang/zh-cn.php
index 93d6533328..6126c75b84 100644
--- a/module/block/lang/zh-cn.php
+++ b/module/block/lang/zh-cn.php
@@ -9,6 +9,7 @@
* @version $Id$
* @link http://www.zentao.net
*/
+global $config;
$lang->block = new stdclass();
$lang->block->common = '区块';
$lang->block->name = '区块名称';
@@ -307,10 +308,13 @@ $lang->block->default['full']['my']['7']['params']['riskNum'] = '20';
$lang->block->default['full']['my']['7']['params']['issueNum'] = '20';
$lang->block->default['full']['my']['7']['params']['storyNum'] = '20';
-$lang->block->default['full']['my']['8']['title'] = '项目人力投入';
-$lang->block->default['full']['my']['8']['block'] = 'projectteam';
-$lang->block->default['full']['my']['8']['source'] = 'project';
-$lang->block->default['full']['my']['8']['grid'] = 8;
+if($config->systemMode == 'new')
+{
+ $lang->block->default['full']['my']['8']['title'] = '项目人力投入';
+ $lang->block->default['full']['my']['8']['block'] = 'projectteam';
+ $lang->block->default['full']['my']['8']['source'] = 'project';
+ $lang->block->default['full']['my']['8']['grid'] = 8;
+}
$lang->block->default['full']['my']['9']['title'] = '项目列表';
$lang->block->default['full']['my']['9']['block'] = 'project';
@@ -351,7 +355,7 @@ $lang->block->modules['project']->availableBlocks = new stdclass();
$lang->block->modules['project']->availableBlocks->project = '项目列表';
$lang->block->modules['project']->availableBlocks->recentproject = '近期项目';
$lang->block->modules['project']->availableBlocks->statistic = '项目统计';
-$lang->block->modules['project']->availableBlocks->projectteam = '项目人力投入';
+if($config->systemMode == 'new') $lang->block->modules['project']->availableBlocks->projectteam = '项目人力投入';
$lang->block->modules['scrum']['index'] = new stdclass();
$lang->block->modules['scrum']['index']->availableBlocks = new stdclass();
diff --git a/module/block/view/recentprojectblock.html.php b/module/block/view/recentprojectblock.html.php
index 9ac8951879..db50e4619e 100644
--- a/module/block/view/recentprojectblock.html.php
+++ b/module/block/view/recentprojectblock.html.php
@@ -41,11 +41,13 @@
name);?>
+ systemMode == 'new'):?>
model === 'waterfall'): ?>
project->waterfall; ?>
project->scrum; ?>
+
+ systemMode == 'new'):?>
model === 'waterfall'): ?>
project->ongoingStage;?>
@@ -109,6 +112,7 @@
+
diff --git a/module/execution/lang/de.php b/module/execution/lang/de.php
index 071139edc1..5b8e661d3e 100644
--- a/module/execution/lang/de.php
+++ b/module/execution/lang/de.php
@@ -10,8 +10,6 @@
* @link http://www.zentao.net
*/
/* Fields. */
-$lang->executionCommon = $lang->executionCommon;
-$lang->execution->common = $lang->executionCommon;
$lang->execution->allExecutions = 'Alle';
$lang->execution->allExecutionAB = 'All Executions';
$lang->execution->id = $lang->executionCommon . ' ID';
diff --git a/module/execution/lang/en.php b/module/execution/lang/en.php
index d3e378bf0a..de995d3193 100644
--- a/module/execution/lang/en.php
+++ b/module/execution/lang/en.php
@@ -10,8 +10,6 @@
* @link http://www.zentao.net
*/
/* Fields. */
-$lang->executionCommon = $lang->executionCommon;
-$lang->execution->common = 'Execution';
$lang->execution->allExecutions = 'All ' . $lang->executionCommon . 's';
$lang->execution->allExecutionAB = 'All Executions';
$lang->execution->id = $lang->executionCommon . ' ID';
diff --git a/module/execution/lang/fr.php b/module/execution/lang/fr.php
index ff6bf241f4..1a7b3dc0f9 100644
--- a/module/execution/lang/fr.php
+++ b/module/execution/lang/fr.php
@@ -10,8 +10,6 @@
* @link https://www.zentao.pm
*/
/* Fields. */
-$lang->executionCommon = $lang->executionCommon;
-$lang->execution->common = $lang->executionCommon;
$lang->execution->allExecutions = 'Tous les ' . $lang->executionCommon . 's';
$lang->execution->allExecutionAB = 'All Executions';
$lang->execution->id = $lang->executionCommon . ' ID';
diff --git a/module/execution/lang/vi.php b/module/execution/lang/vi.php
index 53bc22f0cf..667c32b1cd 100644
--- a/module/execution/lang/vi.php
+++ b/module/execution/lang/vi.php
@@ -10,8 +10,6 @@
* @link http://www.zentao.net
*/
/* Fields. */
-$lang->executionCommon = $lang->executionCommon;
-$lang->execution->common = $lang->executionCommon;
$lang->execution->allExecutions = 'Tất cả ' . $lang->executionCommon;
$lang->execution->allExecutionAB = 'All Executions';
$lang->execution->id = 'ID '.$lang->executionCommon;
diff --git a/module/execution/lang/zh-cn.php b/module/execution/lang/zh-cn.php
index c7c591195a..63ef45675d 100644
--- a/module/execution/lang/zh-cn.php
+++ b/module/execution/lang/zh-cn.php
@@ -10,8 +10,6 @@
* @link http://www.zentao.net
*/
/* 字段列表。*/
-$lang->executionCommon = $lang->executionCommon;
-$lang->execution->common = '执行';
$lang->execution->allExecutions = '所有' . $lang->executionCommon;
$lang->execution->allExecutionAB = '所有执行';
$lang->execution->id = $lang->executionCommon . '编号';