[Vtigercrm-commits] [vtiger-commits] r10820 - in /vtigercrm/branches/5.0.3: include/language/en_us.lang.php modules/Emails/mailSelect.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: richie
Date: Mon Apr 30 07:02:57 2007
New Revision: 10820

Log:
* Fixed the i18n issue and removed unwanted if conditions, Fixed #3681

Modified:
    vtigercrm/branches/5.0.3/include/language/en_us.lang.php
    vtigercrm/branches/5.0.3/modules/Emails/mailSelect.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 Mon Apr 30 07:02:57 2007
@@ -876,6 +876,7 @@
 'Lead Status'=>'Lead Status',
 'Lead Source'=>'Lead Source',
 'Quote ID'=>'Quote Id',
+'Yahoo Id'=>'Yahoo Id',
 );
 
 $app_list_strings = array (

Modified: vtigercrm/branches/5.0.3/modules/Emails/mailSelect.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Emails/mailSelect.php (original)
+++ vtigercrm/branches/5.0.3/modules/Emails/mailSelect.php Mon Apr 30 07:02:57 2007
@@ -25,18 +25,9 @@
 $smarty = new vtigerCRM_Smarty;
 
 $userid =  $current_user->id;
-if($pmodule=='Accounts')
-{
-	$querystr="select fieldid,fieldname,fieldlabel,columnname,tablename from vtiger_field where tabid=6 and uitype=13";
-}
-elseif ($pmodule=='Contacts')
-{
-	$querystr="select fieldid,fieldname,fieldlabel,columnname from vtiger_field where tabid=4 and uitype=13";
-}
-elseif ($pmodule=='Leads')
-{
-	$querystr="select fieldid,fieldname,fieldlabel,columnname from vtiger_field where tabid=7 and uitype=13";
-}
+
+$querystr = "select fieldid, fieldlabel, columnname from vtiger_field where tabid=".getTabid($pmodule)." and uitype=13";
+
 $res=$adb->query($querystr);
 $numrows = $adb->num_rows($res);
 $returnvalue = Array();
@@ -50,7 +41,8 @@
 		$temp=$adb->query_result($res,$i,'columnname');
 		$columnlists [] = $temp;
 		$fieldid=$adb->query_result($res,$i,'fieldid');
-		$value[] =$adb->query_result($res,$i,'fieldlabel');
+		$fieldlabel =$adb->query_result($res,$i,'fieldlabel');
+		$value[] = getTranslatedString($fieldlabel);
 		$returnvalue [$fieldid]= $value;
 	}
 }