diff --git a/module/block/lang/de.php b/module/block/lang/de.php index 885a505390..b96aa555ef 100644 --- a/module/block/lang/de.php +++ b/module/block/lang/de.php @@ -47,11 +47,11 @@ $lang->block->myProduct = '' . $lang->productCommon; $lang->block->delayed = 'Verspätet'; $lang->block->noData = 'Keine Daten für diesen Bericht.'; $lang->block->emptyTip = 'Keine Information'; -$lang->block->createdTodo = 'The Number Of Todos Created'; -$lang->block->createdStory = 'The Number Of Stories Created'; -$lang->block->finishedTask = 'The Number Of Tasks Resolved'; -$lang->block->resolvedBug = 'The Number Of Bugs Resolved'; -$lang->block->createdCase = 'The Number Of Test Case Created'; +$lang->block->createdTodos = 'Todos Created'; +$lang->block->createdStories = 'Stories Created'; +$lang->block->finishedTasks = 'Tasks Finished'; +$lang->block->resolvedBugs = 'Bugs Resolved'; +$lang->block->createdCases = 'Cases Created'; $lang->block->waterfall = 'CMMI 3'; $lang->block->scrum = 'Scrum+'; $lang->block->allProject = 'All ' . $lang->projectCommon; diff --git a/module/block/lang/en.php b/module/block/lang/en.php index 343249f478..f78ddb5336 100644 --- a/module/block/lang/en.php +++ b/module/block/lang/en.php @@ -47,11 +47,11 @@ $lang->block->myProduct = '' . $lang->productCommon . 's'; $lang->block->delayed = 'Delayed'; $lang->block->noData = 'No data on this type of reports.'; $lang->block->emptyTip = 'No data.'; -$lang->block->createdTodo = 'The Number Of Todos Created'; -$lang->block->createdStory = 'The Number Of Stories Created'; -$lang->block->finishedTask = 'The Number Of Tasks Resolved'; -$lang->block->resolvedBug = 'The Number Of Bugs Resolved'; -$lang->block->createdCase = 'The Number Of Test Case Created'; +$lang->block->createdTodos = 'Todos Created'; +$lang->block->createdStories = 'Stories Created'; +$lang->block->finishedTasks = 'Tasks Finished'; +$lang->block->resolvedBugs = 'Bugs Resolved'; +$lang->block->createdCases = 'Cases Created'; $lang->block->waterfall = 'CMMI 3'; $lang->block->scrum = 'Scrum+'; $lang->block->allProject = 'All ' . $lang->projectCommon; diff --git a/module/block/lang/fr.php b/module/block/lang/fr.php index c054edbd32..844c9747cb 100644 --- a/module/block/lang/fr.php +++ b/module/block/lang/fr.php @@ -47,11 +47,11 @@ $lang->block->myProduct = '' . $lang->productCommon . 's'; $lang->block->delayed = 'Ajourné'; $lang->block->noData = 'Pas de données pour ce type de rapport.'; $lang->block->emptyTip = 'No data.'; -$lang->block->createdTodo = 'The Number Of Todos Created'; -$lang->block->createdStory = 'The Number Of Stories Created'; -$lang->block->finishedTask = 'The Number Of Tasks Resolved'; -$lang->block->resolvedBug = 'The Number Of Bugs Resolved'; -$lang->block->createdCase = 'The Number Of Test Case Created'; +$lang->block->createdTodos = 'Todos Created'; +$lang->block->createdStories = 'Stories Created'; +$lang->block->finishedTasks = 'Tasks Finished'; +$lang->block->resolvedBugs = 'Bugs Resolved'; +$lang->block->createdCases = 'Cases Created'; $lang->block->waterfall = 'CMMI 3'; $lang->block->scrum = 'Scrum+'; $lang->block->allProject = 'All ' . $lang->projectCommon; diff --git a/module/block/lang/vi.php b/module/block/lang/vi.php index df37d31a56..2758ebd7c6 100644 --- a/module/block/lang/vi.php +++ b/module/block/lang/vi.php @@ -47,11 +47,11 @@ $lang->block->myProduct = '' . $lang->productCommon; $lang->block->delayed = 'Tạm ngưng'; $lang->block->noData = 'Không có dữ liệu trên loại báo cáo này.'; $lang->block->emptyTip = 'Không có dữ liệu.'; -$lang->block->createdTodo = 'The Number Of Todos Created'; -$lang->block->createdStory = 'The Number Of Stories Created'; -$lang->block->finishedTask = 'The Number Of Tasks Resolved'; -$lang->block->resolvedBug = 'The Number Of Bugs Resolved'; -$lang->block->createdCase = 'The Number Of Test Case Created'; +$lang->block->createdTodos = 'Todos Created'; +$lang->block->createdStories = 'Stories Created'; +$lang->block->finishedTasks = 'Tasks Finished'; +$lang->block->resolvedBugs = 'Bugs Resolved'; +$lang->block->createdCases = 'Cases Created'; $lang->block->waterfall = 'CMMI 3'; $lang->block->scrum = 'Scrum+'; $lang->block->allProject = 'All ' . $lang->projectCommon; diff --git a/module/block/lang/zh-cn.php b/module/block/lang/zh-cn.php index 89f50aa5ca..239b93b26a 100644 --- a/module/block/lang/zh-cn.php +++ b/module/block/lang/zh-cn.php @@ -47,11 +47,11 @@ $lang->block->myProduct = '未关闭的' . $lang->productCommon; $lang->block->delayed = '已延期'; $lang->block->noData = '当前统计类型下暂无数据'; $lang->block->emptyTip = '暂无信息'; -$lang->block->createdTodo = '创建的待办数'; -$lang->block->createdStory = '创建的软件需求数'; -$lang->block->finishedTask = '完成的任务数'; -$lang->block->resolvedBug = '解决的Bug数'; -$lang->block->createdCase = '创建的用例数'; +$lang->block->createdTodos = '创建的待办数'; +$lang->block->createdStories = '创建的软件需求数'; +$lang->block->finishedTasks = '完成的任务数'; +$lang->block->resolvedBugs = '解决的Bug数'; +$lang->block->createdCases = '创建的用例数'; $lang->block->waterfall = 'CMMI 3'; $lang->block->scrum = 'Scrum+'; $lang->block->allProject = '所有' . $lang->projectCommon; diff --git a/module/block/lang/zh-tw.php b/module/block/lang/zh-tw.php index a5fc048c59..3405797d9b 100644 --- a/module/block/lang/zh-tw.php +++ b/module/block/lang/zh-tw.php @@ -36,22 +36,22 @@ $lang->block->lblFlowchart = '流程圖'; $lang->block->welcome = '歡迎總覽'; $lang->block->lblTesttask = '查看測試詳情'; -$lang->block->leftToday = '今天剩餘工作總計'; -$lang->block->myTask = '我的任務'; -$lang->block->myStory = "我的{$lang->storyCommon}"; -$lang->block->myBug = '我的BUG'; -$lang->block->myProject = '未關閉的' . $lang->projectCommon; -$lang->block->myProduct = '未關閉的' . $lang->productCommon; -$lang->block->delayed = '已延期'; -$lang->block->noData = '當前統計類型下暫無數據'; -$lang->block->emptyTip = '暫無信息'; -$lang->block->openedTodos = '創建的待辦數'; -$lang->block->openedStories = '創建的需求數'; -$lang->block->resolvedTasks = '完成的任務數'; -$lang->block->resolvedBugs = '解決Bug數'; -$lang->block->openedTestcases = '創建用例數'; -$lang->block->waterfall = 'CMMI 3'; -$lang->block->scrum = 'Scrum+'; +$lang->block->leftToday = '今天剩餘工作總計'; +$lang->block->myTask = '我的任務'; +$lang->block->myStory = "我的{$lang->storyCommon}"; +$lang->block->myBug = '我的BUG'; +$lang->block->myProject = '未關閉的' . $lang->projectCommon; +$lang->block->myProduct = '未關閉的' . $lang->productCommon; +$lang->block->delayed = '已延期'; +$lang->block->noData = '當前統計類型下暫無數據'; +$lang->block->emptyTip = '暫無信息'; +$lang->block->createdTodos = '創建的待辦數'; +$lang->block->createdStories = '創建的需求數'; +$lang->block->finishedTasks = '完成的任務數'; +$lang->block->resolvedBugs = '解決Bug數'; +$lang->block->createdCases = '創建用例數'; +$lang->block->waterfall = 'CMMI 3'; +$lang->block->scrum = 'Scrum+'; $lang->block->params = new stdclass(); $lang->block->params->name = '參數名稱'; diff --git a/module/block/view/contribute.html.php b/module/block/view/contribute.html.php index f64d7207b0..5f9990f4fb 100644 --- a/module/block/view/contribute.html.php +++ b/module/block/view/contribute.html.php @@ -3,24 +3,24 @@
-
block->createdTodo;?>
-
createLink('my', 'todo', 'type=all'), (int)$data['createdTodo']);?>
+
block->createdTodos;?>
+
createLink('my', 'todo', 'type=all'), (int)$data['createdTodos']);?>
-
block->createdStory;?>
-
createLink('my', 'story', 'type=openedBy'), (int)$data['createdStory']);?>
+
block->createdStories;?>
+
createLink('my', 'story', 'type=openedBy'), (int)$data['createdStories']);?>
-
block->finishedTask;?>
-
createLink('my', 'task', 'type=finishedBy'), (int)$data['finishedTask']);?>
+
block->finishedTasks;?>
+
createLink('my', 'task', 'type=finishedBy'), (int)$data['finishedTasks']);?>
-
block->resolvedBug;?>
-
createLink('my', 'bug', 'type=resolvedBy'), (int)$data['resolvedBug']);?>
+
block->resolvedBugs;?>
+
createLink('my', 'bug', 'type=resolvedBy'), (int)$data['resolvedBugs']);?>
-
block->createdCase;?>
-
createLink('my', 'testcase', 'type=openedbyme'), (int)$data['createdCase']);?>
+
block->createdCases;?>
+
createLink('my', 'testcase', 'type=openedbyme'), (int)$data['createdCases']);?>
diff --git a/module/user/lang/de.php b/module/user/lang/de.php index 5eef3c6d5c..4c8eae49ee 100644 --- a/module/user/lang/de.php +++ b/module/user/lang/de.php @@ -142,11 +142,11 @@ $lang->user->passwordStrengthList[2] = "Stark"; $lang->user->statusList['active'] = 'Aktiviert'; $lang->user->statusList['delete'] = 'Gelöscht'; -$lang->user->personalData['createdTodo'] = 'Todos Created'; -$lang->user->personalData['createdStory'] = 'Stories Created'; -$lang->user->personalData['finishedTask'] = 'Tasks Finished'; -$lang->user->personalData['resolvedBug'] = 'Bugs Resolved'; -$lang->user->personalData['createdCase'] = 'Cases Created'; +$lang->user->personalData['createdTodos'] = 'Todos Created'; +$lang->user->personalData['createdStories'] = 'Stories Created'; +$lang->user->personalData['finishedTasks'] = 'Tasks Finished'; +$lang->user->personalData['resolvedBugs'] = 'Bugs Resolved'; +$lang->user->personalData['createdCases'] = 'Cases Created'; $lang->user->keepLogin['on'] = 'Angemeldet bleiben'; $lang->user->loginWithDemoUser = 'Login als Demo User:'; diff --git a/module/user/lang/en.php b/module/user/lang/en.php index 305d6bb547..8e263e4da0 100644 --- a/module/user/lang/en.php +++ b/module/user/lang/en.php @@ -142,11 +142,11 @@ $lang->user->passwordStrengthList[2] = "Strong" $lang->user->statusList['active'] = 'Active'; $lang->user->statusList['delete'] = 'Deleted'; -$lang->user->personalData['createdTodo'] = 'Todos Created'; -$lang->user->personalData['createdStory'] = 'Stories Created'; -$lang->user->personalData['finishedTask'] = 'Tasks Finished'; -$lang->user->personalData['resolvedBug'] = 'Bugs Resolved'; -$lang->user->personalData['createdCase'] = 'Cases Created'; +$lang->user->personalData['createdTodos'] = 'Todos Created'; +$lang->user->personalData['createdStories'] = 'Stories Created'; +$lang->user->personalData['finishedTasks'] = 'Tasks Finished'; +$lang->user->personalData['resolvedBugs'] = 'Bugs Resolved'; +$lang->user->personalData['createdCases'] = 'Cases Created'; $lang->user->keepLogin['on'] = 'Keep Login'; $lang->user->loginWithDemoUser = 'Login as Demo User:'; diff --git a/module/user/lang/fr.php b/module/user/lang/fr.php index 8aa8534f07..61078c44f4 100644 --- a/module/user/lang/fr.php +++ b/module/user/lang/fr.php @@ -142,11 +142,11 @@ $lang->user->passwordStrengthList[2] = "Fort"; $lang->user->statusList['active'] = 'Actif'; $lang->user->statusList['delete'] = 'Supprimé'; -$lang->user->personalData['createdTodo'] = 'Entrées Agenda Créées'; -$lang->user->personalData['createdStory'] = 'Stories Créées'; -$lang->user->personalData['finishedTask'] = 'Tâches Terminées'; -$lang->user->personalData['resolvedBug'] = 'Bugs Résolus'; -$lang->user->personalData['createdCase'] = 'CasTests Créés'; +$lang->user->personalData['createdTodos'] = 'Entrées Agenda Créées'; +$lang->user->personalData['createdStories'] = 'Stories Créées'; +$lang->user->personalData['finishedTasks'] = 'Tâches Terminées'; +$lang->user->personalData['resolvedBugs'] = 'Bugs Résolus'; +$lang->user->personalData['createdCases'] = 'CasTests Créés'; $lang->user->keepLogin['on'] = 'Rester connecté'; $lang->user->loginWithDemoUser = "Se connecté en tant qu'invité :"; diff --git a/module/user/lang/vi.php b/module/user/lang/vi.php index 2959a0fe5e..67f2965862 100644 --- a/module/user/lang/vi.php +++ b/module/user/lang/vi.php @@ -142,11 +142,11 @@ $lang->user->passwordStrengthList[2] = "Mạnh" $lang->user->statusList['active'] = 'Kích hoạt'; $lang->user->statusList['delete'] = 'Đã xóa'; -$lang->user->personalData['createdTodo'] = 'Việc đã tạo'; -$lang->user->personalData['createdStory'] = 'Chuyện đã tạo'; -$lang->user->personalData['finishedTask'] = 'Nhiệm vụ đã kết thúc'; -$lang->user->personalData['resolvedBug'] = 'Bugs đã giải quyết'; -$lang->user->personalData['createdCase'] = 'Tình huống đã tạo'; +$lang->user->personalData['createdTodos'] = 'Việc đã tạo'; +$lang->user->personalData['createdStories'] = 'Chuyện đã tạo'; +$lang->user->personalData['finishedTasks'] = 'Nhiệm vụ đã kết thúc'; +$lang->user->personalData['resolvedBugs'] = 'Bugs đã giải quyết'; +$lang->user->personalData['createdCases'] = 'Tình huống đã tạo'; $lang->user->keepLogin['on'] = 'Duy trì đăng nhập'; $lang->user->loginWithDemoUser = 'Đăng nhập Demo:'; diff --git a/module/user/lang/zh-cn.php b/module/user/lang/zh-cn.php index 7182e07bb0..97f9e31a9e 100644 --- a/module/user/lang/zh-cn.php +++ b/module/user/lang/zh-cn.php @@ -142,11 +142,11 @@ $lang->user->passwordStrengthList[2] = "强"; $lang->user->statusList['active'] = '正常'; $lang->user->statusList['delete'] = '删除'; -$lang->user->personalData['createdTodo'] = '创建的待办数'; -$lang->user->personalData['createdStory'] = "创建的{$lang->storyCommon}数"; -$lang->user->personalData['finishedTask'] = '完成的任务数'; -$lang->user->personalData['resolvedBug'] = '解决的Bug数'; -$lang->user->personalData['createdCase'] = '创建的用例数'; +$lang->user->personalData['createdTodos'] = '创建的待办数'; +$lang->user->personalData['createdStories'] = "创建的{$lang->storyCommon}数"; +$lang->user->personalData['finishedTasks'] = '完成的任务数'; +$lang->user->personalData['resolvedBugs'] = '解决的Bug数'; +$lang->user->personalData['createdCases'] = '创建的用例数'; $lang->user->keepLogin['on'] = '保持登录'; $lang->user->loginWithDemoUser = '使用demo帐号登录：'; diff --git a/module/user/lang/zh-tw.php b/module/user/lang/zh-tw.php index f50429dba5..5df617d82b 100644 --- a/module/user/lang/zh-tw.php +++ b/module/user/lang/zh-tw.php @@ -140,11 +140,11 @@ $lang->user->passwordStrengthList[2] = "強"; $lang->user->statusList['active'] = '正常'; $lang->user->statusList['delete'] = '刪除'; -$lang->user->personalData['createdTodo'] = '創建的待辦數'; -$lang->user->personalData['createdStory'] = "創建的{$lang->storyCommon}數"; -$lang->user->personalData['finishedTask'] = '完成的任務數'; -$lang->user->personalData['resolvedBug'] = '解決的Bug數'; -$lang->user->personalData['createdCase'] = '創建的用例數'; +$lang->user->personalData['createdTodos'] = '創建的待辦數'; +$lang->user->personalData['createdStories'] = "創建的{$lang->storyCommon}數"; +$lang->user->personalData['finishedTasks'] = '完成的任務數'; +$lang->user->personalData['resolvedBugs'] = '解決的Bug數'; +$lang->user->personalData['createdCases'] = '創建的用例數'; $lang->user->keepLogin['on'] = '保持登錄'; $lang->user->loginWithDemoUser = '使用demo帳號登錄：'; diff --git a/module/user/model.php b/module/user/model.php index a9089b8b45..6604699fa6 100644 --- a/module/user/model.php +++ b/module/user/model.php @@ -1857,11 +1857,11 @@ class userModel extends model $count = 'count(*) AS count'; $personalData = array(); - $personalData['createdTodo'] = $this->dao->select($count)->from(TABLE_TODO)->where('account')->eq($account)->fetch('count'); - $personalData['createdStory'] = $this->dao->select($count)->from(TABLE_STORY)->where('openedBy')->eq($account)->andWhere('deleted')->eq('0')->andWhere('type')->eq('story')->fetch('count'); - $personalData['resolvedBug'] = $this->dao->select($count)->from(TABLE_BUG)->where('resolvedBy')->eq($account)->andWhere('deleted')->eq('0')->fetch('count'); - $personalData['createdCase'] = $this->dao->select($count)->from(TABLE_CASE)->where('openedBy')->eq($account)->andWhere('deleted')->eq('0')->andWhere('product')->ne(0)->fetch('count'); - $personalData['finishedTask'] = $this->dao->select($count)->from(TABLE_TASK)->where('deleted')->eq('0') + $personalData['createdTodos'] = $this->dao->select($count)->from(TABLE_TODO)->where('account')->eq($account)->fetch('count'); + $personalData['createdStories'] = $this->dao->select($count)->from(TABLE_STORY)->where('openedBy')->eq($account)->andWhere('deleted')->eq('0')->andWhere('type')->eq('story')->fetch('count'); + $personalData['resolvedBugs'] = $this->dao->select($count)->from(TABLE_BUG)->where('resolvedBy')->eq($account)->andWhere('deleted')->eq('0')->fetch('count'); + $personalData['createdCases'] = $this->dao->select($count)->from(TABLE_CASE)->where('openedBy')->eq($account)->andWhere('deleted')->eq('0')->andWhere('product')->ne(0)->fetch('count'); + $personalData['finishedTasks'] = $this->dao->select($count)->from(TABLE_TASK)->where('deleted')->eq('0') ->andWhere('finishedBy', true)->eq($account) ->orWhere('finishedList')->like("%,{$account},%") ->markRight(1)