From 9ee83dab29566e10ec9cd2c04a11d1f8e280506e Mon Sep 17 00:00:00 2001 From: "shiyangyangwork@yahoo.cn" Date: Sat, 4 Feb 2012 03:00:06 +0000 Subject: [PATCH] * finish the task #721. --- module/common/lang/en.php | 2 +- module/common/lang/zh-cn.php | 2 +- module/my/control.php | 2 +- module/my/view/todo.html.php | 6 +++--- module/product/view/roadmap.html.php | 2 +- module/todo/lang/en.php | 2 +- module/todo/lang/zh-cn.php | 2 +- module/todo/model.php | 6 +++--- module/todo/view/view.html.php | 2 +- module/user/view/todo.html.php | 2 +- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/module/common/lang/en.php b/module/common/lang/en.php index 8deea8c998..d03aba5db1 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -62,7 +62,7 @@ $lang->notFound = 'Sorry, the object not found.'; $lang->showAll = '++ Show All ++'; $lang->hideClosed = '-- Hide Closed--'; -$lang->feature = 'Feature'; +$lang->future = 'Future'; $lang->year = 'Year'; $lang->workingHour = 'Hour'; diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index f3b557b657..da032065ec 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -62,7 +62,7 @@ $lang->notFound = '抱歉，您访问的对象并不存在！'; $lang->showAll = '++ 全部显示 ++'; $lang->hideClosed = '-- 隐藏已结束 --'; -$lang->feature = '未来'; +$lang->future = '未来'; $lang->year = '年'; $lang->workingHour = '工时'; diff --git a/module/my/control.php b/module/my/control.php index 36d89bd48d..29b77d7591 100644 --- a/module/my/control.php +++ b/module/my/control.php @@ -82,7 +82,7 @@ class my extends control $this->view->date = (int)$type == 0 ? $this->todo->today() : $type; $this->view->type = $type; $this->view->account = $this->app->user->account; - $this->view->importFeature = ($type == 'before' or $type == TODOMODEL::DAY_IN_FEATURE); + $this->view->importFuture = ($type == 'before' or $type == TODOMODEL::DAY_IN_FUTURE); $this->display(); } diff --git a/module/my/view/todo.html.php b/module/my/view/todo.html.php index 994fc4d6a1..eddc0683af 100644 --- a/module/my/view/todo.html.php +++ b/module/my/view/todo.html.php @@ -53,11 +53,11 @@ id' /> "; + if($importFuture) echo " "; echo $todo->id; ?> - date == '2030-01-01' ? $lang->todo->dayInFeature : $todo->date;?> + date == '2030-01-01' ? $lang->todo->dayInFuture : $todo->date;?> todo->typeList->{$todo->type};?> pri;?> createLink('todo', 'view', "id=$todo->id&from=my"), $todo->name);?> @@ -75,7 +75,7 @@ - + diff --git a/module/product/view/roadmap.html.php b/module/product/view/roadmap.html.php index 12191ca44c..9c14ab8ca5 100644 --- a/module/product/view/roadmap.html.php +++ b/module/product/view/roadmap.html.php @@ -18,7 +18,7 @@ echo ''; foreach($years as $year) { - $year = $year == '0000' ? $lang->feature : $year . $lang->year; + $year = $year == '0000' ? $lang->future : $year . $lang->year; echo "$year"; } echo ''; diff --git a/module/todo/lang/en.php b/module/todo/lang/en.php index a70fc26385..0893ba9fd1 100644 --- a/module/todo/lang/en.php +++ b/module/todo/lang/en.php @@ -44,7 +44,7 @@ $lang->todo->idvalue = 'Task or bug'; $lang->todo->week = '(l)'; // date function's param. $lang->todo->today = 'Today'; $lang->todo->weekDateList = ''; -$lang->todo->dayInFeature = 'Feature'; +$lang->todo->dayInFuture = 'Future'; $lang->todo->confirmBug = 'This todo linked to bug #%s，chang it also?'; $lang->todo->confirmTask = 'This todo linked to task #%s，chang it also?'; diff --git a/module/todo/lang/zh-cn.php b/module/todo/lang/zh-cn.php index d25f3434bf..1a8c2a3bfc 100644 --- a/module/todo/lang/zh-cn.php +++ b/module/todo/lang/zh-cn.php @@ -44,7 +44,7 @@ $lang->todo->idvalue = '任务或Bug'; $lang->todo->week = '星期'; $lang->todo->today = '今天'; $lang->todo->weekDateList = '一,二,三,四,五,六,天'; -$lang->todo->dayInFeature = '暂不指定'; +$lang->todo->dayInFuture = '暂不指定'; $lang->todo->confirmBug = '该Todo关联的是Bug #%s，需要修改它吗？'; $lang->todo->confirmTask = '该Todo关联的是Task #%s，需要修改它吗？'; diff --git a/module/todo/model.php b/module/todo/model.php index b0454e9c5e..5b58f7a5dd 100644 --- a/module/todo/model.php +++ b/module/todo/model.php @@ -13,7 +13,7 @@ lang->todo->dayInFeature; + $dates[self::DAY_IN_FUTURE] = $this->lang->todo->dayInFuture; return $dates; } @@ -370,7 +370,7 @@ class todoModel extends model /** * Get the time at the middle of this week. * - * If today in week is 1, move it one day in feature. Else is 7, move it back one day. To keep the time geted in this week. + * If today in week is 1, move it one day in future. Else is 7, move it back one day. To keep the time geted in this week. * * @access private * @return time diff --git a/module/todo/view/view.html.php b/module/todo/view/view.html.php index b8e358ef55..207778ec3e 100644 --- a/module/todo/view/view.html.php +++ b/module/todo/view/view.html.php @@ -20,7 +20,7 @@ todo->date;?> - date == TODOModel::DAY_IN_FEATURE ? $lang->todo->dayInFeature : date(DT_DATE1, strtotime($todo->date)));?> + date == TODOModel::DAY_IN_FUTURE ? $lang->todo->dayInFuture : date(DT_DATE1, strtotime($todo->date)));?> todo->type;?> diff --git a/module/user/view/todo.html.php b/module/user/view/todo.html.php index f476e98998..04059ca054 100644 --- a/module/user/view/todo.html.php +++ b/module/user/view/todo.html.php @@ -45,7 +45,7 @@ id;?> - date == '2030-01-01' ? $lang->todo->dayInFeature : $todo->date;?> + date == '2030-01-01' ? $lang->todo->dayInFuture : $todo->date;?> todo->typeList->{$todo->type};?> pri;?> id", $todo->name)) echo $todo->name;?>