From 7ea61a8c294e0ebc7db3c75771899fc60fd75b2d Mon Sep 17 00:00:00 2001
From: zhujinyong <zhujinyong@cnezsoft.com>
Date: Fri, 18 Jan 2013 08:41:32 +0000
Subject: [PATCH]  * change 'delay' to 'put off'.

---
 module/project/control.php                              | 8 ++++----
 module/project/lang/en.php                              | 2 +-
 module/project/lang/zh-cn.php                           | 2 +-
 module/project/model.php                                | 6 +++---
 module/project/view/{delay.html.php => putoff.html.php} | 0
 module/project/view/view.html.php                       | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)
 rename module/project/view/{delay.html.php => putoff.html.php} (100%)

diff --git a/module/project/control.php b/module/project/control.php
index 7ec7d51961..681c882b24 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -933,14 +933,14 @@ class project extends control
      * @access public
      * @return void
      */
-    public function delay($projectID)
+    public function putoff($projectID)
     {
         $this->commonAction($projectID);
         
         if(!empty($_POST))
         {
             $this->loadModel('action');
-            $changes = $this->project->delay($projectID);
+            $changes = $this->project->putoff($projectID);
             if(dao::isError()) die(js::error(dao::getError()));
 
             if($this->post->comment != '' or !empty($changes))
@@ -951,8 +951,8 @@ class project extends control
             die(js::locate($this->createLink('project', 'view', "projectID=$projectID"), 'parent'));
         }
 
-        $this->view->header->title = $this->view->project->name . $this->lang->colon .$this->lang->project->delay;
-        $this->view->position[]    = $this->lang->project->delay;
+        $this->view->header->title = $this->view->project->name . $this->lang->colon .$this->lang->project->putoff;
+        $this->view->position[]    = $this->lang->project->putoff;
         $this->display();
     }
 
diff --git a/module/project/lang/en.php b/module/project/lang/en.php
index 923ea4bb05..5b8fb1f6e2 100644
--- a/module/project/lang/en.php
+++ b/module/project/lang/en.php
@@ -56,7 +56,7 @@ $lang->project->all           = 'All';
 
 $lang->project->start    = 'Start';
 $lang->project->activate = 'Activate';
-$lang->project->delay    = 'Delay';
+$lang->project->putoff   = 'Putoff';
 $lang->project->suspend  = 'Suspend';
 $lang->project->close    = 'Close';
 
diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php
index f360a3ae78..a19fb57b94 100644
--- a/module/project/lang/zh-cn.php
+++ b/module/project/lang/zh-cn.php
@@ -56,7 +56,7 @@ $lang->project->all           = '所有';
 
 $lang->project->start    = '开始';
 $lang->project->activate = '激活';
-$lang->project->delay    = '延期';
+$lang->project->putoff   = '延期';
 $lang->project->suspend  = '挂起';
 $lang->project->close    = '结束';
 
diff --git a/module/project/model.php b/module/project/model.php
index 0181d20594..6251364bf0 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -360,13 +360,13 @@ class projectModel extends model
     }
 
     /**
-     * Delay project.
+     * Put project off.
      * 
      * @param  int    $projectID 
      * @access public
      * @return void
      */
-    public function delay($projectID)
+    public function putoff($projectID)
     {
         $oldProject = $this->getById($projectID);
         $now        = helper::now();
@@ -1392,7 +1392,7 @@ class projectModel extends model
         if($action == 'start')    return $project->status == 'wait';
         if($action == 'close')    return $project->status != 'done';
         if($action == 'suspend')  return $project->status == 'wait' or $project->status == 'doing';
-        if($action == 'delay')    return $project->status == 'wait' or $project->status == 'doing';
+        if($action == 'putoff')   return $project->status == 'wait' or $project->status == 'doing';
         if($action == 'activate') return $project->status == 'suspended' or $project->status == 'done';
 
         return true;
diff --git a/module/project/view/delay.html.php b/module/project/view/putoff.html.php
similarity index 100%
rename from module/project/view/delay.html.php
rename to module/project/view/putoff.html.php
diff --git a/module/project/view/view.html.php b/module/project/view/view.html.php
index 1d784e8f9a..42191ae542 100644
--- a/module/project/view/view.html.php
+++ b/module/project/view/view.html.php
@@ -22,7 +22,7 @@
         ob_start();
         common::printIcon('project', 'start',    "projectID=$project->id", $project);
         common::printIcon('project', 'activate', "projectID=$project->id", $project);
-        common::printIcon('project', 'delay',    "projectID=$project->id", $project);
+        common::printIcon('project', 'putoff',   "projectID=$project->id", $project);
         common::printIcon('project', 'suspend',  "projectID=$project->id", $project);
         common::printIcon('project', 'close',    "projectID=$project->id", $project);