[Vtigercrm-commits] [vtiger-commits] r10493 - in /vtigercrm/branches/5.0.3: include/js/en_us.lang.js include/language/en_us.lang.php modules/Reports/ReportColumns.php modules/Reports/Reports.js

[vtigercrm-commits at vtiger.fosslabs.com]

Author: saraj
Date: Tue Mar 20 04:23:13 2007
New Revision: 10493

Log:
i18n added for reports columns

Modified:
    vtigercrm/branches/5.0.3/include/js/en_us.lang.js
    vtigercrm/branches/5.0.3/include/language/en_us.lang.php
    vtigercrm/branches/5.0.3/modules/Reports/ReportColumns.php
    vtigercrm/branches/5.0.3/modules/Reports/Reports.js

Modified: vtigercrm/branches/5.0.3/include/js/en_us.lang.js
==============================================================================
--- vtigercrm/branches/5.0.3/include/js/en_us.lang.js (original)
+++ vtigercrm/branches/5.0.3/include/js/en_us.lang.js Tue Mar 20 04:23:13 2007
@@ -93,4 +93,15 @@
                                 SELECT_TEMPLATE_TO_MERGE:'Please select a template to merge',
 				YES:'yes',
                                 NO:'no',
+
+				EQUALS:'equals',
+				NOT_EQUALS_TO:'not equal to',
+				STARTS_WITH:'starts with',
+				CONTAINS:'contains',	
+				DOES_NOT_CONTAINS:'does not contains',
+				LESS_THAN:'less than',
+				GREATER_THAN:'greater than',
+				LESS_OR_EQUALS:'less or equal',
+				GREATER_OR_EQUALS:'greater or equal',
+				
                        };

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 Mar 20 04:23:13 2007
@@ -647,7 +647,7 @@
 //Added for values of picklist in Advanced Search filter
 'contains'=>'contains',
 'does not contains'=>'does not contains',
-'is'=>'is',
+'equals'=>'equals',
 'is not'=>'is not',
 'begins with'=>'begins with',
 'ends with'=>'ends with',
@@ -828,6 +828,17 @@
 'MSG_VTIGERTEAM'=>' vTiger Team',
 'MSG_IS_NOT_UPLOADED'=>'is not uploaded. Allowed file types - jpeg, png, jpg, pjpeg, x-png or gif',
 'MSG_IMAGE_ERROR'=>'Image not found',
+
+'Information'=>'Information',
+'Address'=>'Address',
+'Custom Information'=>'Custom Information',
+'Portal Information'=>'- Portal Information',
+'Description'=>'Description',
+'Expectations'=>'Expectations',
+'Pricing Information'=>'Pricing Information',
+'Stock Information'=>'Stock Information',
+'Solution'=>'Solution',
+'Terms and Conditions'=>'Terms and Conditions',
 );
 
 $app_list_strings = array (

Modified: vtigercrm/branches/5.0.3/modules/Reports/ReportColumns.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Reports/ReportColumns.php (original)
+++ vtigercrm/branches/5.0.3/modules/Reports/ReportColumns.php Tue Mar 20 04:23:13 2007
@@ -64,6 +64,7 @@
 {
 	global $ogReport;
 	global $app_list_strings;
+	global $app_strings;
 	global $current_language;
 
 	$mod_strings = return_module_language($current_language,$module);
@@ -71,7 +72,8 @@
 	{
 		if(isset($ogReport->pri_module_columnslist[$module][$key]))
 		{
-			$shtml .= "<optgroup label=\"".$app_list_strings['moduleList'][$module]." ".$key."\" class=\"select\" style=\"border:none\">";
+			
+			$shtml .= "<optgroup label=\"".$app_list_strings['moduleList'][$module]." ".$app_strings[$key]."\" class=\"select\" style=\"border:none\">";
 			foreach($ogReport->pri_module_columnslist[$module][$key] as $field=>$fieldlabel)
 			{
 				if(isset($mod_strings[$fieldlabel]))
@@ -97,7 +99,7 @@
 function getSecondaryColumnsHTML($module)
 {
 	global $ogReport;
-	global $app_list_strings;
+	global $app_list_strings,$app_strings;
 	global $current_language;
 
 	if($module != "")
@@ -110,7 +112,7 @@
 			{
 				if(isset($ogReport->sec_module_columnslist[$secmodule[$i]][$key]))
 				{
-					$shtml .= "<optgroup label=\"".$app_list_strings['moduleList'][$secmodule[$i]]." ".$key."\" class=\"select\" style=\"border:none\">";
+					$shtml .= "<optgroup label=\"".$app_list_strings['moduleList'][$secmodule[$i]]." ".$app_strings[$key]."\" class=\"select\" style=\"border:none\">";
 					foreach($ogReport->sec_module_columnslist[$secmodule[$i]][$key] as $field=>$fieldlabel)
 					{
 						if(isset($mod_strings[$fieldlabel]))

Modified: vtigercrm/branches/5.0.3/modules/Reports/Reports.js
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Reports/Reports.js (original)
+++ vtigercrm/branches/5.0.3/modules/Reports/Reports.js Tue Mar 20 04:23:13 2007
@@ -16,15 +16,15 @@
 typeofdata['D'] = ['e','n','l','g','m','h'];
 
 var fLabels = new Array();
-fLabels['e'] = 'equals';
-fLabels['n'] = 'not equal to';
-fLabels['s'] = 'starts with';
-fLabels['c'] = 'contains';
-fLabels['k'] = 'does not contain';
-fLabels['l'] = 'less than';
-fLabels['g'] = 'greater than';
-fLabels['m'] = 'less or equal';
-fLabels['h'] = 'greater or equal';
+fLabels['e'] = alert_arr.EQUALS;
+fLabels['n'] = alert_arr.NOT_EQUALS_TO;
+fLabels['s'] = alert_arr.STARTS_WITH;
+fLabels['c'] = alert_arr.CONTAINS;
+fLabels['k'] = alert_arr.DOES_NOT_CONTAINS;
+fLabels['l'] = alert_arr.LESS_THAN;
+fLabels['g'] = alert_arr.GREATER_THAN;
+fLabels['m'] = alert_arr.LESS_OR_EQUALS;
+fLabels['h'] = alert_arr.GREATER_OR_EQUALS;
 var noneLabel;
 var gcurrepfolderid=0;
 function trimfValues(value)