mirror of
https://github.com/PHPOffice/PhpSpreadsheet.git
synced 2026-08-25 11:58:15 +00:00
Revert "Fix cant get right format chinese date format error"
This reverts commit 8c58385d6c.
This commit is contained in:
@@ -469,7 +469,7 @@ class NumberFormat extends Supervisor
|
||||
// general syntax: [$<Currency string>-<language info>]
|
||||
// language info is in hexadecimal
|
||||
// strip off chinese part like [DBNum1][$-804]
|
||||
$format = preg_replace('/^(\[[0-9A-Za-z]*\])*(\[\$[A-Z]*-[0-9A-F]*\])/i', '', $format);
|
||||
$format = preg_replace('/^(\[\$[A-Z]*-[0-9A-F]*\])/i', '', $format);
|
||||
|
||||
// OpenOffice.org uses upper-case number formats, e.g. 'YYYY', convert to lower-case;
|
||||
// but we don't want to change any quoted strings
|
||||
|
||||
@@ -36,22 +36,6 @@ return [
|
||||
22269.0625,
|
||||
'"y-m-d "yyyy-mm-dd" h:m:s "hh:mm:ss',
|
||||
],
|
||||
// Chinese date format
|
||||
[
|
||||
'1960年12月19日',
|
||||
22269.0625,
|
||||
'[DBNum1][$-804]yyyy"年"m"月"d"日";@',
|
||||
],
|
||||
[
|
||||
'1960年12月',
|
||||
22269.0625,
|
||||
'[DBNum1][$-804]yyyy"年"m"月";@',
|
||||
],
|
||||
[
|
||||
'12月19日',
|
||||
22269.0625,
|
||||
'[DBNum1][$-804]m"月"d"日";@',
|
||||
],
|
||||
[
|
||||
'07:35:00 AM',
|
||||
43270.315972222,
|
||||
|
||||
Reference in New Issue
Block a user