[Web-erp-svn] SF.net SVN: web-erp:[4703] trunk/includes

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

Revision: 4703
          http://web-erp.svn.sourceforge.net/web-erp/?rev=4703&view=rev
Author:   daintree
Date:     2011-09-23 09:13:29 +0000 (Fri, 23 Sep 2011)
Log Message:
-----------
number_formats

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

Modified: trunk/includes/LanguageSetup.php
===================================================================
--- trunk/includes/LanguageSetup.php	2011-09-22 10:09:20 UTC (rev 4702)
+++ trunk/includes/LanguageSetup.php	2011-09-23 09:13:29 UTC (rev 4703)
@@ -74,15 +74,19 @@
 //$LocaleSet = setlocale (LC_NUMERIC, 'fr_FR.utf8','fr_FR');
 
 $LocaleInfo = localeconv();
-//echo '<br/>Thousands separator = ' . strlen($LocaleInfo['thousands_sep']);
-//echo '<br/>Mon Thousands separator = ' . strlen($LocaleInfo['mon_thousands_sep']);
 
-if ($LocaleInfo['mon_decimal_point']==''){
-	$LocaleInfo['mon_decimal_point']= $LocaleInfo['decimal_point'];
+if ($LocaleInfo['decimal_point']==''){
+	$LocaleInfo['decimal_point'] = $LanguagesArray[$_SESSION['Language']]['Decimal_Point'];
 }
 if ($LocaleInfo['mon_thousands_sep']==''){
-	$LocaleInfo['mon_thousands_sep']= $LocaleInfo['thousands_sep'];
+	$LocaleInfo['mon_thousands_sep'] = $LanguagesArray[$_SESSION['Language']]['Thousands_Separator'];
 }
+if ($LocaleInfo['mon_thousands_sep']==''){
+	$LocaleInfo['mon_thousands_sep'] = $LanguagesArray[$_SESSION['Language']]['Thousands_Separator'];
+}
+if ($LocaleInfo['mon_decimal_point']==''){
+	$LocaleInfo['mon_decimal_point'] = $LanguagesArray[$_SESSION['Language']]['Decimal_Point'];
+}
 
 //Turkish seems to be a special case
 if ($_SESSION['Language']=='tr_TR.utf8') {

Modified: trunk/includes/LanguagesArray.php
===================================================================
--- trunk/includes/LanguagesArray.php	2011-09-22 10:09:20 UTC (rev 4702)
+++ trunk/includes/LanguagesArray.php	2011-09-23 09:13:29 UTC (rev 4703)
@@ -1,60 +1,145 @@
 <?php
 $LanguagesArray = array();
+
 $LanguagesArray['en_US.utf8']['LanguageName'] = _('English US');
 $LanguagesArray['en_US.utf8']['WindowsLocale'] = 'english-us';
+$LanguagesArray['en_US.utf8']['Decimal_Point'] = '.';
+$LanguagesArray['en_US.utf8']['Thousands_Separator'] = ',';
+
 $LanguagesArray['en_GB.utf8']['LanguageName'] = _('English British');
 $LanguagesArray['en_GB.utf8']['WindowsLocale'] = 'english-uk';
+$LanguagesArray['en_GB.utf8']['Decimal_Point'] = '.';
+$LanguagesArray['en_GB.utf8']['Thousands_Separator'] = ',';
+
 $LanguagesArray['cz_CZ.utf8']['LanguageName'] = _('Czech');
 $LanguagesArray['cz_CZ.utf8']['WindowsLocale'] = 'czech';
+$LanguagesArray['cz_CZ.utf8']['Decimal_Point'] = ',';
+$LanguagesArray['cz_CZ.utf8']['Thousands_Separator'] = '.';
+
 $LanguagesArray['de_DE.utf8']['LanguageName'] = _('German');
 $LanguagesArray['de_DE.utf8']['WindowsLocale'] = 'german';
+$LanguagesArray['de_DE.utf8']['Decimal_Point'] = ',';
+$LanguagesArray['de_DE.utf8']['Thousands_Separator'] = '.';
+
 $LanguagesArray['el_GR.utf8']['LanguageName'] = _('Greek');
 $LanguagesArray['el_GR.utf8']['WindowsLocale'] = 'greek';
+$LanguagesArray['el_GR.utf8']['Decimal_Point'] = ',';
+$LanguagesArray['el_GR.utf8']['Thousands_Separator'] = '.';
+
 $LanguagesArray['es_ES.utf8']['LanguageName'] = _('Spanish');
 $LanguagesArray['es_ES.utf8']['WindowsLocale'] = 'spanish';
+$LanguagesArray['es_ES.utf8']['Decimal_Point'] = ',';
+$LanguagesArray['es_ES.utf8']['Thousands_Separator'] = '.';
+
 $LanguagesArray['et_EE.utf8']['LanguageName'] = _('Estonian');
 $LanguagesArray['et_EE.utf8']['WindowsLocale'] = 'estonian';
+$LanguagesArray['et_EE.utf8']['Decimal_Point'] = ',';
+$LanguagesArray['et_EE.utf8']['Thousands_Separator'] = '.';
+
 $LanguagesArray['fa_IR.utf8']['LanguageName'] = _('Arabic');
 $LanguagesArray['fa_IR.utf8']['WindowsLocale'] = 'arabic';
+$LanguagesArray['fa_IR.utf8']['Decimal_Point'] = ',';
+$LanguagesArray['fa_IR.utf8']['Thousands_Separator'] = '.';
+
 $LanguagesArray['fr_FR.utf8']['LanguageName'] = _('French');
 $LanguagesArray['fr_FR.utf8']['WindowsLocale'] = 'french';
+$LanguagesArray['fr_FR.utf8']['Decimal_Point'] = ',';
+$LanguagesArray['fr_FR.utf8']['Thousands_Separator'] = ' ';
+
 $LanguagesArray['hi_IN.utf8']['LanguageName'] = _('Hindi');
 $LanguagesArray['hi_IN.utf8']['WindowsLocale'] = 'hindi';
+$LanguagesArray['hi_IN.utf8']['Decimal_Point'] = ',';
+$LanguagesArray['hi_IN.utf8']['Thousands_Separator'] = ' ';
+
 $LanguagesArray['hr_HR.utf8']['LanguageName'] = _('Hungarian');
 $LanguagesArray['hr_HR.utf8']['WindowsLocale'] = 'hungarian';
+$LanguagesArray['hr_HR.utf8']['Decimal_Point'] = ',';
+$LanguagesArray['hr_HR.utf8']['Thousands_Separator'] = ' ';
+
 $LanguagesArray['id_ID.utf8']['LanguageName'] = _('Indonisian');
 $LanguagesArray['id_ID.utf8']['WindowsLocale'] = 'indonesian';
+$LanguagesArray['id_ID.utf8']['Decimal_Point'] = ',';
+$LanguagesArray['id_ID.utf8']['Thousands_Separator'] = ' ';
+
 $LanguagesArray['it_IT.utf8']['LanguageName'] = _('Italian');
 $LanguagesArray['it_IT.utf8']['WindowsLocale'] = 'italian';
+$LanguagesArray['it_IT.utf8']['Decimal_Point'] = ',';
+$LanguagesArray['it_IT.utf8']['Thousands_Separator'] = ' ';
+
 $LanguagesArray['ja_JP.utf8']['LanguageName'] = _('Japanese');
 $LanguagesArray['ja_JP.utf8']['WindowsLocale'] = 'japanese';
+$LanguagesArray['ja_JP.utf8']['Decimal_Point'] = ',';
+$LanguagesArray['ja_JP.utf8']['Thousands_Separator'] = ' ';
+
 $LanguagesArray['lv_LV.utf8']['LanguageName'] = _('Latvian');
 $LanguagesArray['lv_LV.utf8']['WindowsLocale'] = 'latvian';
+$LanguagesArray['lv_LV.utf8']['Decimal_Point'] = ',';
+$LanguagesArray['lv_LV.utf8']['Thousands_Separator'] = ' ';
+
 $LanguagesArray['nl_NL.utf8']['LanguageName'] = _('Dutch');
 $LanguagesArray['nl_NL.utf8']['WindowsLocale'] = 'dutch';
+$LanguagesArray['nl_NL.utf8']['Decimal_Point'] = ',';
+$LanguagesArray['nl_NL.utf8']['Thousands_Separator'] = ' ';
+
 $LanguagesArray['pl_PL.utf8']['LanguageName'] = _('Polish');
 $LanguagesArray['pl_PL.utf8']['WindowsLocale'] = 'polish';
+$LanguagesArray['pl_PL.utf8']['Decimal_Point'] = ',';
+$LanguagesArray['pl_PL.utf8']['Thousands_Separator'] = ' ';
+
 $LanguagesArray['pt_BR.utf8']['LanguageName'] = _('Brazilian Portuguese');
 $LanguagesArray['pt_BR.utf8']['WindowsLocale'] = 'portuguese-brazil';
+$LanguagesArray['pt_BR.utf8']['Decimal_Point'] = ',';
+$LanguagesArray['pt_BR.utf8']['Thousands_Separator'] = ' ';
+
 $LanguagesArray['pt_PT.utf8']['LanguageName'] = _('Portuguese');
 $LanguagesArray['pt_PT.utf8']['WindowsLocale'] = 'portuguese';
+$LanguagesArray['pt_PT.utf8']['Decimal_Point'] = ',';
+$LanguagesArray['pt_PT.utf8']['Thousands_Separator'] = ' ';
+
 $LanguagesArray['ro_RO.utf8']['LanguageName'] = _('Romanian');
 $LanguagesArray['ro_RO.utf8']['WindowsLocale'] = 'romanian';
+$LanguagesArray['ro_RO.utf8']['Decimal_Point'] = ',';
+$LanguagesArray['ro_RO.utf8']['Thousands_Separator'] = ' ';
+
 $LanguagesArray['ru_RU.utf8']['LanguageName'] = _('Russian');
 $LanguagesArray['ru_RU.utf8']['WindowsLocale'] = 'russian';
+$LanguagesArray['ru_RU.utf8']['Decimal_Point'] = ',';
+$LanguagesArray['ru_RU.utf8']['Thousands_Separator'] = ' ';
+
 $LanguagesArray['sq_AL.utf8']['LanguageName'] = _('Albanian');
 $LanguagesArray['sq_AL.utf8']['WindowsLocale'] = 'english-us';
+$LanguagesArray['sq_AL.utf8']['Decimal_Point'] = ',';
+$LanguagesArray['sq_AL.utf8']['Thousands_Separator'] = ' ';
+
 $LanguagesArray['sv_SE.utf8']['LanguageName'] = _('Swedish');
 $LanguagesArray['sv_SE.utf8']['WindowsLocale'] = 'swedish';
+$LanguagesArray['sv_SE.utf8']['Decimal_Point'] = ',';
+$LanguagesArray['sv_SE.utf8']['Thousands_Separator'] = ' ';
+
 $LanguagesArray['sw_KE.utf8']['LanguageName'] = _('Kiswahili');
 $LanguagesArray['sw_KE.utf8']['WindowsLocale'] = 'english-us';
+$LanguagesArray['sw_KE.utf8']['Decimal_Point'] = ',';
+$LanguagesArray['sw_KE.utf8']['Thousands_Separator'] = ' ';
+
 $LanguagesArray['tr_TR.utf8']['LanguageName'] = _('Turkish');
 $LanguagesArray['tr_TR.utf8']['WindowsLocale'] = 'turkish';
+$LanguagesArray['tr_TR.utf8']['Decimal_Point'] = ',';
+$LanguagesArray['tr_TR.utf8']['Thousands_Separator'] = ' ';
+
 $LanguagesArray['vi_VN.utf8']['LanguageName'] = _('Vietnamese');
 $LanguagesArray['vi_VN.utf8']['WindowsLocale'] = 'vietnamese';
+$LanguagesArray['vi_VN.utf8']['Decimal_Point'] = ',';
+$LanguagesArray['vi_VN.utf8']['Thousands_Separator'] = ' ';
+
 $LanguagesArray['zh_CN.utf8']['LanguageName'] = _('Chinese - Simplified');
 $LanguagesArray['zh_CN.utf8']['WindowsLocale'] = 'chinese-simplified';
+$LanguagesArray['zh_CN.utf8']['Decimal_Point'] = ',';
+$LanguagesArray['zh_CN.utf8']['Thousands_Separator'] = ' ';
+
 $LanguagesArray['zh_HK.utf8']['LanguageName'] = _('Chinese - Traditional');
 $LanguagesArray['zh_HK.utf8']['WindowsLocale'] = 'chinese-traditional';
+$LanguagesArray['zh_HK.utf8']['Decimal_Point'] = ',';
+$LanguagesArray['zh_HK.utf8']['Thousands_Separator'] = ' ';
+
 asort($LanguagesArray);
 ?>
\ No newline at end of file

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