aboutsummaryrefslogtreecommitdiffstats
path: root/tests/unit/datepicker
diff options
context:
space:
mode:
authorScott González <scott.gonzalez@gmail.com>2011-05-04 14:00:20 -0700
committerScott González <scott.gonzalez@gmail.com>2011-05-04 14:00:20 -0700
commit511b86b31efd16e2966a1155cdb47b951f01c204 (patch)
tree01eaf63e550d31c3e005d67bd1216e95d70ef09a /tests/unit/datepicker
parent0678d604a3cdfb6cb557c7f3d4be5ffb3c281e22 (diff)
parenta891e81e06c7ce491ae9058aea2fa7fbd51eddb6 (diff)
downloadjquery-ui-511b86b31efd16e2966a1155cdb47b951f01c204.tar.gz
jquery-ui-511b86b31efd16e2966a1155cdb47b951f01c204.zip
Merge pull request #201 from kzys/trac-7062
Fixed #7062 - $.datepicker.parseDate does not work for some locale date strings.
Diffstat (limited to 'tests/unit/datepicker')
-rw-r--r--tests/unit/datepicker/datepicker.html1
-rw-r--r--tests/unit/datepicker/datepicker_options.js4
2 files changed, 5 insertions, 0 deletions
diff --git a/tests/unit/datepicker/datepicker.html b/tests/unit/datepicker/datepicker.html
index 76082e780..fa346c6c9 100644
--- a/tests/unit/datepicker/datepicker.html
+++ b/tests/unit/datepicker/datepicker.html
@@ -12,6 +12,7 @@
<script type="text/javascript" src="../../../ui/jquery.ui.datepicker.js"></script>
<script type="text/javascript" src="../../../ui/i18n/jquery.ui.datepicker-fr.js"></script>
<script type="text/javascript" src="../../../ui/i18n/jquery.ui.datepicker-he.js"></script>
+ <script type="text/javascript" src="../../../ui/i18n/jquery.ui.datepicker-zh-CN.js"></script>
<link rel="stylesheet" href="../../../external/qunit.css" type="text/css"/>
<script type="text/javascript" src="../../../external/qunit.js"></script>
diff --git a/tests/unit/datepicker/datepicker_options.js b/tests/unit/datepicker/datepicker_options.js
index 4f1e9a164..a10d1ea45 100644
--- a/tests/unit/datepicker/datepicker_options.js
+++ b/tests/unit/datepicker/datepicker_options.js
@@ -827,6 +827,10 @@ test('parseDate', function() {
equalsDate($.datepicker.parseDate('\'jour\' d \'de\' MM (\'\'DD\'\'), yy',
'jour 9 de Avril (\'Lundi\'), 2001', settings), new Date(2001, 4 - 1, 9),
'Parse date \'jour\' d \'de\' MM (\'\'DD\'\'), yy with settings');
+
+ var zh = $.datepicker.regional['zh-CN'];
+ equalsDate($.datepicker.parseDate('yy M d', '2011 十一 22', zh),
+ new Date(2011, 11 - 1, 22), 'Parse date yy M d with zh-CN');
});
test('parseDateErrors', function() {