[Vtigercrm-commits] [vtiger-commits] r10140 - in /vtigercrm/branches/5.0.3: Smarty/templates/ActivityDetailView.tpl modules/Calendar/DetailView.php modules/Calendar/language/en_us.lang.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: richie
Date: Thu Feb  1 22:28:30 2007
New Revision: 10140

Log:
fix for ticketid:2920

Modified:
    vtigercrm/branches/5.0.3/Smarty/templates/ActivityDetailView.tpl
    vtigercrm/branches/5.0.3/modules/Calendar/DetailView.php
    vtigercrm/branches/5.0.3/modules/Calendar/language/en_us.lang.php

Modified: vtigercrm/branches/5.0.3/Smarty/templates/ActivityDetailView.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/ActivityDetailView.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/ActivityDetailView.tpl Thu Feb  1 22:28:30 2007
@@ -115,12 +115,14 @@
 						     <table border=0 cellspacing=0 cellpadding=5 width=100% >
                						 <tr>
 								{if $LABEL.activitytype neq ''}
+								{assign var=type value=$ACTIVITYDATA.activitytype}
 								<td class="cellLabel" width="20%" align="right"><b>{$MOD.LBL_EVENTTYPE}</b></td>
-								<td class="cellInfo" width="30%"align="left">{$ACTIVITYDATA.activitytype}</td>
+								<td class="cellInfo" width="30%"align="left">{$MOD.$type}</td>
 								{/if}
 								{if $LABEL.visibility neq ''}
+								{assign var=vblty value=$ACTIVITYDATA.visibility}
 								<td class="cellLabel" width="20%" align="right"><b>{$LABEL.visibility}</b></td>
-                                                                <td class="cellInfo" width="30%" align="left" >{$ACTIVITYDATA.visibility}</td>
+                                                                <td class="cellInfo" width="30%" align="left" >{$MOD.$vblty}</td>
 								{/if}
 							 </tr>
 							 <tr>

Modified: vtigercrm/branches/5.0.3/modules/Calendar/DetailView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Calendar/DetailView.php (original)
+++ vtigercrm/branches/5.0.3/modules/Calendar/DetailView.php Thu Feb  1 22:28:30 2007
@@ -129,9 +129,9 @@
 $data['endfmt'] = $time_arr['endfmt'];
 $data['record'] = $focus->id;
 if(isset($finaldata['sendnotification']) && $finaldata['sendnotification'] == 'yes')
-        $data['sendnotification'] = 'Yes';
+        $data['sendnotification'] = $mod_strings['LBL_YES'];
 else
-        $data['sendnotification'] = 'No';
+        $data['sendnotification'] = $mod_strings['LBL_NO'];
 $data['subject'] = $finaldata['subject'];
 $data['date_start'] = $stdate;
 $data['due_date'] = $enddate;
@@ -168,18 +168,18 @@
 	$rem_min = 0;
 	if($focus->column_fields['reminder_time'] != null)
 	{
-		$data['set_reminder'] = 'Yes';
+		$data['set_reminder'] = $mod_strings['LBL_YES'];
 		$data['reminder_str'] = $finaldata['reminder_time'];
 	}
 	else
-		$data['set_reminder'] = 'No';
+		$data['set_reminder'] = $mod_strings['LBL_NO'];
 	//To set recurring details
 	$query = 'select vtiger_recurringevents.recurringfreq,vtiger_recurringevents.recurringinfo from vtiger_recurringevents where vtiger_recurringevents.activityid = '.$focus->id;
 	$res = $adb->query($query);
 	$rows = $adb->num_rows($res);
 	if($rows != 0)
 	{
-		$data['recurringcheck'] = 'Yes';
+		$data['recurringcheck'] = $mod_strings['LBL_YES'];
 		$data['repeat_frequency'] = $adb->query_result($res,0,'recurringfreq');
 		$recurringinfo =  explode("::",$adb->query_result($res,0,'recurringinfo'));
 		$data['recurringtype'] = $recurringinfo[0];
@@ -206,7 +206,7 @@
 			if($recurringinfo[1] == 'date')
 			{
 				$data['repeatMonth_date'] = $recurringinfo[2];
-				$monthrpt_str .= 'on '.$recurringinfo[2].' day of the month';
+				$monthrpt_str .= $mod_strings['on'].'&nbsp;'.$recurringinfo[2].'&nbsp;'.$mod_strings['day of the month'];
 			}
 			else 
 			{ 
@@ -244,7 +244,7 @@
 	}
 	else 
 	{   
-		$data['recurringcheck'] = 'No';
+		$data['recurringcheck'] = $mod_strings['LBL_NO'];
 		$data['repeat_month_str'] = '';
 	}
 	$sql = 'select vtiger_users.user_name,vtiger_invitees.* from vtiger_invitees left join vtiger_users on vtiger_invitees.inviteeid=vtiger_users.id where activityid='.$focus->id;

Modified: vtigercrm/branches/5.0.3/modules/Calendar/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Calendar/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/modules/Calendar/language/en_us.lang.php Thu Feb  1 22:28:30 2007
@@ -379,6 +379,8 @@
 'Last'=>'Last', 
 'on'=>'on', 
 'day of the month'=>'day of the month',
+'Private'=>'Private',
+'Public'=>'Public',
 
 //Added for existing Picklist entries