Improve CLDR import of currency-related data to ignore unsupported features such...

diff --git a/babel/numbers.py b/babel/numbers.py
index 53fd2547edeef40eeb4a6ecba4ad09c8c4a5cfd2..1a52074689a5b14a0549fb66f4002de8437630e8 100644 (file)
--- a/babel/numbers.py
+++ b/babel/numbers.py
@@ -40,6 +40,20 @@ __docformat__ = 'restructuredtext en'
 
 LC_NUMERIC = default_locale('LC_NUMERIC')
 
+def get_currency_name(currency, locale=LC_NUMERIC):
+    """Return the name used by the locale for the specified currency.
+    
+    >>> get_currency_name('USD', 'en_US')
+    u'US Dollar'
+    
+    :param currency: the currency code
+    :param locale: the `Locale` object or locale identifier
+    :return: the currency symbol
+    :rtype: `unicode`
+    :since: version 0.9.4
+    """
+    return Locale.parse(locale).currencies.get(currency, currency)
+
 def get_currency_symbol(currency, locale=LC_NUMERIC):
     """Return the symbol used by the locale for the specified currency.
     

diff --git a/scripts/dump_data.py b/scripts/dump_data.py
index 6978a2ebccf72d42f523ebae1e524fdfdadf23a1..cad78aa71b983aca069a817baa110015d8ceabb2 100755 (executable)
--- a/scripts/dump_data.py
+++ b/scripts/dump_data.py
@@ -36,7 +36,9 @@ def main():
     if len(args) > 1:
         for key in args[1].split('.'):
             data = data[key]
-    pprint(dict(data.items()))
+    if isinstance(data, dict):
+        data = dict(data.items())
+    pprint(data)
 
 
 if __name__ == '__main__':

diff --git a/scripts/import_cldr.py b/scripts/import_cldr.py
index b0c79ac5240dda9d867525750325ed054ffe70e4..dd7717fd7ca4d7c62565086872618e07ebba7ee2 100755 (executable)
--- a/scripts/import_cldr.py
+++ b/scripts/import_cldr.py
@@ -137,13 +137,11 @@ def main():
     filenames.insert(0, 'root.xml')
 
     for filename in filenames:
-        print>>sys.stderr, 'Processing input file %r' % filename
         stem, ext = os.path.splitext(filename)
         if ext != '.xml':
             continue
-        #if stem != 'root':
-        #    break
 
+        print>>sys.stderr, 'Processing input file %r' % filename
         tree = parse(os.path.join(srcdir, 'main', filename))
         data = {}
 
@@ -442,12 +440,18 @@ def main():
         currency_names = data.setdefault('currency_names', {})
         currency_symbols = data.setdefault('currency_symbols', {})
         for elem in tree.findall('//currencies/currency'):
-            name = elem.findtext('displayName')
-            if name:
-                currency_names[elem.attrib['type']] = unicode(name)
-            symbol = elem.findtext('symbol')
-            if symbol:
-                currency_symbols[elem.attrib['type']] = unicode(symbol)
+            code = elem.attrib['type']
+            # TODO: support plural rules for currency name selection
+            for name in elem.findall('displayName'):
+                if ('draft' in name.attrib or 'count' in name.attrib) \
+                        and code in currency_names:
+                    continue
+                currency_names[code] = unicode(name.text)
+            # TODO: support choice patterns for currency symbol selection
+            symbol = elem.find('symbol')
+            if symbol is not None and 'draft' not in symbol.attrib \
+                    and 'choice' not in symbol.attrib:
+                currency_symbols[code] = unicode(symbol.text)
 
         outfile = open(os.path.join(destdir, 'localedata', stem + '.dat'), 'wb')
         try: