Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Finish task #9002.

Browse Source
This commit is contained in:
holan20180123
2021-01-19 15:38:55 +08:00
parent 6df048c4f0
commit ce82f05142
7 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framework/router.class.php
+2
View File
@@ -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];
module/user/lang/de.php
+1 -1
View File
@@ -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';
module/user/lang/en.php
+1 -1
View File
@@ -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';
module/user/lang/fr.php
+1 -1
View File
@@ -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';
module/user/lang/vi.php
+1 -1
View File
@@ -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';
module/user/lang/zh-cn.php
+1 -1
View File
@@ -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 = '联系人';
module/user/lang/zh-tw.php
+1 -1
View File
@@ -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 = '聯繫人';