fix #8131 - chinese translations

[Pman.Core] / SimpleExcel.php

diff --git a/SimpleExcel.php b/SimpleExcel.php
index 6c36750..0ca12fc 100644 (file)
--- a/SimpleExcel.php
+++ b/SimpleExcel.php
@@ -47,7 +47,7 @@ new Pman_Core_SimpleExcel($data_array, array(
             workbook => '....' // ???
     ),
     'leave_open' => false,  // if you call addrows?? later..
-            
+    'nonspacer' => false, // should add line between head and header row.     
 ));
 
     callbacks: renderer
@@ -75,6 +75,7 @@ class Pman_Core_SimpleExcel extends Pman
     var $workbook = false;
     var $worksheet= false;
     var $postRender = array();
+    var $outfile2;
      
     function __construct($data,$cfg)
     {
@@ -394,7 +395,7 @@ class Pman_Core_SimpleExcel extends Pman
           //  print_R(array($start_row+$r, $c, $v, $format));exit;
           // handle 0 prefixes..
           
-            if (preg_match('/^[0-9]{4}-[0-9]{2}-[0-9]{2}$/', $v)) {
+            if ($dataFormat == 'date' || preg_match('/^[0-9]{4}-[0-9]{2}-[0-9]{2}$/', $v)) {
                 $dataFormat = 'date';
                 $format = empty($format) ? $this->formats['_default_date_format_']: $format;
                 $ut_to_ed_diff = 86400 * 25569;
@@ -409,9 +410,10 @@ class Pman_Core_SimpleExcel extends Pman
             if ( (is_numeric($v) &&  strlen($v) > 1 && substr($v,0,1) == '0' && substr($v,1,1) != '.' )
                     || 
                     $dataFormat == 'string' ) {
+                //var_dump("Write ( {$r}, {$c} ) = " . $v);
                 $worksheet->writeString($start_row+$r, $c, $v, $format);
             } else {
-          
+                //var_dump("Write String ( {$r}, {$c} ) = " . $v);
                 $worksheet->write($start_row+$r, $c, $v, $format);
             }