Merge bb86ec1 (from 1.0)

* 1.0: bb86ec1 Fix test failures if date.timezone is not set
agavi · Mar 6, 2014 · 090a982 · 090a982
2 parents d998695 + bb86ec1
commit 090a982
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/CHANGELOG-1.0 b/CHANGELOG-1.0
@@ -1,6 +1,13 @@
 AGAVI CHANGELOG (1.0.x)
 =======================
 
+1.0.8 RC1 (January ??, 2011)
+----------------------------
+
+FIX: Some tests fail when date.timezone is not set (#1469) (Dominik, Leon Weidauer)
+FIX: The NumberFormatter tests fail with recent ICU versions (#1469) (Dominik)
+
+
 1.0.7 (December 22, 2011)
 -------------------------
 

diff --git a/test/sandbox/app/config/translation.xml b/test/sandbox/app/config/translation.xml
@@ -2,7 +2,7 @@
 <ae:configurations xmlns:ae="http://agavi.org/agavi/config/global/envelope/1.1" xmlns="http://agavi.org/agavi/config/parts/translation/1.1">
 	<ae:configuration>
 
-		<available_locales default_locale="en_US@timezone=GMT">
+		<available_locales default_locale="en_US@timezone=GMT" default_timezone="UTC">
 			<!-- German, Germany -->
 			<available_locale identifier="de_DE">
 				<ae:parameter name="description">Deutsch</ae:parameter>