diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 6beeb775f..6a2399b2d 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-11  Martin Hawlisch  <Martin.Hawlisch@gmx.de>
+	* src/DateHandler.py: Fallback to "C" locale instead of the ISO
+	format. This currently basically falls back to en, but this could
+	be enhanced by a translated fallback parser later.
+
 2005-05-10  Don Allingham  <don@gramps-project.org>
 	* src/DbPrompter.py: add callback for progressbar
 	* src/GrampsXMLDB.py: pass callback task
diff --git a/gramps2/src/DateHandler.py b/gramps2/src/DateHandler.py
index 4cfe0ce06..d296c265e 100644
--- a/gramps2/src/DateHandler.py
+++ b/gramps2/src/DateHandler.py
@@ -80,7 +80,7 @@ def get_date_formats():
     try:
         return _lang_to_display[_lang].formats
     except:
-        return DateDisplay.DateDisplay.formats
+        return _lang_to_display["C"].formats
 
 def set_format(value):
     try:
@@ -126,17 +126,19 @@ try:
     parser = _lang_to_parser[_lang]()
 except:
     print "Date parser for",_lang,"not available, using default"
-    parser = DateParser.DateParser()
+    parser = _lang_to_parser["C"]()
 
 try:
     import GrampsKeys
     val = GrampsKeys.get_date_format(_lang_to_display[_lang].formats)
 except:
-    val = 0
+    try:
+        val = GrampsKeys.get_date_format(_lang_to_display["C"].formats)
+    except:
+        val = 0
 
 try:
     displayer = _lang_to_display[_lang](val)
 except:
     print "Date displayer for",_lang,"not available, using default"
-    displayer = DateDisplay.DateDisplay(val)
-
+    displayer = _lang_to_display["C"](val)