From 1ccce9505c36c3a4b14737c6a564c5bd18754f81 Mon Sep 17 00:00:00 2001
From: wlx <wangliangxu@lzb.ac.cn>
Date: Sun, 10 Nov 2013 08:34:30 +0000
Subject: [PATCH] translation

---
 application/models/ContactForm.php   | 10 +++++-----
 application/models/data/Metadata.php |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/application/models/ContactForm.php b/application/models/ContactForm.php
index 52350104..ccea1ad5 100755
--- a/application/models/ContactForm.php
+++ b/application/models/ContactForm.php
@@ -8,30 +8,30 @@ class ContactForm extends Zend_Form
         $this->setName('Contact');
 
         $username = new Zend_Form_Element_Text('username');
-        $username->setLabel('姓名')->setRequired(true)
+        $username->setLabel('Name')->setRequired(true)
         ->addFilter('StripTags') ->addFilter('StringTrim')
         ->addValidator('StringLength',false,array(3,50));
         
        
         $email=new Zend_Form_Element_Text('email');
-        $email->setLabel('邮件')
+        $email->setLabel('Email')
         			->setRequired(true)
         			->addFilter('StringTrim')
         			->addValidator('NotEmpty')
         			->addValidator('EmailAddress');
 		  
 		  $subject=new Zend_Form_Element_Text('subject');
-		  $subject->setLabel('主题')->setRequired(true);
+		  $subject->setLabel('Subject')->setRequired(true);
 		  
 		  $body=new Zend_Form_Element_Textarea('body');
-		  $body->setLabel('内容')->setRequired(true)->setAttrib('rows',4);
+		  $body->setLabel('Content')->setRequired(true)->setAttrib('rows',4);
 		  
         $id = new Zend_Form_Element_Hidden('id');
         
         $submit = new Zend_Form_Element_Submit('submit');
         $submit ->setAttrib('id', 'submitbutton')
 				->setAttrib('class', 'btn btn-primary')
-				->setLabel('发送');
+				->setLabel('Send');
         
         $spam=new element_bcSpamBlock('spam');
         $spam->addPrefixPath('Validator','validator/','validate')
diff --git a/application/models/data/Metadata.php b/application/models/data/Metadata.php
index 41dddaa7..d9c457df 100644
--- a/application/models/data/Metadata.php
+++ b/application/models/data/Metadata.php
@@ -4,7 +4,7 @@ class Metadata
 	private $db;				//传入PDO对象.
 	
 	//使用到的公共变量
-	public $tbl_metadata = "metadata";
+	public $tbl_metadata = "en.normalmetadata";
 	
 	function __construct($db)
 	{