[Vtigercrm-commits] [vtiger-commits] r10611 - in /vtigercrm/branches/5.0.3/include: language/en_us.lang.php utils/ListViewUtils.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: richie
Date: Tue Apr 10 01:49:43 2007
New Revision: 10611

Log:
fix for i18n issues. Fixes #3285 #3645 #3569 #3283 #3281

Modified:
    vtigercrm/branches/5.0.3/include/language/en_us.lang.php
    vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php

Modified: vtigercrm/branches/5.0.3/include/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/include/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/include/language/en_us.lang.php Tue Apr 10 01:49:43 2007
@@ -675,7 +675,7 @@
 'Reminder' => '[Reminder:',
 'Visit_Link' => 'Kindly visit the link for more details on the activity',
 'Click here' => 'Click here',
-'Subject' => 'Subject:',
+'Subject' => 'Subject',
 'Support_starting' => 'Support starting',
 'Congratulations' => 'Congratulations! Your support starts from today',
 'Hello_Support' => 'Hello! Support Starts for',
@@ -843,6 +843,9 @@
 'LBL_SKYPE'=>'Skype',
 'LBL_FIND'=>'Find',
 'LBL_CLEAR'=>'Clear',
+
+// Added for display the label of Invoice no
+'invoice no'=>'invoice no',
 );
 
 $app_list_strings = array (

Modified: vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php
==============================================================================
--- vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php (original)
+++ vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php Tue Apr 10 01:49:43 2007
@@ -1005,13 +1005,14 @@
 
 function getValue($field_result, $list_result,$fieldname,$focus,$module,$entity_id,$list_result_count,$mode,$popuptype,$returnset='',$viewid='')
 {
-	global $log,$app_strings;
+	global $log,$app_strings,$current_language;
 	$log->debug("Entering getValue(".$field_result.",". $list_result.",".$fieldname.",".$focus.",".$module.",".$entity_id.",".$list_result_count.",".$mode.",".$popuptype.",".$returnset.",".$viewid.") method ...");
 	global $adb,$current_user;
 	
 	require('user_privileges/user_privileges_'.$current_user->id.'.php');
 	$tabname = getParentTab();
 	$tabid = getTabid($module);
+	$current_module_strings = return_module_language($current_language, $module);
 	$uicolarr=$field_result[$fieldname];
 	foreach($uicolarr as $key=>$value)
 	{
@@ -1080,6 +1081,22 @@
 		}*/
 		
 		
+	}
+	elseif($uitype == 15 || $uitype == 111 ||  $uitype == 16)
+	{
+		$temp_val = $adb->query_result($list_result,$list_result_count,$colname);
+		if($current_module_strings[$temp_val] != '')
+		{
+			$value = $current_module_strings[$temp_val];
+		}
+		elseif($app_strings[$temp_val] != '')
+		{
+			$value = $app_strings[$temp_val];
+		}
+		else
+		{
+			$value = $temp_val;
+		}
 	}
 	elseif($uitype == 71 || $uitype == 72)
 	{