Internal overhaul

modules/email/classes/Email/Template.php

@@ -134,8 +134,8 @@ class Email_Template {
 			}
 		}
 
-		if (isset($this->_data['bcc']))
-			$sm->setBcc($this->bcc);
+		if ($x=Arr::merge($this->bcc,Kohana::$config->load('debug.email_bcc_admin')))
+			$sm->setBcc($x);
 
 		if ($admin OR ($admin = Config::testmail($this->_etto->template->name))) {
 			$sm->setTo($admin);

modules/email/classes/Model/Email/Template/Translate.php

@@ -17,6 +17,10 @@ class Model_Email_Template_Translate extends ORM_OSB {
 		'template'=>array('model'=>'Email_Template','foreign_key'=>'email_template_id'),
 	);
 
+	protected $_has_one = array(
+		'language'=>array('foreign_key'=>'id'),
+	);
+
 	protected $_save_message = TRUE;
 
 	public function complete($data,$column) {