[Vtigercrm-commits] [vtiger-commits] r9660 - in /vtigercrm/branches/5.0.2: include/language/en_us.lang.php modules/Settings/EditComboField.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: richie
Date: Wed Oct 18 09:02:47 2006
New Revision: 9660

Log:
* Modified to translate the Popup Picklist Edit i18n, Fixes #2193

Modified:
    vtigercrm/branches/5.0.2/include/language/en_us.lang.php
    vtigercrm/branches/5.0.2/modules/Settings/EditComboField.php

Modified: vtigercrm/branches/5.0.2/include/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.2/include/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.2/include/language/en_us.lang.php Wed Oct 18 09:02:47 2006
@@ -1028,6 +1028,19 @@
 //Record deleted message
 'LBL_RECORD_DELETE'=>'The record you are trying to view has been deleted.',
 'Part Number'=>'Part Number',
+
+//Added after 5.0.1
+'Salutation'=>'Salutation ',
+'Rating'=>'Rating',
+'industry'=>'Industry',
+'Severity'=>'Severity',
+'Product Category'=>'Product Category',
+'GL Account'=>'GL Account',
+'Usage Unit'=>'Usage Unit',
+'Carrier'=>'Carrier',
+'Expected Response'=>'Expected Response',
+'LBL_ADDRESS_INF'=>'Address Information',
+
 );
 
 

Modified: vtigercrm/branches/5.0.2/modules/Settings/EditComboField.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Settings/EditComboField.php (original)
+++ vtigercrm/branches/5.0.2/modules/Settings/EditComboField.php Wed Oct 18 09:02:47 2006
@@ -91,7 +91,9 @@
 $smarty->assign("ENTRIES",$fldVal);
 $smarty->assign("MODULE",$moduleName);
 $smarty->assign("FIELDNAME",$tableName);
-$smarty->assign("FIELDLABEL",$fieldlabel);
+//First look into app_strings and then mod_strings and if not available then original label will be displayed
+$temp_label = isset($app_strings[$fieldlabel])?$app_strings[$fieldlabel]:(isset($mod_strings[$fieldlabel])?$mod_strings[$fieldlabel]:$fieldlabel);
+$smarty->assign("FIELDLABEL",$temp_label);
 $smarty->assign("UITYPE", $uitype);
 $smarty->assign("MOD", return_module_language($current_language,'Settings'));
 $smarty->assign("IMAGE_PATH",$image_path);