[Web-erp-svn] SF.net SVN: web-erp:[4761] trunk

[<dai...@us...>]

Revision: 4761
          http://web-erp.svn.sourceforge.net/web-erp/?rev=4761&view=rev
Author:   daintree
Date:     2011-12-03 03:03:38 +0000 (Sat, 03 Dec 2011)
Log Message:
-----------


Modified Paths:
--------------
    trunk/includes/LanguagesArray.php
    trunk/includes/MiscFunctions.php

Added Paths:
-----------
    trunk/locale/en_IN.utf8/
    trunk/locale/en_IN.utf8/LC_MESSAGES/

Modified: trunk/includes/LanguagesArray.php
===================================================================
--- trunk/includes/LanguagesArray.php	2011-12-02 21:14:02 UTC (rev 4760)
+++ trunk/includes/LanguagesArray.php	2011-12-03 03:03:38 UTC (rev 4761)
@@ -11,6 +11,11 @@
 $LanguagesArray['en_GB.utf8']['DecimalPoint'] = '.';
 $LanguagesArray['en_GB.utf8']['ThousandsSeparator'] = ',';
 
+$LanguagesArray['en_IN.utf8']['LanguageName'] = _('English India');
+$LanguagesArray['en_IN.utf8']['WindowsLocale'] = 'english-in';
+$LanguagesArray['en_IN.utf8']['DecimalPoint'] = '.';
+$LanguagesArray['en_IN.utf8']['ThousandsSeparator'] = ',';
+
 $LanguagesArray['cz_CZ.utf8']['LanguageName'] = _('Czech');
 $LanguagesArray['cz_CZ.utf8']['WindowsLocale'] = 'czech';
 $LanguagesArray['cz_CZ.utf8']['DecimalPoint'] = ',';

Modified: trunk/includes/MiscFunctions.php
===================================================================
--- trunk/includes/MiscFunctions.php	2011-12-02 21:14:02 UTC (rev 4760)
+++ trunk/includes/MiscFunctions.php	2011-12-03 03:03:38 UTC (rev 4761)
@@ -353,10 +353,20 @@
 	if ($DecimalPlaces !='Variable'){
 		$DecimalValue= round($DecimalValue,$DecimalPlaces);
 	}
-	if (strlen(substr($DecimalValue,2))>0){
+	if ($DecimalPlaces!='Variable' AND strlen(substr($DecimalValue,2))>0){
+		/*If the DecimalValue is longer than '0.' then chop off the leading 0*/
 		$DecimalValue = substr($DecimalValue,1);
+		if ($DecimalPlaces > 0){
+			$DecimalValue = str_pad($DecimalValue,$DecimalPlaces,'0');
+		} else {
+			$DecimalValue ='';
+		}
 	} else {
-		$DecimalValue ='';
+		if ($DecimalPlaces!='Variable' AND $DecimalPlaces > 0){
+			$DecimalValue = '.' . str_pad($DecimalValue,$DecimalPlaces,'0');
+		} elseif($DecimalPlaces==0) {
+			$DecimalValue ='';
+		}
 	}
 	if(strlen($IntegerNumber)>3){ 
 		$LastThreeNumbers = substr($IntegerNumber, strlen($IntegerNumber)-3, strlen($IntegerNumber)); 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.