From ce82f051428b161c9aa874861b77c1eb4babc5fb Mon Sep 17 00:00:00 2001
From: holan20180123 <56391770@qq.com>
Date: Tue, 19 Jan 2021 15:38:55 +0800
Subject: [PATCH] * Finish task #9002.

---
 framework/router.class.php | 2 ++
 module/user/lang/de.php    | 2 +-
 module/user/lang/en.php    | 2 +-
 module/user/lang/fr.php    | 2 +-
 module/user/lang/vi.php    | 2 +-
 module/user/lang/zh-cn.php | 2 +-
 module/user/lang/zh-tw.php | 2 +-
 7 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/framework/router.class.php b/framework/router.class.php
index fd5582eae6..e92fb7e4ca 100755
--- a/framework/router.class.php
+++ b/framework/router.class.php
@@ -199,10 +199,12 @@ class router extends baseRouter
         $model->model = 'scrum';
         if($this->session->PRJ) $model = $this->dbh->query('SELECT model FROM' . TABLE_PROJECT . "WHERE id = {$this->session->PRJ}")->fetch();
 
+        $iterationKey = $projectKey;
         if(isset($model->model) && $model->model == 'waterfall') $projectKey = STAGE_KEY;
 
         /* Set productCommon, projectCommon and hourCommon. Default english lang. */
         $lang->productCommon   = $this->config->productCommonList[$this->clientLang][PRODUCT_KEY];
+        $lang->iterationCommon = isset($this->config->executionCommonList[$this->clientLang][(int)$iterationKey]) ? $this->config->executionCommonList[$this->clientLang][(int)$iterationKey] : $this->config->executionCommonList['en'][(int)$iterationKey];
         $lang->executionCommon = isset($this->config->executionCommonList[$this->clientLang][(int)$projectKey]) ? $this->config->executionCommonList[$this->clientLang][(int)$projectKey] : $this->config->executionCommonList['en'][(int)$projectKey];
         $lang->hourCommon      = isset($this->config->hourPointCommonList[$this->clientLang][(int)$hourKey]) ? $this->config->hourPointCommonList[$this->clientLang][(int)$hourKey] : $this->config->hourPointCommonList['en'][(int)$hourKey];
 
diff --git a/module/user/lang/de.php b/module/user/lang/de.php
index cec81ee54e..a3259e53a3 100644
--- a/module/user/lang/de.php
+++ b/module/user/lang/de.php
@@ -208,7 +208,7 @@ $lang->user->contactFieldList['slack']    = $lang->user->slack;
 $lang->user->contactFieldList['whatsapp'] = $lang->user->whatsapp;
 
 $lang->user->executionTypeList['stage']  = 'Stage';
-$lang->user->executionTypeList['sprint'] = 'Iteration';
+$lang->user->executionTypeList['sprint'] = $lang->iterationCommon;
 
 $lang->user->contacts = new stdclass();
 $lang->user->contacts->common   = 'Kontakt';
diff --git a/module/user/lang/en.php b/module/user/lang/en.php
index 44f096a923..a30b697334 100644
--- a/module/user/lang/en.php
+++ b/module/user/lang/en.php
@@ -208,7 +208,7 @@ $lang->user->contactFieldList['slack']    = $lang->user->slack;
 $lang->user->contactFieldList['whatsapp'] = $lang->user->whatsapp;
 
 $lang->user->executionTypeList['stage']  = 'Stage';
-$lang->user->executionTypeList['sprint'] = 'Iteration';
+$lang->user->executionTypeList['sprint'] = $lang->iterationCommon;
 
 $lang->user->contacts = new stdclass();
 $lang->user->contacts->common   = 'Contacts';
diff --git a/module/user/lang/fr.php b/module/user/lang/fr.php
index 4088a4bff5..eb508e2b19 100644
--- a/module/user/lang/fr.php
+++ b/module/user/lang/fr.php
@@ -208,7 +208,7 @@ $lang->user->contactFieldList['slack']    = $lang->user->slack;
 $lang->user->contactFieldList['whatsapp'] = $lang->user->whatsapp;
 
 $lang->user->executionTypeList['stage']  = 'Stage';
-$lang->user->executionTypeList['sprint'] = 'Iteration';
+$lang->user->executionTypeList['sprint'] = $lang->iterationCommon;
 
 $lang->user->contacts = new stdclass();
 $lang->user->contacts->common   = 'Contacts';
diff --git a/module/user/lang/vi.php b/module/user/lang/vi.php
index 0dbd4d62ae..398bbb2ce6 100644
--- a/module/user/lang/vi.php
+++ b/module/user/lang/vi.php
@@ -208,7 +208,7 @@ $lang->user->contactFieldList['slack']    = $lang->user->slack;
 $lang->user->contactFieldList['whatsapp'] = $lang->user->whatsapp;
 
 $lang->user->executionTypeList['stage']  = 'Stage';
-$lang->user->executionTypeList['sprint'] = 'Iteration';
+$lang->user->executionTypeList['sprint'] = $lang->iterationCommon;
 
 $lang->user->contacts = new stdclass();
 $lang->user->contacts->common   = 'Liên lạc';
diff --git a/module/user/lang/zh-cn.php b/module/user/lang/zh-cn.php
index 01959055a6..ca2de6c898 100644
--- a/module/user/lang/zh-cn.php
+++ b/module/user/lang/zh-cn.php
@@ -211,7 +211,7 @@ $lang->user->contactFieldList['slack']    = $lang->user->slack;
 $lang->user->contactFieldList['whatsapp'] = $lang->user->whatsapp;
 
 $lang->user->executionTypeList['stage']  = '阶段';
-$lang->user->executionTypeList['sprint'] = '迭代';
+$lang->user->executionTypeList['sprint'] = $lang->iterationCommon;
 
 $lang->user->contacts = new stdclass();
 $lang->user->contacts->common   = '联系人';
diff --git a/module/user/lang/zh-tw.php b/module/user/lang/zh-tw.php
index aae959a154..f39ab6cd8e 100644
--- a/module/user/lang/zh-tw.php
+++ b/module/user/lang/zh-tw.php
@@ -199,7 +199,7 @@ $lang->user->contactFieldList['slack']    = $lang->user->slack;
 $lang->user->contactFieldList['whatsapp'] = $lang->user->whatsapp;
 
 $lang->user->executionTypeList['stage']  = '階段';
-$lang->user->executionTypeList['sprint'] = '迭代';
+$lang->user->executionTypeList['sprint'] = $lang->iterationCommon;
 
 $lang->user->contacts = new stdclass();
 $lang->user->contacts->common   = '聯繫人';