From 7328fa8d30cdea618a5c77379c2fcf417873aff0 Mon Sep 17 00:00:00 2001
From: z <wyd621@163.com>
Date: Tue, 24 Nov 2020 08:30:29 +0800
Subject: [PATCH 1/3]  * adjust for merge.

---
 module/group/lang/resource.php | 98 ----------------------------------
 1 file changed, 98 deletions(-)

diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php
index 10c34974ff..22d9225137 100644
--- a/module/group/lang/resource.php
+++ b/module/group/lang/resource.php
@@ -1820,101 +1820,3 @@ $lang->changelog['12.3'][] = 'ci-commitResult';
 $lang->changelog['12.5'][] = 'story-batchToTask';
 $lang->changelog['12.5'][] = 'custom-product';
 $lang->changelog['12.5'][] = 'custom-project';
-
-global $config;
-if($config->global->flow != 'full')
-{
-    unset($lang->moduleOrder[10]);
-    unset($lang->resource->qa);
-    unset($lang->moduleOrder[50]);
-    unset($lang->resource->report);
-    unset($lang->moduleOrder[90]);
-}
-
-if($config->global->flow == 'onlyStory' || $config->global->flow == 'onlyTask')
-{
-    unset($lang->resource->build);
-    unset($lang->moduleOrder[45]);
-    unset($lang->resource->bug);
-    unset($lang->moduleOrder[55]);
-    unset($lang->resource->testcase);
-    unset($lang->moduleOrder[60]);
-    unset($lang->resource->testtask);
-    unset($lang->moduleOrder[65]);
-
-    unset($lang->resource->my->bug);
-    unset($lang->resource->my->testTask);
-    unset($lang->resource->my->testCase);
-}
-
-if($config->global->flow == 'onlyStory' || $config->global->flow == 'onlyTest')
-{
-    unset($lang->resource->project);
-    unset($lang->moduleOrder[35]);
-    unset($lang->resource->task);
-    unset($lang->moduleOrder[40]);
-
-    unset($lang->resource->my->task);
-    unset($lang->resource->my->project);
-
-    unset($lang->resource->product->project);
-}
-
-if($config->global->flow == 'onlyTask' || $config->global->flow == 'onlyTest')
-{
-    unset($lang->resource->story);
-    unset($lang->moduleOrder[20]);
-    unset($lang->resource->productplan);
-    unset($lang->moduleOrder[25]);
-    unset($lang->resource->release);
-    unset($lang->moduleOrder[30]);
-
-    unset($lang->resource->my->story);
-}
-
-if($config->global->flow == 'onlyStory')
-{
-    unset($lang->resource->svn);
-    unset($lang->moduleOrder[150]);
-    unset($lang->resource->git);
-    unset($lang->moduleOrder[155]);
-
-    unset($lang->resource->story->tasks);
-}
-
-if($config->global->flow == 'onlyTask')
-{
-    unset($lang->resource->product);
-    unset($lang->moduleOrder[15]);
-    unset($lang->resource->bug);
-    unset($lang->moduleOrder[55]);
-
-    unset($lang->resource->project->importbug);
-    unset($lang->resource->project->story);
-    unset($lang->resource->project->bug);
-    unset($lang->resource->project->linkStory);
-    unset($lang->resource->project->unlinkStory);
-    unset($lang->resource->project->ajaxGetProducts);
-}
-
-if($config->global->flow == 'onlyTest')
-{
-    unset($lang->resource->product->browse);
-    unset($lang->resource->product->roadmap);
-    unset($lang->resource->product->dynamic);
-    unset($lang->resource->product->ajaxGetProjects);
-    unset($lang->resource->product->ajaxGetPlans);
-
-    unset($lang->resource->build->ajaxGetProjectBuilds);
-    unset($lang->build->methodOrder[30]);
-
-    unset($lang->resource->bug->confirmStoryChange);
-    unset($lang->bug->methodOrder[60]);
-
-    unset($lang->resource->testcase->confirmStoryChange);
-    unset($lang->testcase->methodOrder[40]);
-
-    $lang->resource->product->build = 'build';
-    $lang->product->methodOrder[5]  = 'build';
-}
->>>>>>> 12.x

From 41b1d9931aa44d974af2787a8f1e99d304d67187 Mon Sep 17 00:00:00 2001
From: holan20180123 <56391770@qq.com>
Date: Tue, 24 Nov 2020 08:56:14 +0800
Subject: [PATCH 2/3] * Finish task #8450.

---
 module/block/view/recentprojectblock.html.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/module/block/view/recentprojectblock.html.php b/module/block/view/recentprojectblock.html.php
index 57604b9d08..71311d33bd 100644
--- a/module/block/view/recentprojectblock.html.php
+++ b/module/block/view/recentprojectblock.html.php
@@ -37,8 +37,7 @@
     <div class='col' data-id='<?php echo $projectID?>'>
       <div class='panel' data-url='<?php echo $this->createLink('project', 'index', "projectID=$project->id");?>'>
         <div class='panel-heading'>
-          <?php $parentName = $project->parentName ? $project->parentName . '/' : '';?>
-          <strong class='project-name' title='<?php echo $parentName . $project->name;?>'> <?php echo html::a($this->createLink('project', 'index', "projectID=$project->id", '', '', $project->id), $parentName . $project->name);?> </strong>
+          <strong class='project-name' title='<?php echo $project->name;?>'> <?php echo html::a($this->createLink('project', 'index', "projectID=$project->id", '', '', $project->id), $project->name);?> </strong>
           <?php if($project->model === 'waterfall'): ?>
           <span class='project-type-label label label-warning label-outline'><?php echo $lang->program->waterfall; ?></span>
           <?php else: ?>

From 40630c75a881ceeeb24f847f2658171c4b1cb346 Mon Sep 17 00:00:00 2001
From: holan20180123 <56391770@qq.com>
Date: Tue, 24 Nov 2020 09:05:28 +0800
Subject: [PATCH 3/3] * Finish task #8451.

---
 module/block/lang/zh-cn.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/block/lang/zh-cn.php b/module/block/lang/zh-cn.php
index b97235eb01..ac528ff691 100644
--- a/module/block/lang/zh-cn.php
+++ b/module/block/lang/zh-cn.php
@@ -271,7 +271,7 @@ $lang->block->default['full']['my']['5']['block']  = 'contribute';
 $lang->block->default['full']['my']['5']['source'] = '';
 $lang->block->default['full']['my']['5']['grid']   = 4;
 
-$lang->block->default['full']['my']['6']['title']  = '我的近期项目';
+$lang->block->default['full']['my']['6']['title']  = '我近期参与的项目';
 $lang->block->default['full']['my']['6']['block']  = 'recentproject';
 $lang->block->default['full']['my']['6']['source'] = 'project';
 $lang->block->default['full']['my']['6']['grid']   = 8;