From e7c8ceed8dff3fea774cd4b847745fd5c730f5ea Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Thu, 23 Feb 2023 10:10:11 +0800
Subject: [PATCH] * Modify dynamic language.

---
 module/action/lang/de.php              |  8 --------
 module/action/lang/en.php              |  8 --------
 module/action/lang/fr.php              |  8 --------
 module/action/lang/vi.php              |  8 --------
 module/action/lang/zh-cn.php           |  8 --------
 module/action/view/trash.html.php      |  2 +-
 module/common/lang/zh-cn.php           |  2 +-
 module/company/lang/de.php             |  8 ++++++++
 module/company/lang/en.php             |  8 ++++++++
 module/company/lang/fr.php             |  8 ++++++++
 module/company/lang/zh-cn.php          |  8 ++++++++
 module/company/view/dynamic.html.php   |  2 +-
 module/execution/lang/de.php           |  8 ++++++++
 module/execution/lang/en.php           |  8 ++++++++
 module/execution/lang/fr.php           |  8 ++++++++
 module/execution/lang/zh-cn.php        |  8 ++++++++
 module/execution/view/dynamic.html.php |  2 +-
 module/product/lang/de.php             |  8 ++++++++
 module/product/lang/en.php             |  8 ++++++++
 module/product/lang/fr.php             |  8 ++++++++
 module/product/lang/zh-cn.php          |  8 ++++++++
 module/product/view/dynamic.html.php   |  2 +-
 module/project/lang/de.php             |  8 ++++++++
 module/project/lang/en.php             |  8 ++++++++
 module/project/lang/fr.php             |  8 ++++++++
 module/project/lang/zh-cn.php          |  8 ++++++++
 module/project/view/dynamic.html.php   |  2 +-
 module/user/lang/de.php                | 24 ++++++++++++++++--------
 module/user/lang/en.php                | 24 ++++++++++++++++--------
 module/user/lang/fr.php                | 24 ++++++++++++++++--------
 module/user/lang/zh-cn.php             |  8 ++++++++
 module/user/view/dynamic.html.php      |  2 +-
 32 files changed, 191 insertions(+), 71 deletions(-)

diff --git a/module/action/lang/de.php b/module/action/lang/de.php
index a7a7f77f09..792a8c88b0 100644
--- a/module/action/lang/de.php
+++ b/module/action/lang/de.php
@@ -91,14 +91,6 @@ $lang->action->dynamic->all        = 'Alle';
 $lang->action->dynamic->hidden     = 'Versteckt';
 $lang->action->dynamic->search     = 'Suche';
 
-$lang->action->periods['all']       = $lang->action->dynamic->all;
-$lang->action->periods['today']     = $lang->action->dynamic->today;
-$lang->action->periods['yesterday'] = $lang->action->dynamic->yesterday;
-$lang->action->periods['thisweek']  = $lang->action->dynamic->thisWeek;
-$lang->action->periods['lastweek']  = $lang->action->dynamic->lastWeek;
-$lang->action->periods['thismonth'] = $lang->action->dynamic->thisMonth;
-$lang->action->periods['lastmonth'] = $lang->action->dynamic->lastMonth;
-
 $lang->action->objectTypes['product']          = $lang->productCommon;
 $lang->action->objectTypes['branch']           = 'Branch';
 $lang->action->objectTypes['story']            = $lang->SRCommon;
diff --git a/module/action/lang/en.php b/module/action/lang/en.php
index ff66717f78..4467cd45e0 100755
--- a/module/action/lang/en.php
+++ b/module/action/lang/en.php
@@ -91,14 +91,6 @@ $lang->action->dynamic->all        = 'All';
 $lang->action->dynamic->hidden     = 'Hidden';
 $lang->action->dynamic->search     = 'Search';
 
-$lang->action->periods['all']       = $lang->action->dynamic->all;
-$lang->action->periods['today']     = $lang->action->dynamic->today;
-$lang->action->periods['yesterday'] = $lang->action->dynamic->yesterday;
-$lang->action->periods['thisweek']  = $lang->action->dynamic->thisWeek;
-$lang->action->periods['lastweek']  = $lang->action->dynamic->lastWeek;
-$lang->action->periods['thismonth'] = $lang->action->dynamic->thisMonth;
-$lang->action->periods['lastmonth'] = $lang->action->dynamic->lastMonth;
-
 $lang->action->objectTypes['product']          = $lang->productCommon;
 $lang->action->objectTypes['branch']           = 'Branch';
 $lang->action->objectTypes['story']            = $lang->SRCommon;
diff --git a/module/action/lang/fr.php b/module/action/lang/fr.php
index 4418cc164a..70f3bf9d56 100644
--- a/module/action/lang/fr.php
+++ b/module/action/lang/fr.php
@@ -91,14 +91,6 @@ $lang->action->dynamic->all        = 'Tout';
 $lang->action->dynamic->hidden     = 'Caché';
 $lang->action->dynamic->search     = 'Rechercher';
 
-$lang->action->periods['all']       = $lang->action->dynamic->all;
-$lang->action->periods['today']     = $lang->action->dynamic->today;
-$lang->action->periods['yesterday'] = $lang->action->dynamic->yesterday;
-$lang->action->periods['thisweek']  = $lang->action->dynamic->thisWeek;
-$lang->action->periods['lastweek']  = $lang->action->dynamic->lastWeek;
-$lang->action->periods['thismonth'] = $lang->action->dynamic->thisMonth;
-$lang->action->periods['lastmonth'] = $lang->action->dynamic->lastMonth;
-
 $lang->action->objectTypes['product']          = $lang->productCommon;
 $lang->action->objectTypes['branch']           = 'Branche';
 $lang->action->objectTypes['story']            = $lang->SRCommon;
diff --git a/module/action/lang/vi.php b/module/action/lang/vi.php
index 5c9fb30f1e..32c4719635 100644
--- a/module/action/lang/vi.php
+++ b/module/action/lang/vi.php
@@ -60,14 +60,6 @@ $lang->action->dynamic->all        = 'Tất cả';
 $lang->action->dynamic->hidden     = 'Ẩn';
 $lang->action->dynamic->search     = 'Tìm kiếm';
 
-$lang->action->periods['all']       = $lang->action->dynamic->all;
-$lang->action->periods['today']     = $lang->action->dynamic->today;
-$lang->action->periods['yesterday'] = $lang->action->dynamic->yesterday;
-$lang->action->periods['thisweek']  = $lang->action->dynamic->thisWeek;
-$lang->action->periods['lastweek']  = $lang->action->dynamic->lastWeek;
-$lang->action->periods['thismonth'] = $lang->action->dynamic->thisMonth;
-$lang->action->periods['lastmonth'] = $lang->action->dynamic->lastMonth;
-
 $lang->action->objectTypes['product']          = $lang->productCommon;
 $lang->action->objectTypes['branch']           = 'Nhánh';
 $lang->action->objectTypes['story']            = $lang->SRCommon;
diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php
index 7a5cf3a901..b5e846f1be 100755
--- a/module/action/lang/zh-cn.php
+++ b/module/action/lang/zh-cn.php
@@ -91,14 +91,6 @@ $lang->action->dynamic->all        = '所有';
 $lang->action->dynamic->hidden     = '已隐藏';
 $lang->action->dynamic->search     = '搜索';
 
-$lang->action->periods['all']       = '全部';
-$lang->action->periods['today']     = $lang->action->dynamic->today;
-$lang->action->periods['yesterday'] = $lang->action->dynamic->yesterday;
-$lang->action->periods['thisweek']  = $lang->action->dynamic->thisWeek;
-$lang->action->periods['lastweek']  = $lang->action->dynamic->lastWeek;
-$lang->action->periods['thismonth'] = $lang->action->dynamic->thisMonth;
-$lang->action->periods['lastmonth'] = $lang->action->dynamic->lastMonth;
-
 $lang->action->objectTypes['product']          = $lang->productCommon;
 $lang->action->objectTypes['branch']           = '分支';
 $lang->action->objectTypes['story']            = $lang->SRCommon;
diff --git a/module/action/view/trash.html.php b/module/action/view/trash.html.php
index 2a43305edc..80ae3a9bff 100755
--- a/module/action/view/trash.html.php
+++ b/module/action/view/trash.html.php
@@ -14,7 +14,7 @@
 <div id='mainMenu' class='clearfix'>
   <div class='btn-toolbar pull-left'>
     <?php $activeClass = $currentObjectType == 'all' ? 'btn-active-text' : '';?>
-    <?php echo html::a($this->createLink('action', 'trash', "objectType=all&type=$type"), "<span class='text'>" . $lang->action->periods['all'] . "</span>", '', "class='btn btn-link $activeClass'");?>
+    <?php echo html::a($this->createLink('action', 'trash', "objectType=all&type=$type"), "<span class='text'>" . $lang->all . "</span>", '', "class='btn btn-link $activeClass'");?>
     <?php
     /* Output the objectType order by preferredTypeConfig. */
     foreach($preferredTypeConfig as $objectType)
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index 074c2c2e92..441beb5ecb 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -85,7 +85,7 @@ $lang->waterfallModel     = '瀑布模型';
 $lang->scrumModel         = '敏捷模型';
 $lang->agilePlusModel     = '融合敏捷模型';
 $lang->waterfallPlusModel = '融合瀑布模型';
-$lang->all                = '所有';
+$lang->all                = '全部';
 $lang->viewDetails        = '查看详情';
 
 $lang->actions         = '操作';
diff --git a/module/company/lang/de.php b/module/company/lang/de.php
index 0a05da3932..a32b2de3af 100644
--- a/module/company/lang/de.php
+++ b/module/company/lang/de.php
@@ -41,3 +41,11 @@ $lang->company->guestOptions[1] = 'Erlauben';
 
 $lang->company->order['date_desc'] = 'Descending';
 $lang->company->order['date_asc']  = 'Ascending';
+
+$lang->company->featureBar['dynamic']['all']       = 'All';
+$lang->company->featureBar['dynamic']['today']     = 'Today';
+$lang->company->featureBar['dynamic']['yesterday'] = 'Yesterday';
+$lang->company->featureBar['dynamic']['thisWeek']  = 'This Week';
+$lang->company->featureBar['dynamic']['lastWeek']  = 'Last Week';
+$lang->company->featureBar['dynamic']['thisMonth'] = 'This Month';
+$lang->company->featureBar['dynamic']['lastMonth'] = 'Last Month';
diff --git a/module/company/lang/en.php b/module/company/lang/en.php
index bc34d4e497..dc931405c0 100644
--- a/module/company/lang/en.php
+++ b/module/company/lang/en.php
@@ -41,3 +41,11 @@ $lang->company->guestOptions[1] = 'Allow';
 
 $lang->company->order['date_desc'] = 'Descending';
 $lang->company->order['date_asc']  = 'Ascending';
+
+$lang->company->featureBar['dynamic']['all']       = 'All';
+$lang->company->featureBar['dynamic']['today']     = 'Today';
+$lang->company->featureBar['dynamic']['yesterday'] = 'Yesterday';
+$lang->company->featureBar['dynamic']['thisWeek']  = 'This Week';
+$lang->company->featureBar['dynamic']['lastWeek']  = 'Last Week';
+$lang->company->featureBar['dynamic']['thisMonth'] = 'This Month';
+$lang->company->featureBar['dynamic']['lastMonth'] = 'Last Month';
diff --git a/module/company/lang/fr.php b/module/company/lang/fr.php
index 01ec0bd1b1..772fc4490a 100644
--- a/module/company/lang/fr.php
+++ b/module/company/lang/fr.php
@@ -41,3 +41,11 @@ $lang->company->guestOptions[1] = 'Autorisée';
 
 $lang->company->order['date_desc'] = 'Descending';
 $lang->company->order['date_asc']  = 'Ascending';
+
+$lang->company->featureBar['dynamic']['all']       = 'All';
+$lang->company->featureBar['dynamic']['today']     = 'Today';
+$lang->company->featureBar['dynamic']['yesterday'] = 'Yesterday';
+$lang->company->featureBar['dynamic']['thisWeek']  = 'This Week';
+$lang->company->featureBar['dynamic']['lastWeek']  = 'Last Week';
+$lang->company->featureBar['dynamic']['thisMonth'] = 'This Month';
+$lang->company->featureBar['dynamic']['lastMonth'] = 'Last Month';
diff --git a/module/company/lang/zh-cn.php b/module/company/lang/zh-cn.php
index 4b983c646e..5ae22d14df 100644
--- a/module/company/lang/zh-cn.php
+++ b/module/company/lang/zh-cn.php
@@ -41,3 +41,11 @@ $lang->company->guestOptions[1] = '允许';
 
 $lang->company->order['date_desc'] = '倒序排列';
 $lang->company->order['date_asc']  = '正序排列';
+
+$lang->company->featureBar['dynamic']['all']       = '全部';
+$lang->company->featureBar['dynamic']['today']     = '今天';
+$lang->company->featureBar['dynamic']['yesterday'] = '昨天';
+$lang->company->featureBar['dynamic']['thisWeek']  = '本周';
+$lang->company->featureBar['dynamic']['lastWeek']  = '上周';
+$lang->company->featureBar['dynamic']['thisMonth'] = '本月';
+$lang->company->featureBar['dynamic']['lastMonth'] = '上月';
diff --git a/module/company/view/dynamic.html.php b/module/company/view/dynamic.html.php
index 6dcbf49141..b3e4814405 100644
--- a/module/company/view/dynamic.html.php
+++ b/module/company/view/dynamic.html.php
@@ -14,7 +14,7 @@
 <?php js::set('browseType', $browseType);?>
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">
-    <?php foreach($lang->action->periods as $period => $label):?>
+    <?php foreach($lang->company->featureBar['dynamic'] as $period => $label):?>
     <?php
     $label  = "<span class='text'>$label</span>";
     $active = '';
diff --git a/module/execution/lang/de.php b/module/execution/lang/de.php
index aacc1a5dba..bd82bb3ddc 100644
--- a/module/execution/lang/de.php
+++ b/module/execution/lang/de.php
@@ -639,3 +639,11 @@ $lang->execution->boardColorList = array('#32C5FF', '#006AF1', '#9D28B2', '#FF8F
 
 $lang->execution->linkBranchStoryByPlanTips = "When a scheduled association requirement is executed, only the active requirements associated with the %s of this execution are imported.";
 $lang->execution->linkNormalStoryByPlanTips = "Only the active requirements are imported when the scheduled requirements are associated.";
+
+$lang->execution->featureBar['dynamic']['all']       = 'All';
+$lang->execution->featureBar['dynamic']['today']     = 'Today';
+$lang->execution->featureBar['dynamic']['yesterday'] = 'Yesterday';
+$lang->execution->featureBar['dynamic']['thisWeek']  = 'This Week';
+$lang->execution->featureBar['dynamic']['lastWeek']  = 'Last Week';
+$lang->execution->featureBar['dynamic']['thisMonth'] = 'This Month';
+$lang->execution->featureBar['dynamic']['lastMonth'] = 'Last Month';
diff --git a/module/execution/lang/en.php b/module/execution/lang/en.php
index d8f522124d..2327a58fd0 100644
--- a/module/execution/lang/en.php
+++ b/module/execution/lang/en.php
@@ -639,3 +639,11 @@ $lang->execution->boardColorList = array('#32C5FF', '#006AF1', '#9D28B2', '#FF8F
 
 $lang->execution->linkBranchStoryByPlanTips = "When a scheduled association requirement is executed, only the active requirements associated with the %s of this execution are imported.";
 $lang->execution->linkNormalStoryByPlanTips = "Only the active requirements are imported when the scheduled requirements are associated.";
+
+$lang->execution->featureBar['dynamic']['all']       = 'All';
+$lang->execution->featureBar['dynamic']['today']     = 'Today';
+$lang->execution->featureBar['dynamic']['yesterday'] = 'Yesterday';
+$lang->execution->featureBar['dynamic']['thisWeek']  = 'This Week';
+$lang->execution->featureBar['dynamic']['lastWeek']  = 'Last Week';
+$lang->execution->featureBar['dynamic']['thisMonth'] = 'This Month';
+$lang->execution->featureBar['dynamic']['lastMonth'] = 'Last Month';
diff --git a/module/execution/lang/fr.php b/module/execution/lang/fr.php
index 46f9661aa7..0ea5357ac4 100644
--- a/module/execution/lang/fr.php
+++ b/module/execution/lang/fr.php
@@ -639,3 +639,11 @@ $lang->execution->boardColorList = array('#32C5FF', '#006AF1', '#9D28B2', '#FF8F
 
 $lang->execution->linkBranchStoryByPlanTips = "When a scheduled association requirement is executed, only the active requirements associated with the %s of this execution are imported.";
 $lang->execution->linkNormalStoryByPlanTips = "Only the active requirements are imported when the scheduled requirements are associated.";
+
+$lang->execution->featureBar['dynamic']['all']       = 'All';
+$lang->execution->featureBar['dynamic']['today']     = 'Today';
+$lang->execution->featureBar['dynamic']['yesterday'] = 'Yesterday';
+$lang->execution->featureBar['dynamic']['thisWeek']  = 'This Week';
+$lang->execution->featureBar['dynamic']['lastWeek']  = 'Last Week';
+$lang->execution->featureBar['dynamic']['thisMonth'] = 'This Month';
+$lang->execution->featureBar['dynamic']['lastMonth'] = 'Last Month';
diff --git a/module/execution/lang/zh-cn.php b/module/execution/lang/zh-cn.php
index 211e47444a..1e57527c1c 100644
--- a/module/execution/lang/zh-cn.php
+++ b/module/execution/lang/zh-cn.php
@@ -639,3 +639,11 @@ $lang->execution->boardColorList = array('#32C5FF', '#006AF1', '#9D28B2', '#FF8F
 
 $lang->execution->linkBranchStoryByPlanTips = "执行按计划关联需求时，只导入本执行所关联%s的激活状态的需求。";
 $lang->execution->linkNormalStoryByPlanTips = "执行按计划关联需求时，只导入激活状态的需求。";
+
+$lang->execution->featureBar['dynamic']['all']       = '全部';
+$lang->execution->featureBar['dynamic']['today']     = '今天';
+$lang->execution->featureBar['dynamic']['yesterday'] = '昨天';
+$lang->execution->featureBar['dynamic']['thisWeek']  = '本周';
+$lang->execution->featureBar['dynamic']['lastWeek']  = '上周';
+$lang->execution->featureBar['dynamic']['thisMonth'] = '本月';
+$lang->execution->featureBar['dynamic']['lastMonth'] = '上月';
diff --git a/module/execution/view/dynamic.html.php b/module/execution/view/dynamic.html.php
index d6f3b0c313..f6e4cec4cd 100755
--- a/module/execution/view/dynamic.html.php
+++ b/module/execution/view/dynamic.html.php
@@ -13,7 +13,7 @@
 <?php include '../../common/view/header.html.php';?>
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">
-    <?php foreach($lang->action->periods as $period => $label):?>
+    <?php foreach($lang->execution->featureBar['dynamic'] as $period => $label):?>
     <?php
     $label  = "<span class='text'>$label</span>";
     $active = '';
diff --git a/module/product/lang/de.php b/module/product/lang/de.php
index a37f0971e3..d6ca40aefc 100644
--- a/module/product/lang/de.php
+++ b/module/product/lang/de.php
@@ -241,3 +241,11 @@ $lang->product->moreSelects['changingstory']  = $lang->product->changingStory;
 $lang->product->moreSelects['reviewingstory'] = $lang->product->reviewingStory;
 $lang->product->moreSelects['willclose']      = $lang->product->willClose;
 $lang->product->moreSelects['closedstory']    = $lang->product->closedStory;
+
+$lang->product->featureBar['dynamic']['all']       = 'All';
+$lang->product->featureBar['dynamic']['today']     = 'Today';
+$lang->product->featureBar['dynamic']['yesterday'] = 'Yesterday';
+$lang->product->featureBar['dynamic']['thisWeek']  = 'This Week';
+$lang->product->featureBar['dynamic']['lastWeek']  = 'Last Week';
+$lang->product->featureBar['dynamic']['thisMonth'] = 'This Month';
+$lang->product->featureBar['dynamic']['lastMonth'] = 'Last Month';
diff --git a/module/product/lang/en.php b/module/product/lang/en.php
index 1b5c115b31..cd0e20087a 100644
--- a/module/product/lang/en.php
+++ b/module/product/lang/en.php
@@ -241,3 +241,11 @@ $lang->product->moreSelects['changingstory']  = $lang->product->changingStory;
 $lang->product->moreSelects['reviewingstory'] = $lang->product->reviewingStory;
 $lang->product->moreSelects['willclose']      = $lang->product->willClose;
 $lang->product->moreSelects['closedstory']    = $lang->product->closedStory;
+
+$lang->product->featureBar['dynamic']['all']       = 'All';
+$lang->product->featureBar['dynamic']['today']     = 'Today';
+$lang->product->featureBar['dynamic']['yesterday'] = 'Yesterday';
+$lang->product->featureBar['dynamic']['thisWeek']  = 'This Week';
+$lang->product->featureBar['dynamic']['lastWeek']  = 'Last Week';
+$lang->product->featureBar['dynamic']['thisMonth'] = 'This Month';
+$lang->product->featureBar['dynamic']['lastMonth'] = 'Last Month';
diff --git a/module/product/lang/fr.php b/module/product/lang/fr.php
index 3624cc9632..c724f9fd4b 100644
--- a/module/product/lang/fr.php
+++ b/module/product/lang/fr.php
@@ -241,3 +241,11 @@ $lang->product->moreSelects['changingstory']  = $lang->product->changingStory;
 $lang->product->moreSelects['reviewingstory'] = $lang->product->reviewingStory;
 $lang->product->moreSelects['willclose']      = $lang->product->willClose;
 $lang->product->moreSelects['closedstory']    = $lang->product->closedStory;
+
+$lang->product->featureBar['dynamic']['all']       = 'All';
+$lang->product->featureBar['dynamic']['today']     = 'Today';
+$lang->product->featureBar['dynamic']['yesterday'] = 'Yesterday';
+$lang->product->featureBar['dynamic']['thisWeek']  = 'This Week';
+$lang->product->featureBar['dynamic']['lastWeek']  = 'Last Week';
+$lang->product->featureBar['dynamic']['thisMonth'] = 'This Month';
+$lang->product->featureBar['dynamic']['lastMonth'] = 'Last Month';
diff --git a/module/product/lang/zh-cn.php b/module/product/lang/zh-cn.php
index 939402533b..d0d2d481c1 100644
--- a/module/product/lang/zh-cn.php
+++ b/module/product/lang/zh-cn.php
@@ -241,3 +241,11 @@ $lang->product->moreSelects['changingstory']  = $lang->product->changingStory;
 $lang->product->moreSelects['reviewingstory'] = $lang->product->reviewingStory;
 $lang->product->moreSelects['willclose']      = $lang->product->willClose;
 $lang->product->moreSelects['closedstory']    = $lang->product->closedStory;
+
+$lang->product->featureBar['dynamic']['all']       = '全部';
+$lang->product->featureBar['dynamic']['today']     = '今天';
+$lang->product->featureBar['dynamic']['yesterday'] = '昨天';
+$lang->product->featureBar['dynamic']['thisWeek']  = '本周';
+$lang->product->featureBar['dynamic']['lastWeek']  = '上周';
+$lang->product->featureBar['dynamic']['thisMonth'] = '本月';
+$lang->product->featureBar['dynamic']['lastMonth'] = '上月';
diff --git a/module/product/view/dynamic.html.php b/module/product/view/dynamic.html.php
index 94a906ab33..e223ed6cb3 100755
--- a/module/product/view/dynamic.html.php
+++ b/module/product/view/dynamic.html.php
@@ -13,7 +13,7 @@
 <?php include '../../common/view/header.html.php';?>
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">
-    <?php foreach($lang->action->periods as $period => $label):?>
+    <?php foreach($lang->product->featureBar['dynamic'] as $period => $label):?>
     <?php
     $label  = "<span class='text'>$label</span>";
     $active = '';
diff --git a/module/project/lang/de.php b/module/project/lang/de.php
index a8b0031af4..64d48a7097 100644
--- a/module/project/lang/de.php
+++ b/module/project/lang/de.php
@@ -411,3 +411,11 @@ $lang->project->copyProject->daysTips           = '『Available working days』S
 $lang->project->linkBranchStoryByPlanTips = "When the project is scheduled to associate requirements, only the activated requirements associated with the %s of the project are imported.";
 $lang->project->linkNormalStoryByPlanTips = "When the project plans to associate requirements, only the requirements that are active are imported.";
 $lang->project->cannotManageProducts      = "This project is a project-type project and cannot be associated with products.";
+
+$lang->project->featureBar['dynamic']['all']       = 'All';
+$lang->project->featureBar['dynamic']['today']     = 'Today';
+$lang->project->featureBar['dynamic']['yesterday'] = 'Yesterday';
+$lang->project->featureBar['dynamic']['thisWeek']  = 'This Week';
+$lang->project->featureBar['dynamic']['lastWeek']  = 'Last Week';
+$lang->project->featureBar['dynamic']['thisMonth'] = 'This Month';
+$lang->project->featureBar['dynamic']['lastMonth'] = 'Last Month';
diff --git a/module/project/lang/en.php b/module/project/lang/en.php
index 28816c3a44..33a03508c7 100644
--- a/module/project/lang/en.php
+++ b/module/project/lang/en.php
@@ -411,3 +411,11 @@ $lang->project->copyProject->daysTips           = '『Available working days』S
 $lang->project->linkBranchStoryByPlanTips = "When the project is scheduled to associate requirements, only the activated requirements associated with the %s of the project are imported.";
 $lang->project->linkNormalStoryByPlanTips = "When the project plans to associate requirements, only the requirements that are active are imported.";
 $lang->project->cannotManageProducts      = "This project is a project-type project and cannot be associated with products.";
+
+$lang->project->featureBar['dynamic']['all']       = 'All';
+$lang->project->featureBar['dynamic']['today']     = 'Today';
+$lang->project->featureBar['dynamic']['yesterday'] = 'Yesterday';
+$lang->project->featureBar['dynamic']['thisWeek']  = 'This Week';
+$lang->project->featureBar['dynamic']['lastWeek']  = 'Last Week';
+$lang->project->featureBar['dynamic']['thisMonth'] = 'This Month';
+$lang->project->featureBar['dynamic']['lastMonth'] = 'Last Month';
diff --git a/module/project/lang/fr.php b/module/project/lang/fr.php
index 617331dfd5..9526c1929d 100644
--- a/module/project/lang/fr.php
+++ b/module/project/lang/fr.php
@@ -411,3 +411,11 @@ $lang->project->copyProject->daysTips           = '『Available working days』S
 $lang->project->linkBranchStoryByPlanTips = "When the project is scheduled to associate requirements, only the activated requirements associated with the %s of the project are imported.";
 $lang->project->linkNormalStoryByPlanTips = "When the project plans to associate requirements, only the requirements that are active are imported.";
 $lang->project->cannotManageProducts      = "This project is a project-type project and cannot be associated with products.";
+
+$lang->project->featureBar['dynamic']['all']       = 'All';
+$lang->project->featureBar['dynamic']['today']     = 'Today';
+$lang->project->featureBar['dynamic']['yesterday'] = 'Yesterday';
+$lang->project->featureBar['dynamic']['thisWeek']  = 'This Week';
+$lang->project->featureBar['dynamic']['lastWeek']  = 'Last Week';
+$lang->project->featureBar['dynamic']['thisMonth'] = 'This Month';
+$lang->project->featureBar['dynamic']['lastMonth'] = 'Last Month';
diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php
index 47a1447149..fe0f6ff9c8 100644
--- a/module/project/lang/zh-cn.php
+++ b/module/project/lang/zh-cn.php
@@ -412,3 +412,11 @@ $lang->project->linkBranchStoryByPlanTips = "项目按计划关联需求时，
 $lang->project->linkNormalStoryByPlanTips = "项目按计划关联需求时，只导入激活状态的需求。";
 
 $lang->project->cannotManageProducts = "该项目为项目型项目，不能关联产品。";
+
+$lang->project->featureBar['dynamic']['all']       = '全部';
+$lang->project->featureBar['dynamic']['today']     = '今天';
+$lang->project->featureBar['dynamic']['yesterday'] = '昨天';
+$lang->project->featureBar['dynamic']['thisWeek']  = '本周';
+$lang->project->featureBar['dynamic']['lastWeek']  = '上周';
+$lang->project->featureBar['dynamic']['thisMonth'] = '本月';
+$lang->project->featureBar['dynamic']['lastMonth'] = '上月';
diff --git a/module/project/view/dynamic.html.php b/module/project/view/dynamic.html.php
index 6a6842cd5d..cd200d8375 100755
--- a/module/project/view/dynamic.html.php
+++ b/module/project/view/dynamic.html.php
@@ -13,7 +13,7 @@
 <?php include '../../common/view/header.html.php';?>
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">
-    <?php foreach($lang->action->periods as $period => $label):?>
+    <?php foreach($lang->project->featureBar['dynamic'] as $period => $label):?>
     <?php
     $label  = "<span class='text'>$label</span>";
     $active = '';
diff --git a/module/user/lang/de.php b/module/user/lang/de.php
index caeb58dcc0..9ecf3de871 100644
--- a/module/user/lang/de.php
+++ b/module/user/lang/de.php
@@ -323,11 +323,19 @@ $lang->user->jumping = "This page will redirect to the previous page in <span id
 $lang->user->zentaoapp = new stdclass();
 $lang->user->zentaoapp->logout = 'Logout';
 
-$lang->my->featureBar['todo']['all']             = 'Assigned To Yourself';
-$lang->my->featureBar['todo']['before']          = 'Unfinished';
-$lang->my->featureBar['todo']['future']          = 'TBD';
-$lang->my->featureBar['todo']['thisWeek']        = 'This Week';
-$lang->my->featureBar['todo']['thisMonth']       = 'This Month';
-$lang->my->featureBar['todo']['thisYear']        = 'This Year';
-$lang->my->featureBar['todo']['assignedToOther'] = 'Assigned To Other';
-$lang->my->featureBar['todo']['cycle']           = 'Recurrence';
+$lang->user->featureBar['todo']['all']             = 'Assigned To Yourself';
+$lang->user->featureBar['todo']['before']          = 'Unfinished';
+$lang->user->featureBar['todo']['future']          = 'TBD';
+$lang->user->featureBar['todo']['thisWeek']        = 'This Week';
+$lang->user->featureBar['todo']['thisMonth']       = 'This Month';
+$lang->user->featureBar['todo']['thisYear']        = 'This Year';
+$lang->user->featureBar['todo']['assignedToOther'] = 'Assigned To Other';
+$lang->user->featureBar['todo']['cycle']           = 'Recurrence';
+
+$lang->user->featureBar['dynamic']['all']       = 'All';
+$lang->user->featureBar['dynamic']['today']     = 'Today';
+$lang->user->featureBar['dynamic']['yesterday'] = 'Yesterday';
+$lang->user->featureBar['dynamic']['thisWeek']  = 'This Week';
+$lang->user->featureBar['dynamic']['lastWeek']  = 'Last Week';
+$lang->user->featureBar['dynamic']['thisMonth'] = 'This Month';
+$lang->user->featureBar['dynamic']['lastMonth'] = 'Last Month';
diff --git a/module/user/lang/en.php b/module/user/lang/en.php
index d1f3cecfeb..62d6e01533 100644
--- a/module/user/lang/en.php
+++ b/module/user/lang/en.php
@@ -323,11 +323,19 @@ $lang->user->jumping = "This page will redirect to the previous page in <span id
 $lang->user->zentaoapp = new stdclass();
 $lang->user->zentaoapp->logout = 'Logout';
 
-$lang->my->featureBar['todo']['all']             = 'Assigned To Yourself';
-$lang->my->featureBar['todo']['before']          = 'Unfinished';
-$lang->my->featureBar['todo']['future']          = 'TBD';
-$lang->my->featureBar['todo']['thisWeek']        = 'This Week';
-$lang->my->featureBar['todo']['thisMonth']       = 'This Month';
-$lang->my->featureBar['todo']['thisYear']        = 'This Year';
-$lang->my->featureBar['todo']['assignedToOther'] = 'Assigned To Other';
-$lang->my->featureBar['todo']['cycle']           = 'Recurrence';
+$lang->user->featureBar['todo']['all']             = 'Assigned To Yourself';
+$lang->user->featureBar['todo']['before']          = 'Unfinished';
+$lang->user->featureBar['todo']['future']          = 'TBD';
+$lang->user->featureBar['todo']['thisWeek']        = 'This Week';
+$lang->user->featureBar['todo']['thisMonth']       = 'This Month';
+$lang->user->featureBar['todo']['thisYear']        = 'This Year';
+$lang->user->featureBar['todo']['assignedToOther'] = 'Assigned To Other';
+$lang->user->featureBar['todo']['cycle']           = 'Recurrence';
+
+$lang->user->featureBar['dynamic']['all']       = 'All';
+$lang->user->featureBar['dynamic']['today']     = 'Today';
+$lang->user->featureBar['dynamic']['yesterday'] = 'Yesterday';
+$lang->user->featureBar['dynamic']['thisWeek']  = 'This Week';
+$lang->user->featureBar['dynamic']['lastWeek']  = 'Last Week';
+$lang->user->featureBar['dynamic']['thisMonth'] = 'This Month';
+$lang->user->featureBar['dynamic']['lastMonth'] = 'Last Month';
diff --git a/module/user/lang/fr.php b/module/user/lang/fr.php
index 208d0d6cfb..06d2ceb2c3 100644
--- a/module/user/lang/fr.php
+++ b/module/user/lang/fr.php
@@ -323,11 +323,19 @@ $lang->user->jumping = "This page will redirect to the previous page in <span id
 $lang->user->zentaoapp = new stdclass();
 $lang->user->zentaoapp->logout = 'Logout';
 
-$lang->my->featureBar['todo']['all']             = 'Assigned To Yourself';
-$lang->my->featureBar['todo']['before']          = 'Unfinished';
-$lang->my->featureBar['todo']['future']          = 'TBD';
-$lang->my->featureBar['todo']['thisWeek']        = 'This Week';
-$lang->my->featureBar['todo']['thisMonth']       = 'This Month';
-$lang->my->featureBar['todo']['thisYear']        = 'This Year';
-$lang->my->featureBar['todo']['assignedToOther'] = 'Assigned To Other';
-$lang->my->featureBar['todo']['cycle']           = 'Recurrence';
+$lang->user->featureBar['todo']['all']             = 'Assigned To Yourself';
+$lang->user->featureBar['todo']['before']          = 'Unfinished';
+$lang->user->featureBar['todo']['future']          = 'TBD';
+$lang->user->featureBar['todo']['thisWeek']        = 'This Week';
+$lang->user->featureBar['todo']['thisMonth']       = 'This Month';
+$lang->user->featureBar['todo']['thisYear']        = 'This Year';
+$lang->user->featureBar['todo']['assignedToOther'] = 'Assigned To Other';
+$lang->user->featureBar['todo']['cycle']           = 'Recurrence';
+
+$lang->user->featureBar['dynamic']['all']       = 'All';
+$lang->user->featureBar['dynamic']['today']     = 'Today';
+$lang->user->featureBar['dynamic']['yesterday'] = 'Yesterday';
+$lang->user->featureBar['dynamic']['thisWeek']  = 'This Week';
+$lang->user->featureBar['dynamic']['lastWeek']  = 'Last Week';
+$lang->user->featureBar['dynamic']['thisMonth'] = 'This Month';
+$lang->user->featureBar['dynamic']['lastMonth'] = 'Last Month';
diff --git a/module/user/lang/zh-cn.php b/module/user/lang/zh-cn.php
index cda3ddb925..fb0019e05a 100644
--- a/module/user/lang/zh-cn.php
+++ b/module/user/lang/zh-cn.php
@@ -331,3 +331,11 @@ $lang->user->featureBar['todo']['thisMonth']       = '本月';
 $lang->user->featureBar['todo']['thisYear']        = '本年';
 $lang->user->featureBar['todo']['assignedToOther'] = '指派他人';
 $lang->user->featureBar['todo']['cycle']           = '周期';
+
+$lang->user->featureBar['dynamic']['all']       = '全部';
+$lang->user->featureBar['dynamic']['today']     = '今天';
+$lang->user->featureBar['dynamic']['yesterday'] = '昨天';
+$lang->user->featureBar['dynamic']['thisWeek']  = '本周';
+$lang->user->featureBar['dynamic']['lastWeek']  = '上周';
+$lang->user->featureBar['dynamic']['thisMonth'] = '本月';
+$lang->user->featureBar['dynamic']['lastMonth'] = '上月';
diff --git a/module/user/view/dynamic.html.php b/module/user/view/dynamic.html.php
index c73393095c..c4a5c9f744 100644
--- a/module/user/view/dynamic.html.php
+++ b/module/user/view/dynamic.html.php
@@ -16,7 +16,7 @@
 <?php js::set('period', $type);?>
 <div id='mainContent'>
   <div id='contentNav'>
-    <?php foreach($lang->action->periods as $period => $label):?>
+    <?php foreach($lang->user->featureBar['dynamic'] as $period => $label):?>
     <?php
     $label  = "<span class='text'>$label</span>";
     $active = '';