diff --git a/framework/router.class.php b/framework/router.class.php index 4faf92ad6f..868527f49c 100755 --- a/framework/router.class.php +++ b/framework/router.class.php @@ -215,21 +215,23 @@ class router extends baseRouter $lang->hourCommon = isset($this->config->hourPointCommonList[$this->clientLang][(int)$hourKey]) ? $this->config->hourPointCommonList[$this->clientLang][(int)$hourKey] : $this->config->hourPointCommonList['en'][(int)$hourKey]; /* User preference init. */ - $config->URSR = $URSR; - $config->URAndSR = $URAndSR; - $config->programLink = 'program-browse'; - $config->productLink = 'product-all'; - $config->projectLink = 'project-browse'; + $config->URSR = $URSR; + $config->URAndSR = $URAndSR; + $config->programLink = 'program-browse'; + $config->productLink = 'product-all'; + $config->projectLink = 'project-browse'; + $config->executionLink = 'execution-task'; /* Get user preference. */ $account = isset($this->session->user->account) ? $this->session->user->account : ''; - if($this->dbh and !empty($this->config->db->name)) $userSetting = $this->dbh->query('SELECT `key`, value FROM' . TABLE_CONFIG . "WHERE `owner`='{$account}' AND `module`='common' and `key` in ('programLink', 'productLink', 'projectLink', 'URSR')")->fetchAll(); + if($this->dbh and !empty($this->config->db->name)) $userSetting = $this->dbh->query('SELECT `key`, value FROM' . TABLE_CONFIG . "WHERE `owner`='{$account}' AND `module`='common' and `key` in ('programLink', 'productLink', 'projectLink', 'executionLink', 'URSR')")->fetchAll(); foreach($userSetting as $setting) { - if($setting->key == 'URSR') $config->URSR = $setting->value; - if($setting->key == 'programLink') $config->programLink = $setting->value; - if($setting->key == 'productLink') $config->productLink = $setting->value; - if($setting->key == 'projectLink') $config->projectLink = $setting->value; + if($setting->key == 'URSR') $config->URSR = $setting->value; + if($setting->key == 'programLink') $config->programLink = $setting->value; + if($setting->key == 'productLink') $config->productLink = $setting->value; + if($setting->key == 'projectLink') $config->projectLink = $setting->value; + if($setting->key == 'executionLink') $config->executionLink = $setting->value; } $lang->URCommon = ''; diff --git a/module/common/lang/de.php b/module/common/lang/de.php index d358771def..36b7e1747d 100644 --- a/module/common/lang/de.php +++ b/module/common/lang/de.php @@ -127,22 +127,23 @@ $lang->common = new stdclass(); $lang->common->common = 'Standard Module'; global $config; -list($programModule, $programMethod) = explode('-', $config->programLink); -list($productModule, $productMethod) = explode('-', $config->productLink); -list($projectModule, $projectMethod) = explode('-', $config->projectLink); +list($programModule, $programMethod) = explode('-', $config->programLink); +list($productModule, $productMethod) = explode('-', $config->productLink); +list($projectModule, $projectMethod) = explode('-', $config->projectLink); +list($executionModule, $executionMethod) = explode('-', $config->executionLink); /* Main menu. */ $lang->mainNav = new stdclass(); $lang->mainNav->my = ' My|my|index|'; -$lang->mainNav->product = " Product|$productModule|$productMethod|"; +$lang->mainNav->product = " Product|$productModule|$productMethod|"; if($config->systemMode == 'new') { - $lang->mainNav->project = " Project|$projectModule|$projectMethod|"; - $lang->mainNav->execution = " Execution|execution|task|"; + $lang->mainNav->project = " Project|$projectModule|$projectMethod|"; + $lang->mainNav->execution = " Execution|$executionModule|$executionMethod|"; } else { - $lang->mainNav->project = " $lang->executionCommon|$projectModule|$projectMethod|"; + $lang->mainNav->execution = " $lang->executionCommon|$executionModule|$executionMethod|"; } $lang->mainNav->qa = ' Test|qa|index|'; $lang->mainNav->repo = ' Code|repo|browse|'; diff --git a/module/common/lang/en.php b/module/common/lang/en.php index da01962de0..699dc94eab 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -127,22 +127,23 @@ $lang->common = new stdclass(); $lang->common->common = 'Common Module'; global $config; -list($programModule, $programMethod) = explode('-', $config->programLink); -list($productModule, $productMethod) = explode('-', $config->productLink); -list($projectModule, $projectMethod) = explode('-', $config->projectLink); +list($programModule, $programMethod) = explode('-', $config->programLink); +list($productModule, $productMethod) = explode('-', $config->productLink); +list($projectModule, $projectMethod) = explode('-', $config->projectLink); +list($executionModule, $executionMethod) = explode('-', $config->executionLink); /* Main menu. */ $lang->mainNav = new stdclass(); $lang->mainNav->my = ' My|my|index|'; -$lang->mainNav->product = " Product|$productModule|$productMethod|"; +$lang->mainNav->product = " Product|$productModule|$productMethod|"; if($config->systemMode == 'new') { - $lang->mainNav->project = " Project|$projectModule|$projectMethod|"; - $lang->mainNav->execution = " Execution|execution|task|"; + $lang->mainNav->project = " Project|$projectModule|$projectMethod|"; + $lang->mainNav->execution = " Execution|$executionModule|$executionMethod|"; } else { - $lang->mainNav->project = " $lang->executionCommon|$projectModule|$projectMethod|"; + $lang->mainNav->execution = " $lang->executionCommon|$executionModule|$executionMethod|"; } $lang->mainNav->qa = ' Test|qa|index|'; $lang->mainNav->repo = ' Code|repo|browse|'; diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php index 6b3e44f1f7..ea8d78141e 100644 --- a/module/common/lang/fr.php +++ b/module/common/lang/fr.php @@ -127,22 +127,23 @@ $lang->common = new stdclass(); $lang->common->common = 'Module Commun'; global $config; -list($programModule, $programMethod) = explode('-', $config->programLink); -list($productModule, $productMethod) = explode('-', $config->productLink); -list($projectModule, $projectMethod) = explode('-', $config->projectLink); +list($programModule, $programMethod) = explode('-', $config->programLink); +list($productModule, $productMethod) = explode('-', $config->productLink); +list($projectModule, $projectMethod) = explode('-', $config->projectLink); +list($executionModule, $executionMethod) = explode('-', $config->executionLink); /* Main menu. */ $lang->mainNav = new stdclass(); $lang->mainNav->my = ' My|my|index|'; -$lang->mainNav->product = " Product|$productModule|$productMethod|"; +$lang->mainNav->product = " Product|$productModule|$productMethod|"; if($config->systemMode == 'new') { - $lang->mainNav->project = " Project|$projectModule|$projectMethod|"; - $lang->mainNav->execution = " Execution|execution|task|"; + $lang->mainNav->project = " Project|$projectModule|$projectMethod|"; + $lang->mainNav->execution = " Execution|$executionModule|$executionMethod|"; } else { - $lang->mainNav->project = " $lang->executionCommon|$projectModule|$projectMethod|"; + $lang->mainNav->execution = " $lang->executionCommon|$executionModule|$executionMethod|"; } $lang->mainNav->qa = ' Test|qa|index|'; $lang->mainNav->repo = ' Code|repo|browse|'; diff --git a/module/common/lang/vi.php b/module/common/lang/vi.php index d9e930c6d1..14800343e1 100644 --- a/module/common/lang/vi.php +++ b/module/common/lang/vi.php @@ -127,22 +127,23 @@ $lang->common = new stdclass(); $lang->common->common = 'Module chung'; global $config; -list($programModule, $programMethod) = explode('-', $config->programLink); -list($productModule, $productMethod) = explode('-', $config->productLink); -list($projectModule, $projectMethod) = explode('-', $config->projectLink); +list($programModule, $programMethod) = explode('-', $config->programLink); +list($productModule, $productMethod) = explode('-', $config->productLink); +list($projectModule, $projectMethod) = explode('-', $config->projectLink); +list($executionModule, $executionMethod) = explode('-', $config->executionLink); /* Main menu. */ $lang->mainNav = new stdclass(); $lang->mainNav->my = ' My|my|index|'; -$lang->mainNav->product = " Product|$productModule|$productMethod|"; +$lang->mainNav->product = " Product|$productModule|$productMethod|"; if($config->systemMode == 'new') { - $lang->mainNav->project = " Project|$projectModule|$projectMethod|"; - $lang->mainNav->execution = " Execution|execution|task|"; + $lang->mainNav->project = " Project|$projectModule|$projectMethod|"; + $lang->mainNav->execution = " Execution|$executionModule|$executionMethod|"; } else { - $lang->mainNav->project = " $lang->executionCommon|$projectModule|$projectMethod|"; + $lang->mainNav->execution = " $lang->executionCommon|$executionModule|$executionMethod|"; } $lang->mainNav->qa = ' Test|qa|index|'; $lang->mainNav->repo = ' Code|repo|browse|'; diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index d0f0c76f2d..f2b6f24138 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -127,9 +127,10 @@ $lang->common = new stdclass(); $lang->common->common = '公有模块'; global $config; -list($programModule, $programMethod) = explode('-', $config->programLink); -list($productModule, $productMethod) = explode('-', $config->productLink); -list($projectModule, $projectMethod) = explode('-', $config->projectLink); +list($programModule, $programMethod) = explode('-', $config->programLink); +list($productModule, $productMethod) = explode('-', $config->productLink); +list($projectModule, $projectMethod) = explode('-', $config->projectLink); +list($executionModule, $executionMethod) = explode('-', $config->executionLink); /* 主导航菜单。*/ $lang->mainNav = new stdclass(); @@ -138,11 +139,11 @@ $lang->mainNav->product = " 产品|$productModu if($config->systemMode == 'new') { $lang->mainNav->project = " 项目|$projectModule|$projectMethod|"; - $lang->mainNav->execution = " 执行|execution|task|"; + $lang->mainNav->execution = " 执行|$executionModule|$executionMethod|"; } else { - $lang->mainNav->project = " $lang->executionCommon|$projectModule|$projectMethod|"; + $lang->mainNav->execution = " $lang->executionCommon|$executionModule|$executionMethod|"; } $lang->mainNav->qa = ' 测试|qa|index|'; $lang->mainNav->repo = ' 代码|repo|browse|'; diff --git a/module/my/control.php b/module/my/control.php index dbe9775c20..b8fc33baaf 100644 --- a/module/my/control.php +++ b/module/my/control.php @@ -854,6 +854,7 @@ class my extends control $this->view->programLink = isset($this->config->programLink) ? $this->config->programLink : 'program-browse'; $this->view->productLink = isset($this->config->productLink) ? $this->config->productLink : 'product-all'; $this->view->projectLink = isset($this->config->projectLink) ? $this->config->projectLink : 'project-browse'; + $this->view->executionLink = isset($this->config->executionLink) ? $this->config->executionLink : 'execution-task'; $this->view->preferenceSetted = isset($this->config->preferenceSetted) ? true : false; $this->display(); diff --git a/module/my/lang/de.php b/module/my/lang/de.php index 147330e157..4ff058e633 100644 --- a/module/my/lang/de.php +++ b/module/my/lang/de.php @@ -1,67 +1,69 @@ my->common = 'Dashboard'; /* Method List。*/ $lang->my->index = 'Home'; -$lang->my->todo = 'Meine ToDos'; -$lang->my->calendar = 'Kalender'; +$lang->my->todo = 'My Todos'; +$lang->my->calendar = 'Schedule'; $lang->my->work = 'Work'; $lang->my->contribute = 'Contribute'; -$lang->my->task = 'Aufgaben'; -$lang->my->bug = 'Bugs'; -$lang->my->testTask = 'Builds'; -$lang->my->testCase = 'Meine Fälle'; -$lang->my->story = 'Meine Storys'; +$lang->my->task = 'My Tasks'; +$lang->my->bug = 'My Bugs'; +$lang->my->testTask = 'My Builds'; +$lang->my->testCase = 'My Cases'; +$lang->my->story = 'My Stories'; $lang->my->createProgram = 'Create Program'; $lang->my->project = "My Projects"; $lang->my->execution = "My {$lang->executionCommon}s"; $lang->my->issue = 'My Issues'; $lang->my->risk = 'My Risks'; -$lang->my->profile = 'Meine Profil'; -$lang->my->dynamic = 'Meine Verlauf'; +$lang->my->profile = 'My Profile'; +$lang->my->dynamic = 'My Dynamics'; $lang->my->team = 'My Team'; -$lang->my->editProfile = 'Profil bearbeiten'; -$lang->my->changePassword = 'Passwort ändern'; +$lang->my->editProfile = 'Edit'; +$lang->my->changePassword = 'Edit Password'; $lang->my->preference = 'Preference'; -$lang->my->unbind = 'Unbind Ranger'; -$lang->my->manageContacts = 'Kontakt pflegen'; -$lang->my->deleteContacts = 'Kontakt löschen'; -$lang->my->shareContacts = 'Liste teilen'; -$lang->my->limited = 'Eingeschränkte Möglichkeiten (Bearbeiten nur eigener Inhalte möglich)'; -$lang->my->storyConcept = 'Story Concept'; -$lang->my->score = 'Meine Wertung'; -$lang->my->scoreRule = 'Wertungs regeln'; -$lang->my->noTodo = 'Keine toDos. '; +$lang->my->unbind = 'Unbind from Zdoo'; +$lang->my->manageContacts = 'Manage Contact'; +$lang->my->deleteContacts = 'Delete Contact'; +$lang->my->shareContacts = 'Public'; +$lang->my->limited = 'Limited Actions (Users can only edit what involves them.)'; +$lang->my->score = 'My Points'; +$lang->my->scoreRule = 'Point Rules'; +$lang->my->noTodo = 'No todos yet. '; $lang->my->noData = 'No %s yet. '; $lang->my->storyChanged = "Story Changed"; -$lang->my->hours = 'Stunde/Tag'; +$lang->my->hours = "Hours/day"; $lang->my->uploadAvatar = 'Upload Avatar'; $lang->my->requirement = "My {$lang->URCommon}"; $lang->my->testtask = 'My Test Task'; $lang->my->testcase = 'My Case'; +$lang->my->storyConcept = 'Story Concept'; -$lang->my->myExecutions = 'My Stage/Sprint/Iteration'; +$lang->my->myExecutions = "My Stage/Sprint/Iteration"; $lang->my->name = 'Name'; $lang->my->code = 'Code'; $lang->my->projects = 'Project'; -$lang->my->executions = "{$lang->executionCommon}"; +$lang->my->executions = $lang->executionCommon; $lang->my->executionMenu = new stdclass(); $lang->my->executionMenu->undone = 'Undone'; $lang->my->executionMenu->done = 'Done'; $lang->my->taskMenu = new stdclass(); -$lang->my->taskMenu->assignedToMe = 'Mir zuweisen'; -$lang->my->taskMenu->openedByMe = 'Von mir angelegt'; -$lang->my->taskMenu->finishedByMe = 'Von mir abgeschlossen'; -$lang->my->taskMenu->closedByMe = 'Von mir geschlossen'; -$lang->my->taskMenu->canceledByMe = 'Von mir abgebrochen'; +$lang->my->taskMenu->assignedToMe = 'AssignedToMe'; +$lang->my->taskMenu->openedByMe = 'CreatedByMe'; +$lang->my->taskMenu->finishedByMe = 'FinishedByMe'; +$lang->my->taskMenu->closedByMe = 'ClosedByMe'; +$lang->my->taskMenu->canceledByMe = 'CancelledByMe'; $lang->my->storyMenu = new stdclass(); -$lang->my->storyMenu->assignedToMe = 'Mir zugewiesen'; -$lang->my->storyMenu->openedByMe = 'Von mir erstellt'; -$lang->my->storyMenu->reviewedByMe = 'Von mir überprüft'; -$lang->my->storyMenu->closedByMe = 'Von mir geschlossen'; +$lang->my->storyMenu->assignedToMe = 'AssignedToMe'; +$lang->my->storyMenu->openedByMe = 'CreatedByMe'; +$lang->my->storyMenu->reviewedByMe = 'ReviewedByMe'; +$lang->my->storyMenu->closedByMe = 'ClosedByMe'; $lang->my->projectMenu = new stdclass(); $lang->my->projectMenu->doing = 'Doing'; @@ -71,18 +73,17 @@ $lang->my->projectMenu->closed = 'Closed'; $lang->my->projectMenu->openedbyme = 'CreatedByMe'; $lang->my->form = new stdclass(); -$lang->my->form->lblBasic = 'Basis Info'; -$lang->my->form->lblContact = 'Kontakt Info'; -$lang->my->form->lblAccount = 'Konto Info'; +$lang->my->form->lblBasic = 'Basic Info'; +$lang->my->form->lblContact = 'Contact Info'; +$lang->my->form->lblAccount = 'Account Info'; -$lang->my->programLink = 'Program Default Page'; -$lang->my->productLink = 'Product Default Page'; -$lang->my->projectLink = 'Project Default Page'; +$lang->my->programLink = 'Program Default Page'; +$lang->my->productLink = 'Product Default Page'; +$lang->my->projectLink = 'Project Default Page'; +$lang->my->executionLink = 'Execution Default Page'; $lang->my->programLinkList = array(); -//$lang->my->programLinkList['program-home'] = 'The default access to the program home page, you can understand the company’s overall strategic planning status'; $lang->my->programLinkList['program-browse'] = 'By default, you go to the program list, where you can view all of the programs'; -//$lang->my->programLinkList['program-index'] = 'By default, you go to the most recent program dashboard to see the current program overview'; $lang->my->programLinkList['program-project'] = 'By default, you go to the list of items in the most recent program, and you can view all items under the current program'; $lang->my->productLinkList = array(); @@ -93,7 +94,12 @@ $lang->my->productLinkList['product-browse'] = 'By default, go to the list of global $config; $lang->my->projectLinkList = array(); -//$lang->my->projectLinkList['project-home'] = 'The default access to the project home page, you can understand the overall project status of the company'; $lang->my->projectLinkList['project-browse'] = 'By default, you go to the project list, where you can view all the projects'; +$lang->my->projectLinkList['project-task'] = 'By default, you go to the task list for the most recent project iteration to see the task information for the current iteration'; $lang->my->projectLinkList['project-execution'] = 'Go to Project-Exection by default. You can check all information in Execution'; -if($config->systemMode == 'new') $lang->my->projectLinkList['project-index'] = 'By default, go to the most recent project dashboard to see the current project overview'; +$lang->my->projectLinkList['project-index'] = 'By default, go to the most recent project dashboard to see the current project overview'; + +$lang->my->executionLinkList = array(); +$lang->my->executionLinkList['execution-index'] = 'Enter the execution dashboard by default, you can understand all the execution statistics and overview'; +$lang->my->executionLinkList['execution-all'] = 'Enter the execution list by default, you can view all executions'; +$lang->my->executionLinkList['execution-task'] = 'By default, enter the list of the most recently executed task, and you can view the task information under the current iteration'; diff --git a/module/my/lang/en.php b/module/my/lang/en.php index 73170e6215..4ff058e633 100644 --- a/module/my/lang/en.php +++ b/module/my/lang/en.php @@ -1,4 +1,6 @@ my->common = 'Dashboard'; /* Method List。*/ @@ -28,7 +30,6 @@ $lang->my->manageContacts = 'Manage Contact'; $lang->my->deleteContacts = 'Delete Contact'; $lang->my->shareContacts = 'Public'; $lang->my->limited = 'Limited Actions (Users can only edit what involves them.)'; -$lang->my->storyConcept = 'Story Concept'; $lang->my->score = 'My Points'; $lang->my->scoreRule = 'Point Rules'; $lang->my->noTodo = 'No todos yet. '; @@ -39,6 +40,7 @@ $lang->my->uploadAvatar = 'Upload Avatar'; $lang->my->requirement = "My {$lang->URCommon}"; $lang->my->testtask = 'My Test Task'; $lang->my->testcase = 'My Case'; +$lang->my->storyConcept = 'Story Concept'; $lang->my->myExecutions = "My Stage/Sprint/Iteration"; $lang->my->name = 'Name'; @@ -75,14 +77,13 @@ $lang->my->form->lblBasic = 'Basic Info'; $lang->my->form->lblContact = 'Contact Info'; $lang->my->form->lblAccount = 'Account Info'; -$lang->my->programLink = 'Program Default Page'; -$lang->my->productLink = 'Product Default Page'; -$lang->my->projectLink = 'Project Default Page'; +$lang->my->programLink = 'Program Default Page'; +$lang->my->productLink = 'Product Default Page'; +$lang->my->projectLink = 'Project Default Page'; +$lang->my->executionLink = 'Execution Default Page'; $lang->my->programLinkList = array(); -//$lang->my->programLinkList['program-home'] = 'The default access to the program home page, you can understand the company’s overall strategic planning status'; $lang->my->programLinkList['program-browse'] = 'By default, you go to the program list, where you can view all of the programs'; -//$lang->my->programLinkList['program-index'] = 'By default, you go to the most recent program dashboard to see the current program overview'; $lang->my->programLinkList['program-project'] = 'By default, you go to the list of items in the most recent program, and you can view all items under the current program'; $lang->my->productLinkList = array(); @@ -93,7 +94,12 @@ $lang->my->productLinkList['product-browse'] = 'By default, go to the list of global $config; $lang->my->projectLinkList = array(); -//$lang->my->projectLinkList['project-home'] = 'The default access to the project home page, you can understand the overall project status of the company'; $lang->my->projectLinkList['project-browse'] = 'By default, you go to the project list, where you can view all the projects'; +$lang->my->projectLinkList['project-task'] = 'By default, you go to the task list for the most recent project iteration to see the task information for the current iteration'; $lang->my->projectLinkList['project-execution'] = 'Go to Project-Exection by default. You can check all information in Execution'; -if($config->systemMode == 'new') $lang->my->projectLinkList['project-index'] = 'By default, go to the most recent project dashboard to see the current project overview'; +$lang->my->projectLinkList['project-index'] = 'By default, go to the most recent project dashboard to see the current project overview'; + +$lang->my->executionLinkList = array(); +$lang->my->executionLinkList['execution-index'] = 'Enter the execution dashboard by default, you can understand all the execution statistics and overview'; +$lang->my->executionLinkList['execution-all'] = 'Enter the execution list by default, you can view all executions'; +$lang->my->executionLinkList['execution-task'] = 'By default, enter the list of the most recently executed task, and you can view the task information under the current iteration'; diff --git a/module/my/lang/fr.php b/module/my/lang/fr.php index d8d184a867..4ff058e633 100644 --- a/module/my/lang/fr.php +++ b/module/my/lang/fr.php @@ -1,46 +1,48 @@ my->common = 'Tableau de Bord'; +global $config; + +$lang->my->common = 'Dashboard'; /* Method List。*/ -$lang->my->index = 'Accueil'; -$lang->my->todo = 'Mon Agenda'; -$lang->my->calendar = 'Calendrier'; +$lang->my->index = 'Home'; +$lang->my->todo = 'My Todos'; +$lang->my->calendar = 'Schedule'; $lang->my->work = 'Work'; $lang->my->contribute = 'Contribute'; -$lang->my->task = 'Mes Tâches'; -$lang->my->bug = 'Mes Bugs'; -$lang->my->testTask = 'Mes Builds'; -$lang->my->testCase = 'Mes CasTests'; -$lang->my->story = 'Mes Stories'; +$lang->my->task = 'My Tasks'; +$lang->my->bug = 'My Bugs'; +$lang->my->testTask = 'My Builds'; +$lang->my->testCase = 'My Cases'; +$lang->my->story = 'My Stories'; $lang->my->createProgram = 'Create Program'; $lang->my->project = "My Projects"; $lang->my->execution = "My {$lang->executionCommon}s"; $lang->my->issue = 'My Issues'; $lang->my->risk = 'My Risks'; -$lang->my->profile = 'Mon Profil'; -$lang->my->dynamic = 'Mon Historique'; +$lang->my->profile = 'My Profile'; +$lang->my->dynamic = 'My Dynamics'; $lang->my->team = 'My Team'; -$lang->my->editProfile = 'Edit Profil'; -$lang->my->changePassword = 'Changer le Mot de Passe'; +$lang->my->editProfile = 'Edit'; +$lang->my->changePassword = 'Edit Password'; $lang->my->preference = 'Preference'; -$lang->my->unbind = 'Dissocier de Zdoo'; -$lang->my->manageContacts = 'Gérer Contact'; -$lang->my->deleteContacts = 'Supprimer Contact'; +$lang->my->unbind = 'Unbind from Zdoo'; +$lang->my->manageContacts = 'Manage Contact'; +$lang->my->deleteContacts = 'Delete Contact'; $lang->my->shareContacts = 'Public'; -$lang->my->limited = 'Actions Limitées (Les utilisateurs peuvent seulement éditer le contenu de ce qui leur est affecté.)'; -$lang->my->storyConcept = 'Story Concept'; -$lang->my->score = 'Mes Points'; -$lang->my->scoreRule = 'Règles Point'; -$lang->my->noTodo = "Je n'ai rien à faire pour l'instant."; +$lang->my->limited = 'Limited Actions (Users can only edit what involves them.)'; +$lang->my->score = 'My Points'; +$lang->my->scoreRule = 'Point Rules'; +$lang->my->noTodo = 'No todos yet. '; $lang->my->noData = 'No %s yet. '; $lang->my->storyChanged = "Story Changed"; -$lang->my->hours = 'Heure/jour'; +$lang->my->hours = "Hours/day"; $lang->my->uploadAvatar = 'Upload Avatar'; $lang->my->requirement = "My {$lang->URCommon}"; $lang->my->testtask = 'My Test Task'; $lang->my->testcase = 'My Case'; +$lang->my->storyConcept = 'Story Concept'; -$lang->my->myExecutions = 'My Stage/Sprint/Iteration'; +$lang->my->myExecutions = "My Stage/Sprint/Iteration"; $lang->my->name = 'Name'; $lang->my->code = 'Code'; $lang->my->projects = 'Project'; @@ -51,17 +53,17 @@ $lang->my->executionMenu->undone = 'Undone'; $lang->my->executionMenu->done = 'Done'; $lang->my->taskMenu = new stdclass(); -$lang->my->taskMenu->assignedToMe = "Tâches qui me sont affectées"; -$lang->my->taskMenu->openedByMe = "Tâches que j'ai créées"; -$lang->my->taskMenu->finishedByMe = "Tâches que j'ai terminées"; -$lang->my->taskMenu->closedByMe = "Tâches que j'ai fermées"; -$lang->my->taskMenu->canceledByMe = "Tâches que j'ai annulées"; +$lang->my->taskMenu->assignedToMe = 'AssignedToMe'; +$lang->my->taskMenu->openedByMe = 'CreatedByMe'; +$lang->my->taskMenu->finishedByMe = 'FinishedByMe'; +$lang->my->taskMenu->closedByMe = 'ClosedByMe'; +$lang->my->taskMenu->canceledByMe = 'CancelledByMe'; $lang->my->storyMenu = new stdclass(); -$lang->my->storyMenu->assignedToMe = 'Stories qui me sont affectées'; -$lang->my->storyMenu->openedByMe = "Stories que j'ai créées"; -$lang->my->storyMenu->reviewedByMe = "Stories que j'ai acceptées"; -$lang->my->storyMenu->closedByMe = "Stories que j'ai fermées"; +$lang->my->storyMenu->assignedToMe = 'AssignedToMe'; +$lang->my->storyMenu->openedByMe = 'CreatedByMe'; +$lang->my->storyMenu->reviewedByMe = 'ReviewedByMe'; +$lang->my->storyMenu->closedByMe = 'ClosedByMe'; $lang->my->projectMenu = new stdclass(); $lang->my->projectMenu->doing = 'Doing'; @@ -71,18 +73,17 @@ $lang->my->projectMenu->closed = 'Closed'; $lang->my->projectMenu->openedbyme = 'CreatedByMe'; $lang->my->form = new stdclass(); -$lang->my->form->lblBasic = 'Infos Basiques'; -$lang->my->form->lblContact = 'Infos Contact'; -$lang->my->form->lblAccount = 'Infos Compte'; +$lang->my->form->lblBasic = 'Basic Info'; +$lang->my->form->lblContact = 'Contact Info'; +$lang->my->form->lblAccount = 'Account Info'; -$lang->my->programLink = 'Program Default Page'; -$lang->my->productLink = 'Product Default Page'; -$lang->my->projectLink = 'Project Default Page'; +$lang->my->programLink = 'Program Default Page'; +$lang->my->productLink = 'Product Default Page'; +$lang->my->projectLink = 'Project Default Page'; +$lang->my->executionLink = 'Execution Default Page'; $lang->my->programLinkList = array(); -//$lang->my->programLinkList['program-home'] = 'The default access to the program home page, you can understand the company’s overall strategic planning status'; $lang->my->programLinkList['program-browse'] = 'By default, you go to the program list, where you can view all of the programs'; -//$lang->my->programLinkList['program-index'] = 'By default, you go to the most recent program dashboard to see the current program overview'; $lang->my->programLinkList['program-project'] = 'By default, you go to the list of items in the most recent program, and you can view all items under the current program'; $lang->my->productLinkList = array(); @@ -93,7 +94,12 @@ $lang->my->productLinkList['product-browse'] = 'By default, go to the list of global $config; $lang->my->projectLinkList = array(); -//$lang->my->projectLinkList['project-home'] = 'The default access to the project home page, you can understand the overall project status of the company'; $lang->my->projectLinkList['project-browse'] = 'By default, you go to the project list, where you can view all the projects'; +$lang->my->projectLinkList['project-task'] = 'By default, you go to the task list for the most recent project iteration to see the task information for the current iteration'; $lang->my->projectLinkList['project-execution'] = 'Go to Project-Exection by default. You can check all information in Execution'; -if($config->systemMode == 'new') $lang->my->projectLinkList['project-index'] = 'By default, go to the most recent project dashboard to see the current project overview'; +$lang->my->projectLinkList['project-index'] = 'By default, go to the most recent project dashboard to see the current project overview'; + +$lang->my->executionLinkList = array(); +$lang->my->executionLinkList['execution-index'] = 'Enter the execution dashboard by default, you can understand all the execution statistics and overview'; +$lang->my->executionLinkList['execution-all'] = 'Enter the execution list by default, you can view all executions'; +$lang->my->executionLinkList['execution-task'] = 'By default, enter the list of the most recently executed task, and you can view the task information under the current iteration'; diff --git a/module/my/lang/vi.php b/module/my/lang/vi.php index 4058084793..4ff058e633 100644 --- a/module/my/lang/vi.php +++ b/module/my/lang/vi.php @@ -1,44 +1,46 @@ my->common = ''; +global $config; + +$lang->my->common = 'Dashboard'; /* Method List。*/ -$lang->my->index = 'Trang chủ'; -$lang->my->todo = 'Việc của bạn'; -$lang->my->calendar = 'Lịch trình'; +$lang->my->index = 'Home'; +$lang->my->todo = 'My Todos'; +$lang->my->calendar = 'Schedule'; $lang->my->work = 'Work'; $lang->my->contribute = 'Contribute'; -$lang->my->task = 'Nhiệm vụ'; -$lang->my->bug = 'Bugs của bạn'; -$lang->my->testTask = 'Bản dựng của bạn'; -$lang->my->testCase = 'Tình huống của bạn'; -$lang->my->story = 'Câu chuyện của bạn'; +$lang->my->task = 'My Tasks'; +$lang->my->bug = 'My Bugs'; +$lang->my->testTask = 'My Builds'; +$lang->my->testCase = 'My Cases'; +$lang->my->story = 'My Stories'; $lang->my->createProgram = 'Create Program'; $lang->my->project = "My Projects"; $lang->my->execution = "My {$lang->executionCommon}s"; $lang->my->issue = 'My Issues'; $lang->my->risk = 'My Risks'; -$lang->my->profile = 'Hồ sơ của bạn'; -$lang->my->dynamic = 'Lịch sử của bạn'; +$lang->my->profile = 'My Profile'; +$lang->my->dynamic = 'My Dynamics'; $lang->my->team = 'My Team'; -$lang->my->editProfile = 'Sửa'; -$lang->my->changePassword = 'Sửa mật khẩu'; +$lang->my->editProfile = 'Edit'; +$lang->my->changePassword = 'Edit Password'; $lang->my->preference = 'Preference'; -$lang->my->unbind = 'Gỡ kết nối từ Zdoo'; -$lang->my->manageContacts = 'Quản lý Liên hệ'; -$lang->my->deleteContacts = 'Xóa Liên hệ'; -$lang->my->shareContacts = 'Công khai'; -$lang->my->limited = 'Hành động bị giới hạn (Người dùng chỉ có thể sửa những gì liên quan chúng.)'; -$lang->my->storyConcept = 'Story Concept'; -$lang->my->score = 'Điểm của bạn'; -$lang->my->scoreRule = 'Quy định điểm'; -$lang->my->noTodo = 'Chưa có việc nào.'; +$lang->my->unbind = 'Unbind from Zdoo'; +$lang->my->manageContacts = 'Manage Contact'; +$lang->my->deleteContacts = 'Delete Contact'; +$lang->my->shareContacts = 'Public'; +$lang->my->limited = 'Limited Actions (Users can only edit what involves them.)'; +$lang->my->score = 'My Points'; +$lang->my->scoreRule = 'Point Rules'; +$lang->my->noTodo = 'No todos yet. '; $lang->my->noData = 'No %s yet. '; $lang->my->storyChanged = "Story Changed"; -$lang->my->hours = "Giờ/ngày"; +$lang->my->hours = "Hours/day"; $lang->my->uploadAvatar = 'Upload Avatar'; $lang->my->requirement = "My {$lang->URCommon}"; $lang->my->testtask = 'My Test Task'; $lang->my->testcase = 'My Case'; +$lang->my->storyConcept = 'Story Concept'; $lang->my->myExecutions = "My Stage/Sprint/Iteration"; $lang->my->name = 'Name'; @@ -51,17 +53,17 @@ $lang->my->executionMenu->undone = 'Undone'; $lang->my->executionMenu->done = 'Done'; $lang->my->taskMenu = new stdclass(); -$lang->my->taskMenu->assignedToMe = 'Giao cho bạn'; -$lang->my->taskMenu->openedByMe = 'Tạo bởi bạn'; -$lang->my->taskMenu->finishedByMe = 'Kết thúc bởi bạn'; -$lang->my->taskMenu->closedByMe = 'Đóng bởi bạn'; -$lang->my->taskMenu->canceledByMe = 'Hủy bởi bạn'; +$lang->my->taskMenu->assignedToMe = 'AssignedToMe'; +$lang->my->taskMenu->openedByMe = 'CreatedByMe'; +$lang->my->taskMenu->finishedByMe = 'FinishedByMe'; +$lang->my->taskMenu->closedByMe = 'ClosedByMe'; +$lang->my->taskMenu->canceledByMe = 'CancelledByMe'; $lang->my->storyMenu = new stdclass(); -$lang->my->storyMenu->assignedToMe = 'Giao cho bạn'; -$lang->my->storyMenu->openedByMe = 'Tạo bởi bạn'; -$lang->my->storyMenu->reviewedByMe = 'Duyệt bởi bạn'; -$lang->my->storyMenu->closedByMe = 'Đóng bởi bạn'; +$lang->my->storyMenu->assignedToMe = 'AssignedToMe'; +$lang->my->storyMenu->openedByMe = 'CreatedByMe'; +$lang->my->storyMenu->reviewedByMe = 'ReviewedByMe'; +$lang->my->storyMenu->closedByMe = 'ClosedByMe'; $lang->my->projectMenu = new stdclass(); $lang->my->projectMenu->doing = 'Doing'; @@ -71,18 +73,17 @@ $lang->my->projectMenu->closed = 'Closed'; $lang->my->projectMenu->openedbyme = 'CreatedByMe'; $lang->my->form = new stdclass(); -$lang->my->form->lblBasic = 'Thông tin cơ bản'; -$lang->my->form->lblContact = 'Thông tin liên hệ'; -$lang->my->form->lblAccount = 'Thông tin tài khoản'; +$lang->my->form->lblBasic = 'Basic Info'; +$lang->my->form->lblContact = 'Contact Info'; +$lang->my->form->lblAccount = 'Account Info'; -$lang->my->programLink = 'Program Default Page'; -$lang->my->productLink = 'Product Default Page'; -$lang->my->projectLink = 'Project Default Page'; +$lang->my->programLink = 'Program Default Page'; +$lang->my->productLink = 'Product Default Page'; +$lang->my->projectLink = 'Project Default Page'; +$lang->my->executionLink = 'Execution Default Page'; $lang->my->programLinkList = array(); -//$lang->my->programLinkList['program-home'] = 'The default access to the program home page, you can understand the company’s overall strategic planning status'; $lang->my->programLinkList['program-browse'] = 'By default, you go to the program list, where you can view all of the programs'; -//$lang->my->programLinkList['program-index'] = 'By default, you go to the most recent program dashboard to see the current program overview'; $lang->my->programLinkList['program-project'] = 'By default, you go to the list of items in the most recent program, and you can view all items under the current program'; $lang->my->productLinkList = array(); @@ -93,7 +94,12 @@ $lang->my->productLinkList['product-browse'] = 'By default, go to the list of global $config; $lang->my->projectLinkList = array(); -//$lang->my->projectLinkList['project-home'] = 'The default access to the project home page, you can understand the overall project status of the company'; $lang->my->projectLinkList['project-browse'] = 'By default, you go to the project list, where you can view all the projects'; +$lang->my->projectLinkList['project-task'] = 'By default, you go to the task list for the most recent project iteration to see the task information for the current iteration'; $lang->my->projectLinkList['project-execution'] = 'Go to Project-Exection by default. You can check all information in Execution'; -if($config->systemMode == 'new') $lang->my->projectLinkList['project-index'] = 'By default, go to the most recent project dashboard to see the current project overview'; +$lang->my->projectLinkList['project-index'] = 'By default, go to the most recent project dashboard to see the current project overview'; + +$lang->my->executionLinkList = array(); +$lang->my->executionLinkList['execution-index'] = 'Enter the execution dashboard by default, you can understand all the execution statistics and overview'; +$lang->my->executionLinkList['execution-all'] = 'Enter the execution list by default, you can view all executions'; +$lang->my->executionLinkList['execution-task'] = 'By default, enter the list of the most recently executed task, and you can view the task information under the current iteration'; diff --git a/module/my/lang/zh-cn.php b/module/my/lang/zh-cn.php index 1c6ee84840..a4161c8974 100644 --- a/module/my/lang/zh-cn.php +++ b/module/my/lang/zh-cn.php @@ -77,14 +77,13 @@ $lang->my->form->lblBasic = '基本信息'; $lang->my->form->lblContact = '联系信息'; $lang->my->form->lblAccount = '帐号信息'; -$lang->my->programLink = '项目集默认着陆页'; -$lang->my->productLink = '产品默认着陆页'; -$lang->my->projectLink = '项目默认着陆页'; +$lang->my->programLink = '项目集默认着陆页'; +$lang->my->productLink = '产品默认着陆页'; +$lang->my->projectLink = '项目默认着陆页'; +$lang->my->executionLink = '执行默认着陆页'; $lang->my->programLinkList = array(); -//$lang->my->programLinkList['program-home'] = '默认进入项目集主页，可以了解公司整体的战略规划状况'; $lang->my->programLinkList['program-browse'] = '默认进入项目集列表，可以查看所有的项目集'; -//$lang->my->programLinkList['program-index'] = '默认进入最近一个项目集仪表盘，可以查看当前项目集概况'; $lang->my->programLinkList['program-project'] = '默认进入最近一个项目集的项目列表，可以查看当前项目集下所有项目'; $lang->my->productLinkList = array(); @@ -95,7 +94,12 @@ $lang->my->productLinkList['product-browse'] = '默认进入最近一个产 global $config; $lang->my->projectLinkList = array(); -//$lang->my->projectLinkList['project-home'] = '默认进入项目主页，可以了解公司整体的项目状况'; $lang->my->projectLinkList['project-browse'] = '默认进入项目列表，可以查看所有的项目'; +$lang->my->projectLinkList['project-task'] = '默认进入最近一个项目迭代的任务列表，可以查看当前迭代下的任务信息'; $lang->my->projectLinkList['project-execution'] = '默认进入项目下所有执行列表，查看所有执行信息'; -if($config->systemMode == 'new') $lang->my->projectLinkList['project-index'] = '默认进入最近一个项目仪表盘，可以查看当前项目概况'; +$lang->my->projectLinkList['project-index'] = '默认进入最近一个项目仪表盘，可以查看当前项目概况'; + +$lang->my->executionLinkList = array(); +$lang->my->executionLinkList['execution-index'] = '默认进入执行仪表盘，可以了解所有执行的统计数据和概况'; +$lang->my->executionLinkList['execution-all'] = '默认进入执行列表，可以查看所有的执行'; +$lang->my->executionLinkList['execution-task'] = '默认进入最近一个执行的任务列表，可以查看当前迭代下的任务信息'; diff --git a/module/my/lang/zh-tw.php b/module/my/lang/zh-tw.php index e8d1e96b65..86b24ac7ac 100644 --- a/module/my/lang/zh-tw.php +++ b/module/my/lang/zh-tw.php @@ -1,4 +1,6 @@ my->common = '我的地盤'; /* 方法列表。*/ @@ -28,7 +30,6 @@ $lang->my->manageContacts = '維護聯繫人'; $lang->my->deleteContacts = '刪除聯繫人'; $lang->my->shareContacts = '共享聯繫人列表'; $lang->my->limited = '受限操作(只能編輯與自己相關的內容)'; -$lang->my->storyConcept = '預設需求概念組合'; $lang->my->score = '我的積分'; $lang->my->scoreRule = '積分規則'; $lang->my->noTodo = '暫時沒有待辦。'; @@ -39,6 +40,7 @@ $lang->my->uploadAvatar = '更換頭像'; $lang->my->requirement = "我的{$lang->URCommon}"; $lang->my->testtask = '我的測試單'; $lang->my->testcase = '我的用例'; +$lang->my->storyConcept = $config->URAndSR ? '預設需求概念組合' : '預設需求概念'; $lang->my->myExecutions = "我參與的階段/衝刺/迭代"; $lang->my->name = '名稱'; @@ -75,14 +77,13 @@ $lang->my->form->lblBasic = '基本信息'; $lang->my->form->lblContact = '聯繫信息'; $lang->my->form->lblAccount = '帳號信息'; -$lang->my->programLink = '項目集預設着陸頁'; -$lang->my->productLink = '產品預設着陸頁'; -$lang->my->projectLink = '項目預設着陸頁'; +$lang->my->programLink = '項目集預設着陸頁'; +$lang->my->productLink = '產品預設着陸頁'; +$lang->my->projectLink = '項目預設着陸頁'; +$lang->my->executionLink = '執行預設着陸頁'; $lang->my->programLinkList = array(); -//$lang->my->programLinkList['program-home'] = '預設進入項目集主頁，可以瞭解公司整體的戰略規劃狀況'; $lang->my->programLinkList['program-browse'] = '預設進入項目集列表，可以查看所有的項目集'; -//$lang->my->programLinkList['program-index'] = '預設進入最近一個項目集儀表盤，可以查看當前項目集概況'; $lang->my->programLinkList['program-project'] = '預設進入最近一個項目集的項目列表，可以查看當前項目集下所有項目'; $lang->my->productLinkList = array(); @@ -93,7 +94,11 @@ $lang->my->productLinkList['product-browse'] = '預設進入最近一個產 global $config; $lang->my->projectLinkList = array(); -//$lang->my->projectLinkList['project-home'] = '預設進入項目主頁，可以瞭解公司整體的項目狀況'; $lang->my->projectLinkList['project-browse'] = '預設進入項目列表，可以查看所有的項目'; $lang->my->projectLinkList['project-task'] = '預設進入最近一個項目迭代的任務列表，可以查看當前迭代下的任務信息'; -if($config->systemMode == 'new') $lang->my->projectLinkList['program-index'] = '預設進入最近一個項目儀表盤，可以查看當前項目概況'; +$lang->my->projectLinkList['project-index'] = '預設進入最近一個項目儀表盤，可以查看當前項目概況'; + +$lang->my->executionLinkList = array(); +$lang->my->executionLinkList['execution-index'] = '預設進入執行儀表盤，可以瞭解所有執行的統計數據和概況'; +$lang->my->executionLinkList['execution-all'] = '預設進入執行列表，可以查看所有的執行'; +$lang->my->executionLinkList['execution-task'] = '預設進入最近一個執行的任務列表，可以查看當前迭代下的任務信息'; diff --git a/module/my/view/preference.html.php b/module/my/view/preference.html.php index b099df069c..6f6ca08a32 100755 --- a/module/my/view/preference.html.php +++ b/module/my/view/preference.html.php @@ -49,10 +49,16 @@ html,body {height: 100%;} my->productLink;?> my->productLinkList, $productLink, "class='form-control chosen'");?> + config->systemMode == 'new'):?> my->projectLink;?> my->projectLinkList, $projectLink, "class='form-control chosen'");?> + + + my->executionLink;?> + my->executionLinkList, $executionLink, "class='form-control chosen'");?> + diff --git a/tools/check.php b/tools/check.php index cdfc05af3a..88d92e13f0 100755 --- a/tools/check.php +++ b/tools/check.php @@ -6,10 +6,11 @@ class control {} $config = new stdclass(); $config->global = new stdclass(); -$config->global->flow = 'full'; -$config->programLink = '-'; -$config->productLink = '-'; -$config->projectLink = '-'; +$config->global->flow = 'full'; +$config->programLink = '-'; +$config->productLink = '-'; +$config->projectLink = '-'; +$config->executionLink = '-'; /* set module root path and included the resource of group module. */ $moduleRoot = '../module/'; diff --git a/tools/minifyfront.php b/tools/minifyfront.php index 532e24e8d0..4aa25288ce 100755 --- a/tools/minifyfront.php +++ b/tools/minifyfront.php @@ -35,9 +35,10 @@ $themeRoot = $baseDir . '/www/theme/'; /* Iinclude config and lang file to get langs and themes. */ $config = new stdclass(); -$config->programLink = '-'; -$config->productLink = '-'; -$config->projectLink = '-'; +$config->programLink = '-'; +$config->productLink = '-'; +$config->projectLink = '-'; +$config->executionLink = '-'; include $baseDir . '/config/config.php'; $lang = new stdclass();