From fe465ed8d64d6e9108dff30ebc7c1d6d4bcfc48c Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Thu, 30 May 2019 15:01:38 +0800
Subject: [PATCH] * Finish task #5610.

---
 module/action/lang/en.php            | 124 +++++++++++++--------------
 module/company/view/dynamic.html.php |   2 +-
 module/product/view/dynamic.html.php |   2 +-
 module/project/view/dynamic.html.php |   2 +-
 4 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/module/action/lang/en.php b/module/action/lang/en.php
index f567c4c738..28e2cfa23f 100755
--- a/module/action/lang/en.php
+++ b/module/action/lang/en.php
@@ -143,71 +143,71 @@ $lang->action->desc->unlinkrelatedcase = '$date, <strong>$actor</strong> unlinke
 
 /* 用来显示动态信息。*/
 $lang->action->label = new stdclass();
-$lang->action->label->created             = 'created ';
-$lang->action->label->opened              = 'opened ';
-$lang->action->label->changed             = 'changed ';
-$lang->action->label->edited              = 'edited ';
-$lang->action->label->assigned            = 'assigned ';
-$lang->action->label->closed              = 'closed ';
-$lang->action->label->deleted             = 'deleted ';
-$lang->action->label->deletedfile         = 'deleted ';
-$lang->action->label->editfile            = 'edit ';
-$lang->action->label->erased              = 'erased ';
-$lang->action->label->undeleted           = 'restored ';
-$lang->action->label->hidden              = 'hid ';
-$lang->action->label->commented           = 'commented ';
-$lang->action->label->activated           = 'activated ';
-$lang->action->label->blocked             = 'blocked ';
-$lang->action->label->resolved            = 'solved ';
-$lang->action->label->reviewed            = 'reviewed ';
-$lang->action->label->moved               = 'moved ';
-$lang->action->label->confirmed           = 'confirmed Story';
-$lang->action->label->bugconfirmed        = 'confirmed';
-$lang->action->label->tostory             = 'converted to Story';
+$lang->action->label->created             = 'Created ';
+$lang->action->label->opened              = 'Opened ';
+$lang->action->label->changed             = 'Changed ';
+$lang->action->label->edited              = 'Edited ';
+$lang->action->label->assigned            = 'Assigned ';
+$lang->action->label->closed              = 'Closed ';
+$lang->action->label->deleted             = 'Deleted ';
+$lang->action->label->deletedfile         = 'Deleted ';
+$lang->action->label->editfile            = 'Edit ';
+$lang->action->label->erased              = 'Erased ';
+$lang->action->label->undeleted           = 'Restored ';
+$lang->action->label->hidden              = 'Hid ';
+$lang->action->label->commented           = 'Commented ';
+$lang->action->label->activated           = 'Activated ';
+$lang->action->label->blocked             = 'Blocked ';
+$lang->action->label->resolved            = 'Solved ';
+$lang->action->label->reviewed            = 'Reviewed ';
+$lang->action->label->moved               = 'Moved ';
+$lang->action->label->confirmed           = 'Confirmed story';
+$lang->action->label->bugconfirmed        = 'Confirmed';
+$lang->action->label->tostory             = 'Converted to Story';
 $lang->action->label->frombug             = 'Converted from Bug';
-$lang->action->label->fromlib             = 'imported from Library';
-$lang->action->label->totask              = 'converted to Task';
+$lang->action->label->fromlib             = 'Imported from Library';
+$lang->action->label->totask              = 'Converted to Task';
 $lang->action->label->svncommited         = 'SVN committed';
 $lang->action->label->gitcommited         = 'Git committed';
-$lang->action->label->linked2plan         = 'linked to Plan';
-$lang->action->label->unlinkedfromplan    = 'unlinked from';
-$lang->action->label->changestatus        = 'changed Status';
-$lang->action->label->marked              = 'marked';
-$lang->action->label->linked2project      = "link {$lang->projectCommon}";
-$lang->action->label->unlinkedfromproject = "unlink {$lang->projectCommon}";
-$lang->action->label->unlinkedfrombuild   = "unlink Build";
-$lang->action->label->linked2release      = "link Release";
-$lang->action->label->unlinkedfromrelease = "unlink Release";
-$lang->action->label->linkrelatedbug      = "linked Bug";
-$lang->action->label->unlinkrelatedbug    = "unlinked Bug";
-$lang->action->label->linkrelatedcase     = "linked Case";
-$lang->action->label->unlinkrelatedcase   = "unlinked Case";
-$lang->action->label->linkrelatedstory    = "linked Story";
-$lang->action->label->unlinkrelatedstory  = "unlinked Story";
-$lang->action->label->subdividestory      = "decomposed Story";
-$lang->action->label->unlinkchildstory    = "unlinked Story";
-$lang->action->label->started             = 'started ';
-$lang->action->label->restarted           = 'continued ';
-$lang->action->label->recordestimate      = 'recorded ';
-$lang->action->label->editestimate        = 'edited ';
-$lang->action->label->canceled            = 'cancelled ';
-$lang->action->label->finished            = 'finished ';
-$lang->action->label->paused              = 'paused ';
-$lang->action->label->verified            = 'verified ';
-$lang->action->label->delayed             = 'delayed ';
-$lang->action->label->suspended           = 'suspended ';
-$lang->action->label->login               = 'log in';
-$lang->action->label->logout              = "log out";
-$lang->action->label->deleteestimate      = "deleted ";
-$lang->action->label->linked2build        = "linked ";
-$lang->action->label->linked2bug          = "linked ";
-$lang->action->label->linkchildtask       = "linked a child task";
-$lang->action->label->unlinkchildrentask  = "unlinked a child task";
-$lang->action->label->linkparenttask      = "linked a parent task";
-$lang->action->label->unlinkparenttask    = "unlink from parent task";
-$lang->action->label->batchcreate         = "batch created tasks";
-$lang->action->label->createchildren      = "create children task";
-$lang->action->label->managed             = "managed";
+$lang->action->label->linked2plan         = 'Linked to Plan';
+$lang->action->label->unlinkedfromplan    = 'Unlinked from';
+$lang->action->label->changestatus        = 'Changed Status';
+$lang->action->label->marked              = 'Marked';
+$lang->action->label->linked2project      = "Link {$lang->projectCommon}";
+$lang->action->label->unlinkedfromproject = "Unlink {$lang->projectCommon}";
+$lang->action->label->unlinkedfrombuild   = "Unlink Build";
+$lang->action->label->linked2release      = "Link Release";
+$lang->action->label->unlinkedfromrelease = "Unlink Release";
+$lang->action->label->linkrelatedbug      = "Linked Bug";
+$lang->action->label->unlinkrelatedbug    = "Unlinked Bug";
+$lang->action->label->linkrelatedcase     = "Linked Case";
+$lang->action->label->unlinkrelatedcase   = "Unlinked Case";
+$lang->action->label->linkrelatedstory    = "Linked Story";
+$lang->action->label->unlinkrelatedstory  = "Unlinked Story";
+$lang->action->label->subdividestory      = "Decomposed Story";
+$lang->action->label->unlinkchildstory    = "Unlinked Story";
+$lang->action->label->started             = 'Started ';
+$lang->action->label->restarted           = 'Continued ';
+$lang->action->label->recordestimate      = 'Recorded ';
+$lang->action->label->editestimate        = 'Edited ';
+$lang->action->label->canceled            = 'Cancelled ';
+$lang->action->label->finished            = 'Finished ';
+$lang->action->label->paused              = 'Paused ';
+$lang->action->label->verified            = 'Verified ';
+$lang->action->label->delayed             = 'Delayed ';
+$lang->action->label->suspended           = 'Suspended ';
+$lang->action->label->login               = 'Log in';
+$lang->action->label->logout              = "Log out";
+$lang->action->label->deleteestimate      = "Deleted ";
+$lang->action->label->linked2build        = "Linked ";
+$lang->action->label->linked2bug          = "Linked ";
+$lang->action->label->linkchildtask       = "Linked a child task";
+$lang->action->label->unlinkchildrentask  = "Unlinked a child task";
+$lang->action->label->linkparenttask      = "Linked a parent task";
+$lang->action->label->unlinkparenttask    = "Unlink from parent task";
+$lang->action->label->batchcreate         = "Batch created tasks";
+$lang->action->label->createchildren      = "Create children task";
+$lang->action->label->managed             = "Managed";
 
 /* 动态信息按照对象分组 */
 $lang->action->dynamicAction = new stdclass;
diff --git a/module/company/view/dynamic.html.php b/module/company/view/dynamic.html.php
index 6ab0150ea0..f238796696 100644
--- a/module/company/view/dynamic.html.php
+++ b/module/company/view/dynamic.html.php
@@ -67,7 +67,7 @@
             <span class="timeline-text">
               <?php echo zget($users, $action->actor) . ' ' . $action->actionLabel;?>
               <?php if($action->action != 'login' and $action->action != 'logout'):?>
-              <span class="text-muted"><?php echo $action->objectLabel;?></span>
+              <span class="text"><?php echo $action->objectLabel;?></span>
               <?php echo html::a($action->objectLink, $action->objectName);?>
               <span class="label label-id"><?php echo $action->objectID;?></span>
               <?php endif;?>
diff --git a/module/product/view/dynamic.html.php b/module/product/view/dynamic.html.php
index e50595d8af..c0fd302d43 100755
--- a/module/product/view/dynamic.html.php
+++ b/module/product/view/dynamic.html.php
@@ -80,7 +80,7 @@
             <span class="timeline-tag"><?php echo $action->time?></span>
             <span class="timeline-text">
               <?php echo zget($users, $action->actor) . ' ' . $action->actionLabel;?>
-              <span class="text-muted"><?php echo $action->objectLabel;?></span>
+              <span class="text"><?php echo $action->objectLabel;?></span>
               <span class="label label-id"><?php echo $action->objectID;?></span>
               <?php echo html::a($action->objectLink, $action->objectName);?>
             </span>
diff --git a/module/project/view/dynamic.html.php b/module/project/view/dynamic.html.php
index b77efcea5a..6fd7c00e6e 100755
--- a/module/project/view/dynamic.html.php
+++ b/module/project/view/dynamic.html.php
@@ -67,7 +67,7 @@
             <span class="timeline-tag"><?php echo $action->time?></span>
             <span class="timeline-text">
               <?php echo zget($users, $action->actor) . ' ' . $action->actionLabel;?>
-              <span class="text-muted"><?php echo $action->objectLabel;?></span>
+              <span class="text"><?php echo $action->objectLabel;?></span>
               <span class="label label-id"><?php echo $action->objectID;?></span>
               <?php echo html::a($action->objectLink, $action->objectName);?>
             </span>