Merge branch 'jansa' into 'master'

application/models/Organizer_model.php

@@ -930,11 +930,14 @@ class Organizer_model extends CI_Model {
 			$evntDes = $this->db->get_where('translator_event',array('event_id'=>$data['event_id']))->result_array();
 			if(!empty($evntDes)){
 				foreach ($evntDes as $key => $value) {
+					$sql = "SELECT country_id AS lang_id,language_code AS lang,language FROM country WHERE status='1' AND language_code='".$value['language_code']."'";
+					$langSql = $this->db->query($sql)->row_array();
+
 					if(!empty($value['event_name'])){
-						$evtName[] =  array('lang'=>$value['language_code'],'name'=>$value['event_name']);
+						$evtName[] =  array('lang'=>$value['language_code'],'language'=>$langSql['language'],'language_id'=>$langSql['lang_id'],'name'=>$value['event_name']);
 					}
 					if(!empty($value['event_description'])){
-						$evtDesc[] =  array('lang'=>$value['language_code'],'desc'=>$value['event_description']);
+						$evtDesc[] =  array('lang'=>$value['language_code'],'language'=>$langSql['language'],'language_id'=>$langSql['lang_id'],'desc'=>$value['event_description']);
 					}
 				}
 				$evData['event_name'] = $evtName;