From fbd579f5749e5bf4b920204e3de211d7cd54a420 Mon Sep 17 00:00:00 2001 From: zhangxingdong Date: Thu, 16 Nov 2017 19:33:20 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SpreadsheetReader_XLSX.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/SpreadsheetReader_XLSX.php b/SpreadsheetReader_XLSX.php index 9cf8d12..cbaabb9 100644 --- a/SpreadsheetReader_XLSX.php +++ b/SpreadsheetReader_XLSX.php @@ -115,15 +115,15 @@ class SpreadsheetReader_XLSX implements Iterator, Countable 11 => '0.00E+00', 12 => '# ?/?', 13 => '# ??/??', - 14 => 'mm-dd-yy', - 15 => 'd-mmm-yy', + 14 => 'mm-dd-yyyy', + 15 => 'd-mmm-yyyy', 16 => 'd-mmm', - 17 => 'mmm-yy', + 17 => 'mmm-yyyy', 18 => 'h:mm AM/PM', 19 => 'h:mm:ss AM/PM', 20 => 'h:mm', 21 => 'h:mm:ss', - 22 => 'm/d/yy h:mm', + 22 => 'm/d/yyyy h:mm', 37 => '#,##0 ;(#,##0)', 38 => '#,##0 ;[Red](#,##0)', @@ -138,7 +138,7 @@ class SpreadsheetReader_XLSX implements Iterator, Countable // CHT & CHS 27 => '[$-404]e/m/d', - 30 => 'm/d/yy', + 30 => 'm/d/yyyy', 36 => '[$-404]e/m/d', 50 => '[$-404]e/m/d', 57 => '[$-404]e/m/d', From b956d752455e89ce4974fb76c14cde820d837a88 Mon Sep 17 00:00:00 2001 From: zhangxingdong Date: Thu, 16 Nov 2017 19:49:55 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8C=85=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- composer.json | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index 0e64a78..ae5a091 100644 --- a/composer.json +++ b/composer.json @@ -2,20 +2,19 @@ "name": "nuovo/spreadsheet-reader", "description": "Spreadsheet reader library for Excel, OpenOffice and structured text files", "keywords": ["spreadsheet", "xls", "xlsx", "ods", "csv", "excel", "openoffice"], - "homepage": "https://github.com/nuovo/spreadsheet-reader", - "version": "0.5.11", - "time": "2015-04-30", + "homepage": "https://github.com/netdong/spreadsheet-reader", + "version": "0.5.12", + "time": "2017-11-16", "type": "library", "license": ["MIT"], "authors": [ { - "name": "Martins Pilsetnieks", - "email": "pilsetnieks@gmail.com", - "homepage": "http://www.nuovo.lv/" + "name": "netdong", + "email": "netdong@gmail.com", } ], "support": { - "email": "spreadsheet-reader@nuovo.lv" + "email": "netdongr@gmail.com" }, "require": { "php": ">= 5.3.0", From 3c9f759370297fdc82073303c24033248dcebcbf Mon Sep 17 00:00:00 2001 From: zhangxingdong Date: Thu, 16 Nov 2017 19:53:23 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9json?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index ae5a091..3a4b8c7 100644 --- a/composer.json +++ b/composer.json @@ -10,7 +10,7 @@ "authors": [ { "name": "netdong", - "email": "netdong@gmail.com", + "email": "netdong@gmail.com" } ], "support": {