* Import datetime patterns from CLDR.

 * Make the date/time arguments to the formatting functions optional, defaulting to the current date/time.

2 files changed, 13 insertions, 3 deletions

diff --git a/scripts/dump_data.py b/scripts/dump_data.py
index 453f639..67c1396 100755
--- a/scripts/dump_data.py
+++ b/scripts/dump_data.py
@@ -14,7 +14,7 @@
 
 from pprint import pprint
 import sys
-from babel import Locale
 
-locale = Locale(sys.argv[1])
-pprint(locale._data)
+from babel.localedata import load
+
+pprint(load(sys.argv[1]))
diff --git a/scripts/import_cldr.py b/scripts/import_cldr.py
index 678d672..4a4521b 100755
--- a/scripts/import_cldr.py
+++ b/scripts/import_cldr.py
@@ -239,6 +239,16 @@ def main():
                 except ValueError, e:
                     print>>sys.stderr, 'ERROR: %s' % e
 
+            datetime_formats = data.setdefault('datetime_formats', {})
+            for elem in calendar.findall('dateTimeFormats/dateTimeFormatLength'):
+                if 'draft' in elem.attrib and elem.attrib.get('type') in datetime_formats:
+                    continue
+                try:
+                    datetime_formats[elem.attrib.get('type')] = \
+                        unicode(elem.findtext('dateTimeFormat/pattern'))
+                except ValueError, e:
+                    print>>sys.stderr, 'ERROR: %s' % e
+
         # <numbers>
 
         number_symbols = data.setdefault('number_symbols', {})