[Pkg-javascript-commits] [dojo] 03/08: Ignore am/pm with alt attributes. Revert tests to use AM/PM. Apply to 1.2 branch. Refs #7849

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to annotated tag 1.2.1
in repository dojo.

commit 538bd04dc87b3fe3aba875143c477d27f3bc3031
Author: Adam Peller <github at peller.org>
Date:   Mon Oct 20 14:51:15 2008 +0000

    Ignore am/pm with alt attributes.  Revert tests to use AM/PM. Apply to 1.2 branch.  Refs #7849
    
    git-svn-id: http://svn.dojotoolkit.org/src/branches/1.2/dojo@15492 560b804f-0ae3-0310-86f3-f6aa0a117693
---
 tests/date/locale.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/date/locale.js b/tests/date/locale.js
index 9f9599c..ce3f4dc 100644
--- a/tests/date/locale.js
+++ b/tests/date/locale.js
@@ -62,7 +62,7 @@ tests.register("tests.date.locale",
 
 	t.is("6", dojo.date.locale.format(date, {datePattern:'E', selector:'date'}));
 
-	t.is("12:55 a.m.", dojo.date.locale.format(date, {formatLength:'short',selector:'time', locale:'en-us'}));
+	t.is("12:55 AM", dojo.date.locale.format(date, {formatLength:'short',selector:'time', locale:'en-us'}));
 	t.is("12:55:12", dojo.date.locale.format(date, {timePattern:'h:m:s',selector:'time'}));
 	t.is("12:55:12.35", dojo.date.locale.format(date, {timePattern:'h:m:s.SS',selector:'time'}));
 	t.is("24:55:12.35", dojo.date.locale.format(date, {timePattern:'k:m:s.SS',selector:'time'}));
@@ -241,8 +241,8 @@ tests.register("tests.date.locale",
 				var time = new Date(2006, 7, 11, 12, 30);
 				var tformat = {selector:'time', strict:true, timePattern:"h:mm a", locale:'en'};
 			
-				t.is(time.getHours(), dojo.date.locale.parse("12:30 p.m.", tformat).getHours());
-				t.is(time.getMinutes(), dojo.date.locale.parse("12:30 p.m.", tformat).getMinutes());
+				t.is(time.getHours(), dojo.date.locale.parse("12:30 PM", tformat).getHours());
+				t.is(time.getMinutes(), dojo.date.locale.parse("12:30 PM", tformat).getMinutes());
 			}
 		},
 		{

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/dojo.git