Commits

jvazquez  committed 8c27f55 Merge
  • Participants
  • Parent commits e020712, 5abeb63

Comments (0)

Files changed (86)

 ^cache/zend_cache*?
 ^logs/.+\.log
 ^public/uploads/.+\.[png|gif|jpg]
-heads.log
+heads.log
+heads.log
+syntax: regexp
+^resources/$
+syntax: regexp
+^lang/parse.rb$
+\.DS\_Store$

File application/modules/applicant/controllers/WaitlistController.php

 			try {
 				$applied=$userWaitList->save();
 				$workflowHelper->terminateSession();
-				$this->view->msg = $applied!=false ? $this->getMessage('userAppliedToWaitlist') : $this->getMessage('errorSaving');
+				//$this->view->msg = $applied!=false ? $this->getMessage('userAppliedToWaitlist') : $this->getMessage('errorSaving');				
+				if( $applied!=false ) {
+				    $this->view->msg = 'userAppliedToWaitlist';
+				    $this->view->type = 'success';
+				}
+				else{
+				    $this->view->msg = 'errorSaving';
+				    $this->view->type = 'error';
+				}				
 			} catch (Exception $e) {
 				$helper = new Applicant_Library_Helper_Apply();
 				$helper->logFails($this, $e, __FUNCTION__);
-				$this->view->msg = $this->getMessage('errorSaving');
+				//$this->view->msg = $this->getMessage('errorSaving');
+				$this->view->msg = 'errorSaving';
+				$this->view->type = 'error';
 			}
 		}
 	}

File application/modules/applicant/forms/AboutYou.php

 
         private function addPhone() {
 		$element = 'phone';
-		$phoneOpts = array('label'=>$element,'required'=>true,'validators' =>  array( array('stringLength', false, array(3,50) )	));
+		$phoneOpts = array('label'=>$element,'required'=>true,'validators' =>  array( array('stringLength', false, array(10,10) ) ));							
 		$this->addElement('text',$element,$phoneOpts);
 		$this->getElement($element)->addFilter('Digits');
 		$this->applyDecorator($element);

File application/modules/applicant/forms/Address.php

 		$zipOpts = array(
                    			'required'=>true,
                    			'label'=>$element,
-                   			'validators' => array ('validator' => array( 'regex', false, array('/^[0-9]{5}$/'))));
+                   			'validators' => array ('validator' => array( 'regex', false, array('/^[0-9]{5}$/','messages'=>array('regexNotMatch'=>'zipregexnotmatch')))));
 
 		$this->addElement('text',$element,$zipOpts);
 		$this->applyDecorator($element);
 		$rentOpts = array(
                    			'required'=>true,
                    			'label'=>$element,
-                   			'validators' =>  array( array('float' )));
+                   			'validators' => array ('validator' => array( 'regex', false, array('pattern'=>'/^[0-9]{1,4}(\.\d{2,2})?$/',
+											   'messages'=>array('regexNotMatch'=>'regexrentamount')))));
 
 		$this->addElement('text',$element,$rentOpts);
 		$this->getElement($element)->setAttribs(array('rows'=>10,'cols'=>20));

File application/modules/applicant/forms/CreditHistory.php

 		$zipOpts = array(
                    			'required'=>true,
                    			'label'=>$element,
-                   			'validators' => array ('validator' => array( 'regex', false, array('/^[0-9]{5}$/'))));
+                   			'validators' => array ('validator' => array( 'regex', false, array('/^[0-9]{5}$/','messages'=>array('regexNotMatch'=>'zipregexnotmatch')))));
 
 		$this->addElement('text',$element,$zipOpts);
 		$this->applyDecorator($element);

File application/modules/applicant/forms/Spouse.php

 			'label'=>$element,
 			'required'=>true,
 			'description'=>'ssnDescription',
-			'validators' =>  array('int', array('stringLength', false, array(9)) )
-		);
+			'validators' => array ('validator' => array( 'regex', false, array('pattern'=>'/^[0-9]{9}(\.\d{1,2})?$/',
+											   'messages'=>array('regexNotMatch'=>'ssnregexnotmatch'))
+		)));
 		$this->addElement('text',$element,$ssnOpts);
 		$this->applyDecorator($element);
 		$this->addToGroup($element);
 
 	private function addCellPhone() {
 		$element = 'cellPhone';
-		$phoneOpts = array('label'=>$element,'required'=>false,'validators' =>  array( array('stringLength', false, array(3,50) )	));
+		$phoneOpts = array('label'=>$element,'required'=>false,'validators' =>  array( array('stringLength', false, array(10,10) ) ));
 		$this->addElement('text',$element,$phoneOpts);
 		$this->getElement($element)->addFilter('Digits');
 		$this->applyDecorator($element);
 
 	private function addWorkPhone() {
 		$element = 'workPhone';
-		$phoneOpts = array('label'=>$element,'required'=>false,'validators' =>  array( array('stringLength', false, array(3,50) )	));
+		$phoneOpts = array('label'=>$element,'required'=>false,'validators' =>  array( array('stringLength', false, array(10,10) ) ));
 		$this->addElement('text',$element,$phoneOpts);
 		$this->getElement($element)->addFilter('Digits');
 		$this->applyDecorator($element);

File application/modules/applicant/forms/WorkHistory.php

 		$zipOpts = array(
                    			'required'=>true,
                    			'label'=>$element,
-                   			'validators' => array ('validator' => array( 'regex', false, array('/^[0-9]{5}$/'))));
+                   			'validators' => array ('validator' => array( 'regex', false, array('/^[0-9]{5}$/','messages'=>array('regexNotMatch'=>'zipregexnotmatch')))));
 
 		$this->addElement('text',$element,$zipOpts);
 		$this->applyDecorator($element);
 		$phoneOpts = array(
 					'required'=>false,
                    			'label'=>$element,
-                   			'validators' => array ('validator' => array( 'regex', false, array('/^[0-9]{10}$/'))));
+                   			'validators' =>  array( array('stringLength', false, array(10,10))));
 
 		$this->addElement('text',$element,$phoneOpts);
 		$this->applyDecorator($element);
 	 */
 	private function addMonthlyIncome() {
 		$element = 'monthlyIncome';
-		$phoneOpts = array(     'required'=>true,
+		$incomeOpts = array(     'required'=>true,
                    			'label'=>$element,
-                   			'validators' =>  array( array('float' )));
+                   			'validators' => array(array( 'regex', false, array('pattern'=>'/^[0-9]{1,4}(\.\d{2,2})?$/',
+											   'messages'=>array('regexNotMatch'=>'regexrentamount')))));
 
-		$this->addElement('text',$element,$phoneOpts);
+		$this->addElement('text',$element,$incomeOpts);
 		$this->applyDecorator($element);
 		$this->addToGroup($element);
 	}
 		$element = 'supervisorPhone';
 		$phoneOpts = array(     'required'=>false,
                    			'label'=>$element,
-                   			'validators' => array ('validator' => array( 'regex', false, array('/^[0-9]{10}$/'))));
+                   			'validators' =>  array( array('stringLength', false, array(10,10))));
 
 		$this->addElement('text','supervisorPhone',$phoneOpts);
 		$this->applyDecorator($element);

File application/modules/applicant/library/WorkflowHelper.php

 <?php
 /**
  * @author Jorge Vazquez <jvazquez@debserverp4.com.ar>
- * @package applicant
- * @subpackage library
+ * @package modules.applicant.library
  * @internal Handles the workflow steps for an applicant applying to a unit
  */
-class Applicant_Library_WorkflowHelper extends Applicant_Library_Workflow implements Applicant_Library_Interface_WorkFlow {
+class Applicant_Library_WorkflowHelper extends Applicant_Library_Workflow implements Applicant_Library_Interface_WorkFlow
+{
 	/**
 	 * Name used for the session
 	 * @var string
 	/* (non-PHPdoc)
 	 * @see modules/applicant/library/Interface/Applicant_Library_Interface_WorkFlow::getSessionNameSpace()
 	 */
-	public function getSessionNameSpace() {
+	public function getSessionNameSpace()
+	{
 		return $this->sessionNamespace;
 	}
 
 	/* (non-PHPdoc)
 	 * @see modules/applicant/library/Interface/Applicant_Library_Interface_WorkFlow::setSessionNameSpace()
 	 */
-	public function setSessionNameSpace($name) {
+	public function setSessionNameSpace($name)
+	{
 		$name = true===empty($name)?"applicantApply":$name;
 		$this->sessionNamespace = $name;
 	}
 	 */
 	public function initSession()
 	{
-		$name = $this->getSessionNameSpace();
-		if( !isset($name) ) {
+		$name = $this->sessionNamespace;
+		if( !isset($name) )
+		{
 			throw new Applicant_Library_Exception("The identifier for the session has not been set");
 		}
-		$this->initSessionHandler($this->getSessionNameSpace());
+		$this->initSessionHandler($name);
 		return $this;
 	}
 

File application/modules/applicant/views/scripts/apply/aboutyou.phtml

  * The user tell us about himself
  * @author Jorge Omar Vazquez <jvazquez@debserverp4.com.ar>
  */
-$this->headLink()->headLink()->prependStylesheet('/css/zendform2.css')
-	->headLink()->prependStylesheet('/css/roundSuccess.css')
-	->headLink()->prependStylesheet('/css/roundWarning.css')
+$this->headLink()->headLink()->prependStylesheet('/css/zendform2.css')	
 	->headLink()->prependStylesheet('/css/ui-lightness/jquery-ui-1.8.custom.css');
 
 $this->headScript()->appendFile('/javascript/jquery-ui_1.8/jquery-1.4.2.min.js','text/javascript')

File application/modules/applicant/views/scripts/apply/credithistory.phtml

  * @author Jorge Omar Vazquez <jvazquez@debserverp4.com.ar>
  */
 $this->headLink()->prependStylesheet('/css/roundError.css')
-->headLink()->prependStylesheet('/css/zendform2.css')
-->headLink()->prependStylesheet('/css/roundSuccess.css')
-->headLink()->prependStylesheet('/css/roundWarning.css');
+->headLink()->prependStylesheet('/css/zendform2.css');
 echo $this->message($this->msg);
 echo $this->form;
 ?>

File application/modules/applicant/views/scripts/apply/emergencycontact.phtml

 <?php
 
-echo $this->headLink()->appendStylesheet('/css/roundError.css');
-echo $this->headLink()->appendStylesheet('/css/roundSuccess.css');
-echo $this->headLink()->appendStylesheet('/css/roundWarning.css');
 echo $this->headLink()->appendStylesheet('/css/zendform2.css');
 
 if( isset($this->msg) ) {

File application/modules/applicant/views/scripts/apply/message.phtml

  *
  * @author Jorge Omar Vazquez <jvazquez@debserverp4.com.ar>
  */
-/*$this->headLink()->appendStylesheet('/css/roundError.css')
-	->headLink()->appendStylesheet('/css/roundSuccess.css')
-	->headLink()->appendStylesheet('/css/roundWarning.css');
-*/
 $this->headScript()->appendFile('/javascript/jquery-ui_1.8/jquery-1.4.2.min.js','text/javascript')
 	->headScript()->appendFile('/javascript/jquery-ui_1.8/jquery-ui-1.8.custom.min.js','text/javascript');
 echo $this->headLink();

File application/modules/applicant/views/scripts/apply/occupants.phtml

 					->headScript()->appendFile('/javascript/jquery-ui_1.8/jquery-ui-1.8.custom.min.js','text/javascript');
 
 $this->headLink()->prependStylesheet('/css/roundError.css')
-				 ->headLink()->prependStylesheet('/css/zendform2.css')
-				 ->headLink()->prependStylesheet('/css/roundSuccess.css')
-				 ->headLink()->prependStylesheet('/css/roundWarning.css')
+				 ->headLink()->prependStylesheet('/css/zendform2.css')				 
 				 ->headLink()->prependStylesheet('/css/ui-lightness/jquery-ui-1.8.custom.css');
 echo $this->headScript();
 echo $this->headLink();

File application/modules/applicant/views/scripts/apply/payment.phtml

 <?php
-echo $this->headLink()->appendStylesheet('/css/roundError.css');
-echo $this->headLink()->appendStylesheet('/css/roundSuccess.css');
-echo $this->headLink()->appendStylesheet('/css/roundWarning.css');
 echo $this->headLink()->appendStylesheet('/css/zendform.css');
 ?>
 <h1><i18n>appFeePayment</i18n></h1>

File application/modules/applicant/views/scripts/apply/previousaddress.phtml

  * The user tell us about himself
  * @author Jorge Omar Vazquez <jvazquez@debserverp4.com.ar>
  */
-echo $this->headLink()->appendStylesheet('/css/roundError.css');
-echo $this->headLink()->appendStylesheet('/css/roundSuccess.css');
-echo $this->headLink()->appendStylesheet('/css/roundWarning.css');
 echo $this->headLink()->appendStylesheet('/css/zendform2.css');
 echo $this->headLink()->appendStylesheet('/css/ui-lightness/jquery-ui-1.8.custom.css');
 echo $this->headScript()->appendFile('/javascript/jquery-ui_1.8/jquery-1.4.2.min.js','text/javascript');

File application/modules/applicant/views/scripts/apply/rentalcriminalhistory.phtml

 <?php
 
-echo $this->headLink()->appendStylesheet('/css/roundError.css');
-echo $this->headLink()->appendStylesheet('/css/roundSuccess.css');
-echo $this->headLink()->appendStylesheet('/css/roundWarning.css');
 echo $this->headLink()->appendStylesheet('/css/zendform2.css');
 
 if( isset($this->msg) ) {

File application/modules/applicant/views/scripts/apply/spouse.phtml

  * @author Jorge Omar Vazquez <jvazquez@debserverp4.com.ar>
  *
  */
-$this->headLink()->appendStylesheet('/css/roundError.css')
-->headLink()->appendStylesheet('/css/roundSuccess.css')
-->headLink()->appendStylesheet('/css/roundWarning.css')
-->headLink()->appendStylesheet('/css/zendform2.css')
+$this->headLink()->appendStylesheet('/css/zendform2.css')
 ->headLink()->appendStylesheet('/css/ui-lightness/jquery-ui-1.8.custom.css');
 $this->headScript()->appendFile('/javascript/jquery-ui_1.8/jquery-1.4.2.min.js','text/javascript')
 ->headScript()->appendFile('/javascript/jquery-ui_1.8/jquery-ui-1.8.custom.min.js','text/javascript');

File application/modules/applicant/views/scripts/apply/waitlistapply.phtml

  * @author Jorge Vazquez <jvazquez@debserverp4.com.ar>
  * @since 2010/05/30
  */
-echo $this->headLink()->appendStylesheet('/css/roundError.css');
-echo $this->headLink()->appendStylesheet('/css/roundSuccess.css');
-echo $this->headLink()->appendStylesheet('/css/roundWarning.css');
 ?>
 <h1><i18n>waitlistresult</i18n></h1>
 <?php

File application/modules/applicant/views/scripts/apply/whyyourented.phtml

  * @author Jorge Omar Vazquez <jvazquez@debserverp4.com.ar>
  *
  */
-$this->headLink()->prependStylesheet('/css/roundError.css')
-->headLink()->prependStylesheet('/css/zendform2.css')
-->headLink()->prependStylesheet('/css/roundSuccess.css')
-->headLink()->prependStylesheet('/css/roundWarning.css');
+$this->headLink()->prependStylesheet('/css/zendform2.css');
 echo $this->headLink();
 
 

File application/modules/applicant/views/scripts/waitlist/apply.phtml

  * @since 2010/05/30
  */
 $this->headScript()->appendFile('/javascript/jquery-ui_1.8/jquery-1.4.2.min.js','text/javascript')
-->headScript()->appendFile('/javascript/jquery-ui_1.8/jquery-ui-1.8.custom.min.js','text/javascript');
- 
-echo $this->headLink()->appendStylesheet('/css/roundError.css')
-->headLink()->appendStylesheet('/css/roundSuccess.css')
-->headLink()->appendStylesheet('/css/roundWarning.css');
+->headScript()->appendFile('/javascript/jquery-ui_1.8/jquery-ui-1.8.custom.min.js','text/javascript'); 
 
 echo $this->headLink();
 echo $this->headScript();
 ?>
 <h1><i18n>waitlistresult</i18n></h1>
 <?php
-echo $this->message($this->msg);
+//echo $this->message($this->msg);
+echo $this->internazionalization($this->msg,$this->type);
 ?>

File application/modules/modules/models/Controllers.php

 	 * @param string $module
 	 * @param array $roles
 	 * @return multitype:|Ambigous <multitype:, multitype:unknown >
+	 *
+	 * Modified for ticket 331 to not show icons if the user doesn't have access to the index action.
+	 * we tried a join and also a subselect for this and found the subselect is actually faster....
+	 * leaving join commented in case we have to revisit this
 	 */
 	public function fetchControllersForModule($module,$roles)
 	{
 				->join( array('M'=>'modules'), 'M.id = P.moduleId', array('moduleId'=>'M.id','moduleName'=>'LOWER(M.name)') )
 				->join( array('C'=>'controllers'), 'C.id = P.controllerId', array('controllerId'=>'C.id','controllerName'=>'LOWER(C.name)','display'=>'C.display','icon'=>'C.icon') )
 				->join( array('RP'=>'rolePermission'),'RP.permissionId=P.id',array())
+				//->join( array('A'=>'actions'),"P.actionId=A.id AND A.name='Index'",array())
 				->where($db->quoteInto('M.name=?',$module,'string'))
 				->where($db->quoteInto('RP.roleId = ?',$roles,'int'))
-				->group('controllerId');			
+				->where( 'C.display=1' )
+				->where( "P.actionId = (SELECT id FROM actions WHERE name='Index')")
+				->group('controllerId');				
 			$resultset = $db->query($select);
 			$log = new ZFObserver_Forensic();
 			$log->setStatus(ZFObserver_ILogeable::DEBUG);
 				return $controllers;
 			}
 			foreach($resultset as $id=>$value)
-			{
+			{			
 				$controllers[]= array('moduleId'=>$value['moduleId'],'moduleName'=>$value['moduleName'],'controllerId'=>$value['controllerId'],'controllerName'=>$value['controllerName'],'display'=>$value['display'],'icon'=>$value['icon']);
 			}
 		}

File application/modules/prospects/controllers/AddController.php

 		$service->setDao($dao);
 		$daoForm = new Unit_Library_Impl_Dao();
 		$daoForm->setTemplate(new Unit_Model_DbTable_UnitModel());
-		$form = $service->getForm(array('name'=>'Prospects_Form_Add','set'=>true,'dao'=>$daoForm));
-		$this->view->form = $form;
-		if( $this->getRequest()->isPost() and $form->isValid($this->getRequest()->getParams() ) )
-		{
+		try{
+		    $form = $service->getForm(array('name'=>'Prospects_Form_Add','set'=>true,'dao'=>$daoForm));
+		    $this->view->form = $form;
+		    if( $this->getRequest()->isPost() and $form->isValid($this->getRequest()->getParams() ) )
+		    {
 			try {
 				if( $service->saveTransaction($this->getRequest()->getParams())==true )
 				{
 			} catch (Exception $e) {
 				$this->assignMessage($service->getMessageState());
 			}
+		    }
+		    $this->assignMessage($service->getMessageState());
 		}
-		$this->assignMessage($service->getMessageState());
+		catch (Exception $e) {				
+				$this->assignMessage(array('msg'=>'noUnitModels','type'=>'error'));
+		}
 	}
 }

File application/modules/prospects/controllers/IndexController.php

+<?php
+/**
+ * Index Controller for prospects 
+ * @package application.modules.prospects.controllers
+ */
+class Prospects_IndexController extends ZFController_Controller
+{
+	public function indexAction() {
+		
+	}
+}

File application/modules/prospects/forms/Add.php

 			'label' => $element,
 			'required' => false,
 			'filters' => array ( 'StringTrim'),
-			'validators' => array ('validator' => array( 'regex', false, array('/^\d+(\.\d{1,2})?$/'))));
+			'validators' => array ('validator' => array( 'regex', false, array('/^\d+(\.\d{1,2})?$/','messages'=>array('regexNotMatch'=>'regexrentamount')))));
 		$this->addElement('text', $element, $opts);
 		$this->addDecoratorAndGroup( $element );
 	}
 			'label' => $element,
 			'required' => false,
 			'filters' => array ( 'StringTrim'),
-			'validators' => array ('validator' => array( 'regex', false, array('/^\d+(\.\d{1,2})?$/'))));
+			'validators' => array ('validator' => array( 'regex', false, array('/^\d+(\.\d{1,2})?$/','messages'=>array('regexNotMatch'=>'regexrentamount')))));
 		$this->addElement('text', $element, $opts);
 		$this->addDecoratorAndGroup( $element );
 	}
 		if(count($list)==0)
 		{
 			throw new Exception('The system is not properly set up');
+			
 		}
 		else
 		{
 	public function addOccupants()
 	{
 		$element = 'occupants';
-		$opts = array('label'=>'otherOccupantsForm','required'=>true);
+		$opts = array('label'=>'numOtherOccupantsForm',
+			      'required'=>true,
+			      'filters' => array ( 'StringTrim'),
+			      'validators' => array ('validator' => array( 'regex', false, array('/^[0-9]{1}$/','messages'=>array('regexNotMatch'=>'occregexnotmatch')))));
 		$this->addElement('text',$element,$opts);
 		$this->addDecoratorAndGroup($element);
 	}

File application/modules/prospects/library/ServiceImpl.php

    */
   public function viewProspectId($id)
   {
+
     $prospect = $this->findById($id);
     $response = array();
     if(count($prospect)>0)
     {
-      $response = array('prospect'=>array_shift($prospect));
+      $response = array('prospect'=>$prospect);
       //  Patched up , the & is deprecated
       $this->transformResponse($response);
       $answers = $this->prospectAnswersDao->fetchAll( $this->dao->getGateway()->quoteInto('prospectId=?',$id,'integer'));
     return $response;
   }
 
-  protected function transformResponse(array $response)
+  protected function transformResponse(array &$response)
   {
     $form = new Prospects_Form_Add();
     $mode = $form->getContactMode();
     $response['prospect']['contactMode'] = $mode[$response['prospect']['contactMode']];
     $response['prospect']['pets'] = Prospects_Form_Add::$answer[$response['prospect']['pets']];
-    $response['prospect']['occupants'] = Prospects_Form_Add::$answer[$response['prospect']['occupants']];
+//  If this was an int , then i don't need to do that
+//    $response['prospect']['occupants'] = Prospects_Form_Add::$answer[$response['prospect']['occupants']];
     $status = $form->getStatus();
     $response['prospect']['status'] = $status[$response['prospect']['status']];
   }

File application/modules/prospects/views/helpers/ControllerBar.php

 {
 	public function controllerBar()
 	{		
-		return $this->view->bar(array('type'=>'controller','destination'=>'prospects', 'hiddenElements'=>array('update','error','join','login') ));
+		return $this->view->bar(array('type'=>'controller','destination'=>'prospects', 'hiddenElements'=>array('update','error','join','login','index') ));
 	}
 }
 ?>

File application/modules/prospects/views/scripts/index/index.phtml

+<?php
+/**
+ * Created on Dec 5, 2009 by rnelson
+ * @name apmgr
+ * @package application.modules.unit.models
+ * <p>
+ * The model for unit
+ * </p>
+ */
+?>
+

File application/modules/prospects/views/scripts/view/detail.phtml

   			<td><?php echo $this->translate($this->prospect['prospect']['pets']);?></td>
   		</tr>
   		<tr>
-  			<td><i18n>otherOccupantsForm</i18n></td>
+  			<td><i18n>numOtherOccupantsForm</i18n></td>
   			<td><?php echo $this->translate($this->prospect['prospect']['occupants']);?></td>
   		</tr>
   		<tr>

File application/modules/unit/controllers/UnitController.php

 	public function createunitsingleAction() {
 		$unitModelObj = new Unit_Model_UnitModel();
 		$models = $unitModelObj->fetchAll();
-
+		
 		$apartmentModelObj = new Unit_Model_Apartment();
-		$apartments = $apartmentModelObj->fetchAll();
-
+		$apartments = $apartmentModelObj->fetchAll();		
+		
 		if(empty($models) ){
-			$this->view->msg = $this->getMessage('noUnitModels');
+			$this->view->msg = 'noUnitModels';
 			$this->view->type = 'error';
 		}
-		else if(empty($apartments) ){
-			$this->view->msg = $this->getMessage('noApartment');
+		else if(empty($apartments) ){			
+			$this->view->msg = 'noApartment';
 			$this->view->type = 'error';
 		}
 		else{
 		$apartments = $apartmentModelObj->fetchAll();
 
 		if(empty($models)) {
-			$this->view->msg = $this->getMessage('noUnitModels');
+			$this->view->msg = 'noUnitModels';
 			$this->view->type = 'error';
 		}
 		else if(empty($apartments) ) {
-			$this->view->msg = $this->getMessage('noApartment');
+			$this->view->msg = 'noApartment';
 			$this->view->type = 'error';
 		}
 		else{

File application/modules/unit/controllers/UnitmodelController.php

 		}
 	}
 }
-?>
-
-
+?>

File application/modules/unit/views/scripts/apartment/viewallapartments.phtml

 ?>
 <div id="pagtable">
 <table id='currenttable'>
-	<caption><i18n>apartments</i18n></caption>
+	<caption><i18n>apartment</i18n></caption>
 	<?php if( $this->records ) {?>
 	<tr>
 		<th><i18n>name</i18n></th>

File application/modules/user/forms/Join.php

 	 */
 	private function addCaptcha() {
 		$element ='captcha';
+		//var_dump( APPLICATION_PATH ); die;
+		//var_dump( APPLICATION_PATH.'/../../public_html/fonts/VeraMoBI.ttf' ); die;
 		$captchaImageOptions = array(
 						'captcha' => 'Image',
                         			'font'	  => realpath(APPLICATION_PATH.'/../../public_html/fonts/VeraMoBI.ttf'),
 									'class'=>'captchaelement'
 			
 		);
+		
 		$captchaOptions = array('label' => 'captchainstruction',
                 				'required'   => true,
                 				'captcha'    => $captchaImageOptions,

File cache/hg.dumb

Empty file removed.

File lang/translations.tmx

 		</tu>
 		<tu tuid='noResultsFound'>
 			<tuv xml:lang="en_US">
-				<seg>No Results</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>No hay resultados</seg>
+                          <seg>No Results</seg>
+			</tuv>
+			<tuv xml:lang="es_AR">
+			  <seg>No hay resultados</seg>
 			</tuv>
 		</tu>
 		<tu tuid='systemMessages'>
 			<tuv xml:lang="en_US">
-				<seg>View System Messages</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>Ver Mensajes del S&#237;stema</seg>
+			  <seg>View System Messages</seg>
+			</tuv>
+			<tuv xml:lang="es_AR">
+			  <seg>Ver Mensajes del S&#237;stema</seg>
 			</tuv>
 		</tu>
 		<tu tuid='systemMessagesCreate'>
-			<tuv xml:lang="en_US">
-				<seg>Create a new System Message</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>Crear un nuevo Mensajes de S&#237;stema</seg>
-			</tuv>
+		  <tuv xml:lang="en_US">
+		    <seg>Create a new System Message</seg>
+		  </tuv>
+		  <tuv xml:lang="es_AR">
+		    <seg>Crear un nuevo Mensajes de S&#237;stema</seg>
+		  </tuv>
 		</tu>
 		<tu tuid='roles'>
-			<tuv xml:lang="en_US">
-				<seg>Roles</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>Roles</seg>
-			</tuv>
+		  <tuv xml:lang="en_US">
+		    <seg>Roles</seg>
+		  </tuv>
+		  <tuv xml:lang="es_AR">
+		    <seg>Roles</seg>
+		  </tuv>
 		</tu>
 		<tu tuid='pages'>
-			<tuv xml:lang="en_US">
-				<seg>Pages</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>Paginas</seg>
-			</tuv>
+		  <tuv xml:lang="en_US">
+		    <seg>Pages</seg>
+		  </tuv>
+		  <tuv xml:lang="es_AR">
+		    <seg>Paginas</seg>
+		  </tuv>
 		</tu>
 		<tu tuid='roleCreate'>
-			<tuv xml:lang="en_US">
-				<seg>Create System Roles</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>Crear Roles del S&#237;stema</seg>
-			</tuv>
+		  <tuv xml:lang="en_US">
+		    <seg>Create System Roles</seg>
+		  </tuv>
+		  <tuv xml:lang="es_AR">
+		    <seg>Crear Roles del S&#237;stema</seg>
+		  </tuv>
 		</tu>
 		<tu tuid='cities'>
-			<tuv xml:lang="en_US">
-				<seg>View System Cities</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>Ver Ciudades del S&#237;stema</seg>
-			</tuv>
+		  <tuv xml:lang="en_US">
+		    <seg>View System Cities</seg>
+		   </tuv>
+		  <tuv xml:lang="es_AR">
+		    <seg>Ver Ciudades del S&#237;stema</seg>
+		  </tuv>
 		</tu>
 		<tu tuid='citiesCreate'>
-			<tuv xml:lang="en_US">
-				<seg>Create A New City</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>Crear una Ciudad nueva</seg>
-			</tuv>
+		  <tuv xml:lang="en_US">
+		    <seg>Create A New City</seg>
+		   </tuv>
+		   <tuv xml:lang="es_AR">
+		    <seg>Crear una Ciudad nueva</seg>
+		   </tuv>
 		</tu>
 		<tu tuid='countries'>
-			<tuv xml:lang="en_US">
-				<seg>View System Countries</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>Ver Pa&#237;ses del S&#237;stema</seg>
-			</tuv>
+		  <tuv xml:lang="en_US">
+		    <seg>View System Countries</seg>
+		  </tuv>
+		  <tuv xml:lang="es_AR">
+		    <seg>Ver Pa&#237;ses del S&#237;stema</seg>
+		  </tuv>
 		</tu>
 		<tu tuid='countryCreate'>
-			<tuv xml:lang="en_US">
-				<seg>Create a New System Country</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>Crear un nuevo Pa&#237;s en el S&#237;stema</seg>
-			</tuv>
+		  <tuv xml:lang="en_US">
+		    <seg>Create a New System Country</seg>
+		  </tuv>
+		  <tuv xml:lang="es_AR">
+		    <seg>Crear un nuevo Pa&#237;s en el S&#237;stema</seg>
+		  </tuv>
 		</tu>
 		<tu tuid='permissions'>
-			<tuv xml:lang="en_US">
-				<seg>Pages</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>P&#193;ginas</seg>
-			</tuv>
+		  <tuv xml:lang="en_US">
+		    <seg>Pages</seg>
+		  </tuv>
+		  <tuv xml:lang="es_AR">
+		    <seg>P&#193;ginas</seg>
+		  </tuv>
 		</tu>
 		<tu tuid='permissionsCreate'>
-			<tuv xml:lang="en_US">
-				<seg>Create a Permission in the system</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>Crear un nuevo Permiso en el S&#237;stema</seg>
-			</tuv>
+		  <tuv xml:lang="en_US">
+		    <seg>Create a Permission in the system</seg>
+		  </tuv>
+		  <tuv xml:lang="es_AR">
+		    <seg>Crear un nuevo Permiso en el S&#237;stema</seg>
+		  </tuv>
 		</tu>
 		<tu tuid='provinces'>
-			<tuv xml:lang="en_US">
-				<seg>View System Provinces</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>Ver Provincias del S&#237;stema</seg>
-			</tuv>
+		  <tuv xml:lang="en_US">
+		    <seg>View System Provinces</seg>
+		  </tuv>
+		  <tuv xml:lang="es_AR">
+		    <seg>Ver Provincias del S&#237;stema</seg>
+		  </tuv>
 		</tu>
 		<tu tuid='provincesCreate'>
-			<tuv xml:lang="en_US">
-				<seg>Create a Province in the system</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>Crear una nueva Provincia en el S&#237;stema</seg>
-			</tuv>
+		  <tuv xml:lang="en_US">
+		    <seg>Create a Province in the system</seg>
+		  </tuv>
+		  <tuv xml:lang="es_AR">
+		    <seg>Crear una nueva Provincia en el S&#237;stema</seg>
+		  </tuv>
 		</tu>
 		<tu tuid='users'>
-			<tuv xml:lang="en_US">
-				<seg>View System Users</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>Ver Usuarios del S&#237;stema</seg>
-			</tuv>
+		  <tuv xml:lang="en_US">
+		    <seg>View System Users</seg>
+		  </tuv>
+		  <tuv xml:lang="es_AR">
+		    <seg>Ver Usuarios del S&#237;stema</seg>
+		  </tuv>
 		</tu>
 		<tu tuid='usersCreate'>
-			<tuv xml:lang="en_US">
-				<seg>Create a new User</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>Crear un Usuario nuevo en el S&#237;stema</seg>
-			</tuv>
+		  <tuv xml:lang="en_US">
+		    <seg>Create a new User</seg>
+		  </tuv>
+		  <tuv xml:lang="es_AR">
+		    <seg>Crear un Usuario nuevo en el S&#237;stema</seg>
+		  </tuv>
 		</tu>
 		<tu tuid='currentLanguage'>
 			<tuv xml:lang="en_US">
 			</tuv>
 		</tu>
 		<tu tuid='dob'>
-			<tuv xml:lang="en_US">
-				<seg>Date Of Birth</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>Fecha De Nacimiento</seg>
-			</tuv>
+		  <tuv xml:lang="en_US">
+		    <seg>Date Of Birth</seg>
+		  </tuv>
+		  <tuv xml:lang="es_AR">
+		    <seg>Fecha De Nacimiento</seg>
+		  </tuv>
 		</tu>
 		<tu tuid='phone'>
-			<tuv xml:lang="en_US">
-				<seg>Phone</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>Telefono</seg>
-			</tuv>
+		  <tuv xml:lang="en_US">
+		    <seg>Phone</seg>
+		  </tuv>
+		  <tuv xml:lang="es_AR">
+		    <seg>Telefono</seg>
+		  </tuv>
 		</tu>
 		<tu tuid='fax'>
-			<tuv xml:lang="en_US">
-				<seg>Fax</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>Fax</seg>
-			</tuv>
+		  <tuv xml:lang="en_US">
+		    <seg>Fax</seg>
+		  </tuv>
+		  <tuv xml:lang="es_AR">
+		    <seg>Fax</seg>
+		  </tuv>
 		</tu>
 		<tu tuid='mobile'>
 			<tuv xml:lang="en_US">
 			</tuv>
 		</tu>
 		<tu tuid='viewrole'>
-			<tuv xml:lang="en_US">
-				<seg>View Roles</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>Ver Roles</seg>
-			</tuv>
+		  <tuv xml:lang="en_US">
+		    <seg>View Roles</seg>
+		  </tuv>
+		  <tuv xml:lang="es_AR">
+		    <seg>Ver Roles</seg>
+		  </tuv>
 		</tu>
 		<tu tuid='viewunit'>
-			<tuv xml:lang="en_US">
-				<seg>View Units</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>Ver Unidades</seg>
-			</tuv>
+		  <tuv xml:lang="en_US">
+		    <seg>View Units</seg>
+		  </tuv>
+		  <tuv xml:lang="es_AR">
+		    <seg>Ver Unidades</seg>
+		  </tuv>
 		</tu>
 		<tu tuid='deletelocked'>
-			<tuv xml:lang="en_US">
-				<seg>Can't Be Deleted</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>No puede ser Borrado</seg>
-			</tuv>
+		  <tuv xml:lang="en_US">
+		    <seg>Can't Be Deleted</seg>
+		  </tuv>
+		  <tuv xml:lang="es_AR">
+		    <seg>No puede ser Borrado</seg>
+		  </tuv>
 		</tu>
 		<tu tuid='updateMessage'>
-			<tuv xml:lang="en_US">
-				<seg>Update Message</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>Actualizar Mensaje</seg>
-			</tuv>
+		  <tuv xml:lang="en_US">
+		    <seg>Update Message</seg>
+		  </tuv>
+		  <tuv xml:lang="es_AR">
+		    <seg>Actualizar Mensaje</seg>
+		  </tuv>
 		</tu>
 		<tu tuid='roleaccesstitle'>
 			<tuv xml:lang="en_US">
 			</tuv>
 		</tu>
 		<tu tuid="duedate">
-			<tuv xml:lang="en_US">
-				<seg>Due Date</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>Fecha Vencimiento</seg>
-			</tuv>
+		  <tuv xml:lang="en_US">
+		    <seg>Due Date</seg>
+		  </tuv>
+		  <tuv xml:lang="es_AR">
+		    <seg>Fecha Vencimiento</seg>
+		  </tuv>
 		</tu>
 		<tu tuid="amttopay">
-			<tuv xml:lang="en_US">
-				<seg>Amount To Pay</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>Total a pagar</seg>
-			</tuv>
+		  <tuv xml:lang="en_US">
+		    <seg>Amount To Pay</seg>
+		  </tuv>
+		  <tuv xml:lang="es_AR">
+		    <seg>Total a pagar</seg>
+		  </tuv>
 		</tu>
 		<tu tuid="descriptionUsername">
-			<tuv xml:lang="en_US">
-				<seg>This is your username</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>Este es su nombre de usuario</seg>
-			</tuv>
+		  <tuv xml:lang="en_US">
+		    <seg>This is your username</seg>
+		  </tuv>
+		  <tuv xml:lang="es_AR">
+		    <seg>Este es su nombre de usuario</seg>
+		   </tuv>
 		</tu>
 		<tu tuid="descriptionPassword">
-			<tuv xml:lang="en_US">
-				<seg>This is your password</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>Esta es su contrase&#241;a</seg>
-			</tuv>
+		  <tuv xml:lang="en_US">
+		    <seg>This is your password</seg>
+		  </tuv>
+		  <tuv xml:lang="es_AR">
+		    <seg>Esta es su contrase&#241;a</seg>
+		  </tuv>
 		</tu>
 		<tu tuid="id">
-			<tuv xml:lang="en_US">
-				<seg>Id</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>Id</seg>
-			</tuv>
+		  <tuv xml:lang="en_US">
+		    <seg>Id</seg>
+		  </tuv>
+		  <tuv xml:lang="es_AR">
+		    <seg>Id</seg>
+		  </tuv>
 		</tu>
 		<tu tuid="actions">
-			<tuv xml:lang="en_US">
-				<seg>Actions</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>Acciones</seg>
-			</tuv>
+		  <tuv xml:lang="en_US">
+		    <seg>Actions</seg>
+		  </tuv>
+		  <tuv xml:lang="es_AR">
+		    <seg>Acciones</seg>
+		  </tuv>
 		</tu>
 		<tu tuid="update">
-			<tuv xml:lang="en_US">
-				<seg>Update</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>Actualizar</seg>
-			</tuv>
+		  <tuv xml:lang="en_US">
+		    <seg>Update</seg>
+		  </tuv>
+		  <tuv xml:lang="es_AR">
+		  <seg>Actualizar</seg>
+                </tuv>
 		</tu>
 		<tu tuid="delete">
-			<tuv xml:lang="en_US">
-				<seg>Delete</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>Borrar</seg>
-			</tuv>
+                  <tuv xml:lang="en_US">
+		    <seg>Delete</seg>
+		  </tuv>
+		  <tuv xml:lang="es_AR">
+		    <seg>Borrar</seg>
+		  </tuv>
 		</tu>
 		<tu tuid="view">
-			<tuv xml:lang="en_US">
-				<seg>View</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>Ver</seg>
-			</tuv>
+		  <tuv xml:lang="en_US">
+		    <seg>View</seg>
+		  </tuv>
+		  <tuv xml:lang="es_AR">
+		    <seg>Ver</seg>
+		  </tuv>
 		</tu>
 		<tu tuid="previous">
-			<tuv xml:lang="en_US">
-				<seg>Previous</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>Previo</seg>
-			</tuv>
+		  <tuv xml:lang="en_US">
+		    <seg>Previous</seg>
+		  </tuv>
+		  <tuv xml:lang="es_AR">
+		    <seg>Previo</seg>
+		  </tuv>
 		</tu>
 		<tu tuid="identifier">
-			<tuv xml:lang="en_US">
-				<seg>Message Identifier Key</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>Identificador del Mensaje</seg>
-			</tuv>
+		  <tuv xml:lang="en_US">
+		    <seg>Message Identifier Key</seg>
+		  </tuv>
+		  <tuv xml:lang="es_AR">
+		    <seg>Identificador del Mensaje</seg>
+		  </tuv>
 		</tu>
 		<tu tuid="back">
-			<tuv xml:lang="en_US">
-				<seg>Back</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>Atras</seg>
-			</tuv>
+		  <tuv xml:lang="en_US">
+		    <seg>Back</seg>
+		  </tuv>
+		  <tuv xml:lang="es_AR">
+		    <seg>Atras</seg>
+		  </tuv>
 		</tu>
 		<tu tuid="createMessage">
-			<tuv xml:lang="en_US">
-				<seg>Create Message</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>Crear Mensaje</seg>
-			</tuv>
+		  <tuv xml:lang="en_US">
+		    <seg>Create Message</seg>
+		  </tuv>
+		  <tuv xml:lang="es_AR">
+		    <seg>Crear Mensaje</seg>
+		  </tuv>
 		</tu>
 		<tu tuid="identifierDescription">
-			<tuv xml:lang="en_US">
-				<seg>This identifies a message in the system</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>Esto identifica a un mensaje en el s&#237;stema</seg>
-			</tuv>
+		  <tuv xml:lang="en_US">
+		    <seg>This identifies a message in the system</seg>
+		  </tuv>
+		  <tuv xml:lang="es_AR">
+		    <seg>Esto identifica a un mensaje en el s&#237;stema</seg>
+		  </tuv>
 		</tu>
 		<tu tuid="categoryDescription">
-			<tuv xml:lang="en_US">
-				<seg>This denotes the kind of message you are creating</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>Esto selecciona el tipo de mensaje que crea</seg>
-			</tuv>
+		  <tuv xml:lang="en_US">
+		    <seg>This denotes the kind of message you are creating</seg>
+		  </tuv>
+		  <tuv xml:lang="es_AR">
+		    <seg>Esto selecciona el tipo de mensaje que crea</seg>
+		  </tuv>
 		</tu>
 		<tu tuid="messageDescription">
-			<tuv xml:lang="en_US">
-				<seg>This is the message that the user will see. Do not use html
-					tags</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>Este es el mensaje que el usuario ve. No use etiquetas html</seg>
-			</tuv>
+		  <tuv xml:lang="en_US">
+		    <seg>This is the message that the user will see. Do not use html tags</seg>
+                  </tuv>
+                  <tuv xml:lang="es_AR">
+		    <seg>Este es el mensaje que el usuario ve. No use etiquetas html</seg>
+		  </tuv>
 		</tu>
 		<tu tuid="lockedDescription">
-			<tuv xml:lang="en_US">
-				<seg>This message won't be deleted</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>Este mensaje no se puede eliminar</seg>
-			</tuv>
+		  <tuv xml:lang="en_US">
+		    <seg>This message won't be deleted</seg>
+		  </tuv>
+		  <tuv xml:lang="es_AR">
+		    <seg>Este mensaje no se puede eliminar</seg>
+		  </tuv>
 		</tu>
 		<tu tuid="createnmrs">
-			<tuv xml:lang="en_US">
-				<seg>Create a new Model Rent Schedule</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>Crear un nuevo modelo de plan de renta</seg>
-			</tuv>
+		  <tuv xml:lang="en_US">
+		    <seg>Create a new Model Rent Schedule</seg>
+		  </tuv>
+		  <tuv xml:lang="es_AR">
+		    <seg>Crear un nuevo modelo de plan de renta</seg>
+		  </tuv>
 		</tu>
 		<tu tuid="effectiveDate">
-			<tuv xml:lang="en_US">
-				<seg>Effective Date</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>Fecha Efectiva</seg>
-			</tuv>
+		  <tuv xml:lang="en_US">
+		    <seg>Effective Date</seg>
+		  </tuv>
+		  <tuv xml:lang="es_AR">
+		    <seg>Fecha Efectiva</seg>
+		  </tuv>
 		</tu>
 		<tu tuid="createrentschedule">
-			<tuv xml:lang="en_US">
-				<seg>Create Rent Schedule</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>Crear Plan De Renta</seg>
-			</tuv>
+		  <tuv xml:lang="en_US">
+		    <seg>Create Rent Schedule</seg>
+		  </tuv>
+		  <tuv xml:lang="es_AR">
+		    <seg>Crear Plan De Renta</seg>
+		  </tuv>
 		</tu>
 		<tu tuid="addRow">
-			<tuv xml:lang="en_US">
-				<seg>Add Row</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>Agregar Fila</seg>
-			</tuv>
+		  <tuv xml:lang="en_US">
+		    <seg>Add Row</seg>
+		  </tuv>
+		  <tuv xml:lang="es_AR">
+		    <seg>Agregar Fila</seg>
+		  </tuv>
 		</tu>
 		<tu tuid="month">
-			<tuv xml:lang="en_US">
-				<seg>Month</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>Mes</seg>
-			</tuv>
+		  <tuv xml:lang="en_US">
+		    <seg>Month</seg>
+		  </tuv>
+		  <tuv xml:lang="es_AR">
+		    <seg>Mes</seg>
+		  </tuv>
 		</tu>
 		<tu tuid="rentamount">
-			<tuv xml:lang="en_US">
-				<seg>Rent amount</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>Total renta</seg>
-			</tuv>
+		  <tuv xml:lang="en_US">
+		    <seg>Rent amount</seg>
+		  </tuv>
+		  <tuv xml:lang="es_AR">
+		    <seg>Total renta</seg>
+		  </tuv>
 		</tu>
 		<tu tuid="calendarTitle">
-			<tuv xml:lang="en_US">
-				<seg>Calendar</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>Calendario</seg>
-			</tuv>
+		  <tuv xml:lang="en_US">
+		    <seg>Calendar</seg>
+		  </tuv>
+		  <tuv xml:lang="es_AR">
+		    <seg>Calendario</seg>
+		  </tuv>
 		</tu>
 		<tu tuid="permissionTitle">
-			<tuv xml:lang="en_US">
-				<seg>Pages</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>P&#193;ginas</seg>
-			</tuv>
+		  <tuv xml:lang="en_US">
+		    <seg>Pages</seg>
+		  </tuv>
+		  <tuv xml:lang="es_AR">
+		    <seg>P&#193;ginas</seg>
+		  </tuv>
 		</tu>
 		<tu tuid="aliasHeader">
-			<tuv xml:lang="en_US">
-				<seg>Alias</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>Alias</seg>
-			</tuv>
+		  <tuv xml:lang="en_US">
+		    <seg>Alias</seg>
+		  </tuv>
+		  <tuv xml:lang="es_AR">
+		    <seg>Alias</seg>
+		  </tuv>
 		</tu>
 		<tu tuid="permissionTitle">
-			<tuv xml:lang="en_US">
-				<seg>Permission Section</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>Secci&#243;n permisos</seg>
-			</tuv>
+		  <tuv xml:lang="en_US">
+		    <seg>Permission Section</seg>
+		  </tuv>
+		  <tuv xml:lang="es_AR">
+		    <seg>Secci&#243;n permisos</seg>
+		  </tuv>
 		</tu>
 		<tu tuid="permissionUpdateDescription">
-			<tuv xml:lang="en_US">
-				<seg>Update Alias</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>Actualizar Alias</seg>
-			</tuv>
+		  <tuv xml:lang="en_US">
+		    <seg>Update Alias</seg>
+		  </tuv>
+		  <tuv xml:lang="es_AR">
+		    <seg>Actualizar Alias</seg>
+		  </tuv>
 		</tu>
 		<tu tuid="notvaliddate">
-			<tuv xml:lang="en_US">
-				<seg>Is not a valid date</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>No es una fecha valida</seg>
-			</tuv>
+		  <tuv xml:lang="en_US">
+		    <seg>Is not a valid date</seg>
+		  </tuv>
+		  <tuv xml:lang="es_AR">
+		    <seg>No es una fecha valida</seg>
+		  </tuv>
 		</tu>
 		<tu tuid="notvaliddaterange">
-			<tuv xml:lang="en_US">
-				<seg>The from is greater than date to</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>La fecha desde es anterior a la fecha hasta</seg>
-			</tuv>
+		  <tuv xml:lang="en_US">
+		    <seg>The from is greater than date to</seg>
+		  </tuv>
+		  <tuv xml:lang="es_AR">
+		    <seg>La fecha desde es anterior a la fecha hasta</seg>
+		  </tuv>
 		</tu>
 		<tu tuid="eventData">
-			<tuv xml:lang="en_US">
-				<seg>Event Data</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>Informacion del evento</seg>
-			</tuv>
+		  <tuv xml:lang="en_US">
+		    <seg>Event Data</seg>
+		  </tuv>
+		  <tuv xml:lang="es_AR">
+		    <seg>Informacion del evento</seg>
+		  </tuv>
 		</tu>
 		<tu tuid="isRecursive">
-			<tuv xml:lang="en_US">
-				<seg>Is A Recursive Event?</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>Es Un Evento Recursivo?</seg>
-			</tuv>
+		  <tuv xml:lang="en_US">
+		    <seg>Is A Recursive Event?</seg>
+		  </tuv>
+		  <tuv xml:lang="es_AR">
+		    <seg>Es Un Evento Recursivo?</seg>
+		  </tuv>
 		</tu>
 		<tu tuid="recursivePeriod">
-			<tuv xml:lang="en_US">
-				<seg>Recursive period of this event</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>Recursividad de este evento</seg>
-			</tuv>
+		  <tuv xml:lang="en_US">
+		    <seg>Recursive period of this event</seg>
+		  </tuv>
+		  <tuv xml:lang="es_AR">
+		    <seg>Recursividad de este evento</seg>
+		  </tuv>
 		</tu>
 		<tu tuid="days">
-			<tuv xml:lang="en_US">
-				<seg>Days</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>Dias</seg>
-			</tuv>
+		  <tuv xml:lang="en_US">
+		    <seg>Days</seg>
+		  </tuv>
+		  <tuv xml:lang="es_AR">
+		    <seg>Dias</seg>
+		  </tuv>
 		</tu>
 		<tu tuid="weeks">
-			<tuv xml:lang="en_US">
-				<seg>Weeks</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>Semanas</seg>
-			</tuv>
+		  <tuv xml:lang="en_US">
+                    <seg>Weeks</seg>
+		  </tuv>
+		  <tuv xml:lang="es_AR">
+		    <seg>Semanas</seg>
+		  </tuv>
 		</tu>
 		<tu tuid="months">
-			<tuv xml:lang="en_US">
-				<seg>Months</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>Meses</seg>
-			</tuv>
+		  <tuv xml:lang="en_US">
+		    <seg>Months</seg>
+		  </tuv>
+		  <tuv xml:lang="es_AR">
+		    <seg>Meses</seg>
+		  </tuv>
 		</tu>
 		<tu tuid="years">
-			<tuv xml:lang="en_US">
-				<seg>Years</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>A&#241;os</seg>
-			</tuv>
+		  <tuv xml:lang="en_US">
+		    <seg>Years</seg>
+		  </tuv>
+		  <tuv xml:lang="es_AR">
+		    <seg>A&#241;os</seg>
+		  </tuv>
 		</tu>
 		<tu tuid="startDate">
-			<tuv xml:lang="en_US">
-				<seg>Event date from</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>Fecha desde del evento</seg>
-			</tuv>
+		  <tuv xml:lang="en_US">
+		    <seg>Event date from</seg>
+		  </tuv>
+		  <tuv xml:lang="es_AR">
+		    <seg>Fecha desde del evento</seg>
+		  </tuv>
 		</tu>
 		<tu tuid="endDate">
-			<tuv xml:lang="en_US">
-				<seg>Event date to</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>Fecha hasta del evento</seg>
-			</tuv>
+		  <tuv xml:lang="en_US">
+		    <seg>Event date to</seg>
+		  </tuv>
+		  <tuv xml:lang="es_AR">
+		    <seg>Fecha hasta del evento</seg>
+		  </tuv>
 		</tu>
 		<tu tuid="usesqlformat">
-			<tuv xml:lang="en_US">
-				<seg>Please, use Year - month - date</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>Por favor, use A&#241;o - mes - d&#247;a</seg>
-			</tuv>
+		  <tuv xml:lang="en_US">
+		    <seg>Please, use Year - month - date</seg>
+		  </tuv>
+		  <tuv xml:lang="es_AR">
+		    <seg>Por favor, use A&#241;o - mes - d&#247;a</seg>
+		  </tuv>
 		</tu>
 		<tu tuid="createEvent">
-			<tuv xml:lang="en_US">
-				<seg>Create Event</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>Crear Evento</seg>
-			</tuv>
+		  <tuv xml:lang="en_US">
+		    <seg>Create Event</seg>
+		  </tuv>
+		  <tuv xml:lang="es_AR">
+		    <seg>Crear Evento</seg>
+		  </tuv>
 		</tu>
 		<tu tuid="startTime">
-			<tuv xml:lang="en_US">
-				<seg>Time this event starts</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>Fecha de inicio de este evento</seg>
-			</tuv>
+		  <tuv xml:lang="en_US">
+		    <seg>Time this event starts</seg>
+		</tuv>
+		  <tuv xml:lang="es_AR">
+		    <seg>Fecha de inicio de este evento</seg>
+		  </tuv>
 		</tu>
 		<tu tuid="endTime">
-			<tuv xml:lang="en_US">
-				<seg>Time this event ends</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>Fecha de finalizaci&#243;n de este evento</seg>
-			</tuv>
+		  <tuv xml:lang="en_US">
+		    <seg>Time this event ends</seg>
+		  </tuv>
+		  <tuv xml:lang="es_AR">
+		    <seg>Fecha de finalizaci&#243;n de este evento</seg>
+		  </tuv>
 		</tu>
 		<tu tuid="isArecrusiveEventDescription">
-			<tuv xml:lang="en_US">
-				<seg>Fill the number of days,months,weeks or years this event
-					happens</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>Llene el numero de d&#247;as, a&#241;os,meses o semanas que
-					este evento occure</seg>
-			</tuv>
+		  <tuv xml:lang="en_US">
+		    <seg>Fill the number of days,months,weeks or years this event happens</seg>
+                  </tuv>
+                  <tuv xml:lang="es_AR">
+                    <seg>Llene el numero de d&#247;as, a&#241;os,meses o semanas que este evento occure</seg>
+                  </tuv>
 		</tu>
 		<tu tuid="attendees">
-			<tuv xml:lang="en_US">
-				<seg>Guests</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>Invitados</seg>
-			</tuv>
+                  <tuv xml:lang="en_US">
+		    <seg>Guests</seg>
+		  </tuv>
+		  <tuv xml:lang="es_AR">
+		    <seg>Invitados</seg>
+		  </tuv>
 		</tu>
 		<tu tuid="noattendees">
-			<tuv xml:lang="en_US">
-				<seg>You do not have guests</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>Usted no tiene Invitados</seg>
-			</tuv>
+		  <tuv xml:lang="en_US">
+		    <seg>You do not have guests</seg>
+		  </tuv>
+		  <tuv xml:lang="es_AR">
+		    <seg>Usted no tiene Invitados</seg>
+		  </tuv>
 		</tu>
 		<tu tuid="attendeesDescription">
-			<tuv xml:lang="en_US">
-				<seg>Select users from the list</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>Seleccione usuarios de la lista</seg>
-			</tuv>
+		  <tuv xml:lang="en_US">
+		    <seg>Select users from the list</seg>
+		  </tuv>
+		  <tuv xml:lang="es_AR">
+		    <seg>Seleccione usuarios de la lista</seg>
+		  </tuv>
 		</tu>
 		<tu tuid="dayView">
-			<tuv xml:lang="en_US">
-				<seg>Day</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>Dia</seg>
-			</tuv>
+		  <tuv xml:lang="en_US">
+		    <seg>Day</seg>
+		  </tuv>
+		  <tuv xml:lang="es_AR">
+		    <seg>Dia</seg>
+		  </tuv>
 		</tu>
 		<tu tuid="weekView">
-			<tuv xml:lang="en_US">
-				<seg>Week</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>Semana</seg>
-			</tuv>
+		  <tuv xml:lang="en_US">
+		    <seg>Week</seg>
+		  </tuv>
+		  <tuv xml:lang="es_AR">
+		    <seg>Semana</seg>
+		  </tuv>
 		</tu>
 		<tu tuid="monthView">
-			<tuv xml:lang="en_US">
-				<seg>Month</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>Mes</seg>
-			</tuv>
+		  <tuv xml:lang="en_US">
+		    <seg>Month</seg>
+		  </tuv>
+		  <tuv xml:lang="es_AR">
+		    <seg>Mes</seg>
+		  </tuv>
 		</tu>
 		<tu tuid="dailyview">
-			<tuv xml:lang="en_US">
-				<seg>Daily View</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>Vista Diaria</seg>
-			</tuv>
+		  <tuv xml:lang="en_US">
+		    <seg>Daily View</seg>
+		  </tuv>
+		  <tuv xml:lang="es_AR">
+		    <seg>Vista Diaria</seg>
+		  </tuv>
 		</tu>
 		<tu tuid="notvalidtime">
-			<tuv xml:lang="en_US">
-				<seg>Is not a valid time entry</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>No es una entrada de tiempo valida</seg>
-			</tuv>
+		  <tuv xml:lang="en_US">
+		    <seg>Is not a valid time entry</seg>
+		  </tuv>
+		  <tuv xml:lang="es_AR">
+		    <seg>No es una entrada de tiempo valida</seg>
+		  </tuv>
 		</tu>
 		<tu tuid="notvalidtimerange">
 			<tuv xml:lang="en_US">
 			</tuv>
 		</tu>
 		<tu tuid="yes">
-			<tuv xml:lang="en_US">
-				<seg>Yes</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>Si</seg>
-			</tuv>
+                  <tuv xml:lang="en_US">
+                    <seg>Yes</seg>
+		  </tuv>
+		  <tuv xml:lang="es_AR">
+		    <seg>Si</seg>
+		  </tuv>
 		</tu>
 		<tu tuid="no">
-			<tuv xml:lang="en_US">
-				<seg>No</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>No</seg>
-			</tuv>
+		  <tuv xml:lang="en_US">
+		    <seg>No</seg>
+		  </tuv>
+		  <tuv xml:lang="es_AR">
+		    <seg>No</seg>
+		  </tuv>
 		</tu>
 		<tu tuid="noaccess">
-			<tuv xml:lang="en_US">
-				<seg>You can't view this resource</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>No puede acceder a este recurso</seg>
-			</tuv>
+		  <tuv xml:lang="en_US">
+		    <seg>You can't view this resource</seg>
+		  </tuv>
+		  <tuv xml:lang="es_AR">
+		    <seg>No puede acceder a este recurso</seg>
+		  </tuv>
 		</tu>
 		<tu tuid="occurrences">
-			<tuv xml:lang="en_US">
-				<seg>Time Schedule</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>Horarios</seg>
-			</tuv>
+		  <tuv xml:lang="en_US">
+		    <seg>Time Schedule</seg>
+		  </tuv>
+		  <tuv xml:lang="es_AR">
+		    <seg>Horarios</seg>
+		  </tuv>
 		</tu>
 		<tu tuid="eventDate">
-			<tuv xml:lang="en_US">
-				<seg>Date of this event</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>Fecha de este evento</seg>
-			</tuv>
+		  <tuv xml:lang="en_US">
+		    <seg>Date of this event</seg>
+		  </tuv>
+		  <tuv xml:lang="es_AR">
+		    <seg>Fecha de este evento</seg>
+		  </tuv>
 		</tu>
 		<tu tuid="eventTime">
-			<tuv xml:lang="en_US">
-				<seg>Time of this event</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>Horario de este evento</seg>
-			</tuv>
+		  <tuv xml:lang="en_US">
+		    <seg>Time of this event</seg>
+		  </tuv>
+		  <tuv xml:lang="es_AR">
+		    <seg>Horario de este evento</seg>
+		  </tuv>
 		</tu>
 		<tu tuid="to">
-			<tuv xml:lang="en_US">
-				<seg>To</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>Hasta</seg>
-			</tuv>
+		  <tuv xml:lang="en_US">
+		    <seg>To</seg>
+		  </tuv>
+		  <tuv xml:lang="es_AR">
+		    <seg>Hasta</seg>
+		  </tuv>
 		</tu>
 		<tu tuid="event">
-			<tuv xml:lang="en_US">
-				<seg>Event</seg>
-			</tuv>
-			<tuv xml:lang="es_AR">
-				<seg>Evento</seg>
-			</tuv>
+		  <tuv xml:lang="en_US">
+		    <seg>Event</seg>
+		  </tuv>
+		  <tuv xml:lang="es_AR">
+		    <seg>Evento</seg>
+		  </tuv>
 		</tu>
 		<tu tuid="paginationControls">
-			<tuv xml:lang="en_US">
-				<seg>Pagination control</seg>
-			</tuv>