From aaac6a6d0ea8515b215b722b0d993cb2a55e4687 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Mon, 27 Feb 2023 13:42:15 +0800
Subject: [PATCH] * The tag output problem was rectified.

---
 module/custom/model.php      | 29 +++++++++++++++++++++++------
 module/my/view/todo.html.php |  2 +-
 module/todo/lang/de.php      |  1 +
 module/todo/lang/en.php      |  1 +
 module/todo/lang/fr.php      |  1 +
 module/todo/lang/zh-cn.php   |  1 +
 6 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/module/custom/model.php b/module/custom/model.php
index 4d965d2acb..b150b7d199 100644
--- a/module/custom/model.php
+++ b/module/custom/model.php
@@ -51,14 +51,31 @@ class customModel extends model
         $processedLang = array();
         foreach($allCustomLang as $id => $customLang)
         {
-            if(isset($sectionLang[$customLang->module][$customLang->section]['all']) && isset($sectionLang[$customLang->module][$customLang->section][$currentLang]) && $customLang->lang == 'all') continue;
+            if(isset($sectionLang[$customLang->module][$customLang->section]['all']) and isset($sectionLang[$customLang->module][$customLang->section][$currentLang]) and $customLang->lang == 'all') continue;
 
-            $sections     = explode('-', $customLang->section);
-            $sectionIndex = count($sections) - 1;
-            $sectionArr   = array($customLang->key => $customLang->value);
-            for($index = $sectionIndex; $index >= 0; $index --) $sectionArr = array($sections[$index] => $sectionArr);
+            if(strpos($customLang->section, 'featureBar-') !== false)
+            {
+                $sections      = explode('-', $customLang->section);
+                $sectionIndex  = count($sections) - 1;
+                $sectionArr    = array($customLang->key => $customLang->value);
+                $oldSectionArr = empty($processedLang[$customLang->module]) ? array() : $processedLang[$customLang->module];
+                if(!empty($oldSectionArr))
+                {
+                    for($i = 0; $i <= $sectionIndex; $i ++)
+                    {
+                        $sectionKey    = $sections[$i];
+                        $oldSectionArr = $oldSectionArr[$sectionKey];
+                    }
+                    $sectionArr = array_merge($oldSectionArr, $sectionArr);
+                }
 
-            $processedLang[$customLang->module] = $sectionArr;
+                for($index = $sectionIndex; $index >= 0; $index --) $sectionArr = array($sections[$index] => $sectionArr);
+                $processedLang[$customLang->module] = $sectionArr;
+            }
+            else
+            {
+                $processedLang[$customLang->module][$customLang->section][$customLang->key] = $customLang->value;
+            }
         }
 
         return $processedLang;
diff --git a/module/my/view/todo.html.php b/module/my/view/todo.html.php
index 3f13469623..04fb88c2e6 100644
--- a/module/my/view/todo.html.php
+++ b/module/my/view/todo.html.php
@@ -123,7 +123,7 @@ $doingCount = 0;
           </td>
           <td class="c-name" title="<?php echo $todo->name;?>"><?php echo html::a($this->createLink('todo', 'view', "id=$todo->id&from=my", '', true), $todo->name, '', "data-toggle='modal' data-width='80%' data-type='iframe' data-title='" . $lang->todo->view . "' data-icon='check'");?></td>
           <td class="c-pri"><span title="<?php echo zget($lang->todo->priList, $todo->pri);?>" class='label-pri <?php echo 'label-pri-' . $todo->pri;?>' title='<?php echo zget($lang->todo->priList, $todo->pri, $todo->pri);?>'><?php echo zget($lang->todo->priList, $todo->pri)?></span></td>
-          <td class="c-date text-center"><?php echo $todo->date == '2030-01-01' ? $lang->todo->featureBar['todo']['future'] : $todo->date;?></td>
+          <td class="c-date text-center"><?php echo $todo->date == '2030-01-01' ? $lang->todo->future : $todo->date;?></td>
           <td class="c-status"><span class="status-todo status-<?php echo $todo->status;?>"><?php echo $lang->todo->statusList[$todo->status];?></span></td>
           <td class="c-type"><?php echo zget($lang->todo->typeList, $todo->type, '');?></td>
           <?php if($type == 'assignedToOther'):?>
diff --git a/module/todo/lang/de.php b/module/todo/lang/de.php
index 238f36745c..1f5dd607bf 100644
--- a/module/todo/lang/de.php
+++ b/module/todo/lang/de.php
@@ -36,6 +36,7 @@ $lang->todo->project      = "Project";
 $lang->todo->product      = "Product";
 $lang->todo->execution    = $lang->executionCommon;
 $lang->todo->changeDate   = "Change Date";
+$lang->todo->future       = 'TBD';
 
 $lang->todo->reasonList['story'] = "Story übertragen";
 $lang->todo->reasonList['task']  = "Aufgabe übertragen";
diff --git a/module/todo/lang/en.php b/module/todo/lang/en.php
index 09ff40e167..778cd46492 100644
--- a/module/todo/lang/en.php
+++ b/module/todo/lang/en.php
@@ -36,6 +36,7 @@ $lang->todo->project      = "Project";
 $lang->todo->product      = "Product";
 $lang->todo->execution    = $lang->executionCommon;
 $lang->todo->changeDate   = "Change Date";
+$lang->todo->future       = 'TBD';
 
 $lang->todo->reasonList['story'] = "Convert to Story";
 $lang->todo->reasonList['task']  = "Convert to Task";
diff --git a/module/todo/lang/fr.php b/module/todo/lang/fr.php
index 8d58bef8e0..814933e949 100644
--- a/module/todo/lang/fr.php
+++ b/module/todo/lang/fr.php
@@ -36,6 +36,7 @@ $lang->todo->project      = "Project";
 $lang->todo->product      = "Product";
 $lang->todo->execution    = $lang->executionCommon;
 $lang->todo->changeDate   = "Change Date";
+$lang->todo->future       = 'TBD';
 
 $lang->todo->reasonList['story'] = "Convertir en Story";
 $lang->todo->reasonList['task']  = "Convertir en Tâche";
diff --git a/module/todo/lang/zh-cn.php b/module/todo/lang/zh-cn.php
index 563487a90c..ebd1d81af0 100644
--- a/module/todo/lang/zh-cn.php
+++ b/module/todo/lang/zh-cn.php
@@ -36,6 +36,7 @@ $lang->todo->project      = "所属项目";
 $lang->todo->product      = "所属产品";
 $lang->todo->execution    = "所属{$lang->execution->common}";
 $lang->todo->changeDate   = "修改日期";
+$lang->todo->future       = '待定';
 
 $lang->todo->reasonList['story'] = "转{$lang->SRCommon}";
 $lang->todo->reasonList['task']  = "转任务";