diff --git a/application/module/Order/Order.php b/application/module/Order/Order.php index 246cec25..54fc6e8c 100644 --- a/application/module/Order/Order.php +++ b/application/module/Order/Order.php @@ -74,7 +74,7 @@ class Order if(!preg_match("/^[0-9A-Za-z]{8}-[0-9A-Za-z]{4}-[0-9A-Za-z]{4}-[0-9A-Za-z]{4}-[0-9A-Za-z]{12}$/",$uuid)) { - return "参数错误"; + return "Wrong parameter."; } $results = $this->events()->trigger('submit', $this, compact('uuid','uid')); @@ -98,14 +98,14 @@ class Order { return true; }else{ - return "操作中出现错误,请重试"; + return "Errors, please retry."; } }else{ if($this->pushToDataorder($uuid,$uid,$selection) === true) { return true; }else{ - return "操作中出现错误,请重试"; + return "Errors, please retry."; } } }//addOrder @@ -140,7 +140,7 @@ class Order { if(!is_numeric($id) || !is_numeric($uid)) { - return "参数错误"; + return "Wrong parameter."; } if(empty($uid)) @@ -155,7 +155,7 @@ class Order { return true; }else{ - return "处理中遇到问题,请重试"; + return "Errors, please retry."; } } @@ -166,11 +166,11 @@ class Order { return true; }else{ - return "处理中遇到问题,请重试"; + return "Errors, please retry."; } } - return "参数错误"; + return "Wrong parameter."; }//apply() //删除 @@ -178,7 +178,7 @@ class Order { if(!is_numeric($id) || !is_numeric($uid)) { - return "参数错误"; + return "Wrong parameter."; } if(empty($uid)) @@ -193,11 +193,11 @@ class Order { return true; }else{ - return "处理中遇到错误,请重试"; + return "Errors, please retry."; } } - return "参数错误"; + return "Wrong parameter."; } @@ -277,7 +277,7 @@ class Order if(!is_numeric($oid) || $oid<1) { - return "参数错误"; + return "Wrong parameter."; } $results = $this->events()->trigger('order.onSubmited', $this, compact('formData','uid','oid','pdf')); @@ -298,7 +298,7 @@ class Order $output = new Output(); $path = realpath($this->config->offline->savepath); $content = file_get_contents($path.DIRECTORY_SEPARATOR.$fn); - $output->pushDownload($content,"申请表.pdf",'pdf'); + $output->pushDownload($content,"Application.pdf",'pdf'); exit(); } @@ -406,13 +406,13 @@ class Order $sql = "update dataorder set status=3 where status=2 and userid=$uid and offlineappid=$offlineappid"; if($this->db->exec($sql) < 0) { - return "数据篮状态更新失败,请重试"; + return "Could not update the status of the your shopping cart, please retry."; } $sql = "UPDATE offlineapp SET status=3 WHERE id=$offlineappid "; if($this->db->exec($sql) < 0) { - return "数据篮状态更新有误,请联系管理员"; + return "Error exist when update the status of the shopping card, please contact our service group by email."; } $data = array( @@ -439,13 +439,13 @@ class Order switch($type) { case 0: - return "此数据为在线查看数据"; + return "This data is online."; break; case 1: - return "此数据有可以选择的子集"; + return "This data has subset."; break; case 2: - return "此数据有多个子集供选择"; + return "This data has multiple subsets."; break; case 3: return "";