From 8cdd8dee9b56a721233b72635f370934658bd7e4 Mon Sep 17 00:00:00 2001
From: wlx <wangliangxu@lzb.ac.cn>
Date: Mon, 11 Nov 2013 08:25:44 +0000
Subject: [PATCH] translation

---
 application/module/Order/Order.php | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/application/module/Order/Order.php b/application/module/Order/Order.php
index cf9ba966..246cec25 100644
--- a/application/module/Order/Order.php
+++ b/application/module/Order/Order.php
@@ -13,15 +13,9 @@ class Order
 	protected $events = NULL;
 	
 	public $projectType = array(
-				"国家973计划项目课题" => "国家973计划项目课题",
-				"国家863计划课题"=>"国家863计划课题",
-				"国家级科技支撑课题" => "国家级科技支撑课题",
-				"国家级科技重大专项" => "国家级科技重大专项",
-				"国家级国家重大工程" => "国家级国家重大工程",
-				"国家级国家自然科学基金" => "国家级国家自然科学基金",
-				"国际合作项目"=>"国际合作项目",
-				"省部级项目" => "省部级项目",
-				"其他项目工程" => "其他项目工程",
+				"National Funding" => "National Funding",
+				"Thesis or Dissertation"=>"Thesis or Dissertation",
+				"Others" => "Others",
 	);//申请中的项目类型
 	
 	public $pdfData;
@@ -378,10 +372,10 @@ class Order
 				select r.reference from mdref mr left join reference r on mr.refid=r.id
 				where mr.reftype=3 and mr.uuid=d.uuid order by mr.place),'\n'::text) as reference,
 				array_to_string(array(
-				select fund.fund_type||':'||fund.title||'(编号：'||fund.fund_id||')' 
+				select fund.fund_type_en||':'||fund.title_en||'(No: '||fund.fund_id||')' 
 				from fund left join mdfund on fund.id=mdfund.fid where mdfund.uuid=d.uuid order by mdfund.place),'\n'::text) as fund,
 				doi.doi as datadoi,doi.authors,doi.publisher,doi.title as doititle,doi.author_en,doi.publisher_en,doi.title_en
-				from dataorder d left join metadata m on d.uuid=m.uuid left join datadoi doi on doi.uuid=d.uuid
+				from dataorder d right join en.metadata m on d.uuid=m.uuid left join datadoi doi on doi.uuid=d.uuid
 				where d.status=$statu and d.userid=? order by d.ts_created desc
 				";
     	$rows = $this->db->fetchAll($sql,array($uid));