Merge pull request #14 from sharoonthomas/master

Add number support for flask-babel

flaskext/babel.py

@@ -18,7 +18,7 @@
 
 from datetime import datetime
 from flask import _request_ctx_stack
-from babel import dates, support, Locale
+from babel import dates, numbers, support, Locale
 from werkzeug import ImmutableDict
 try:
     from pytz.gae import pytz
@@ -101,7 +101,13 @@ def init_app(self, app):
                 datetimeformat=format_datetime,
                 dateformat=format_date,
                 timeformat=format_time,
-                timedeltaformat=format_timedelta
+                timedeltaformat=format_timedelta,
+
+                numberformat=format_number,
+                decimalformat=format_decimal,
+                currencyformat=format_currency,
+                percentformat=format_percent,
+                scientificformat=format_scientific,
             )
             app.jinja_env.add_extension('jinja2.ext.i18n')
             app.jinja_env.install_gettext_callables(
@@ -376,6 +382,68 @@ def _date_format(formatter, obj, format, rebase, **extra):
     return formatter(obj, format, locale=locale, **extra)
 
 
+def format_number(number):
+    """Return the given number formatted for the locale in request
+    
+    :param number: the number to format
+    :return: the formatted number
+    :rtype: unicode
+    """
+    locale = get_locale()
+    return numbers.format_number(number, locale=locale)
+
+
+def format_decimal(number, format=None):
+    """Return the given decimal number formatted for the locale in request
+
+    :param number: the number to format
+    :param format: the format to use
+    :return: the formatted number
+    :rtype: unicode
+    """
+    locale = get_locale()
+    return numbers.format_decimal(number, format=format, locale=locale)
+
+
+def format_currency(number, currency, format=None):
+    """Return the given number formatted for the locale in request
+
+    :param number: the number to format
+    :param currency: the currency code
+    :param format: the format to use
+    :return: the formatted number
+    :rtype: unicode
+    """
+    locale = get_locale()
+    return numbers.format_currency(
+        number, currency, format=format, locale=locale
+        )
+
+
+def format_percent(number, format=None):
+    """Return formatted percent value for the locale in request
+
+    :param number: the number to format
+    :param format: the format to use
+    :return: the formatted percent number
+    :rtype: unicode
+    """
+    locale = get_locale()
+    return numbers.format_percent(number, format=format, locale=locale)
+
+
+def format_scientific(number, format=None):
+    """Return value formatted in scientific notation for the locale in request
+
+    :param number: the number to format
+    :param format: the format to use
+    :return: the formatted percent number
+    :rtype: unicode
+    """
+    locale = get_locale()
+    return numbers.format_scientific(number, format=format, locale=locale)
+
+
 def gettext(string, **variables):
     """Translates a string with the current locale and passes in the
     given keyword arguments as mapping to a string formatting string.

tests/tests.py

@@ -6,6 +6,7 @@
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..'))
 
 import unittest
+from decimal import Decimal
 import flask
 from datetime import datetime
 from flaskext import babel
@@ -106,6 +107,21 @@ def test_refreshing(self):
             assert babel.format_datetime(d) == 'Apr 12, 2010 3:46:00 PM'
 
 
+class NumberFormattingTestCase(unittest.TestCase):
+
+    def test_basics(self):
+        app = flask.Flask(__name__)
+        b = babel.Babel(app)
+        n = 1099
+
+        with app.test_request_context():
+            assert babel.format_number(n) == u'1,099'
+            assert babel.format_decimal(Decimal('1010.99')) == u'1,010.99'
+            assert babel.format_currency(n, 'USD') == '$1,099.00'
+            assert babel.format_percent(0.19) == '19%'
+            assert babel.format_scientific(10000) == u'1E4'
+
+
 class GettextTestCase(unittest.TestCase):
 
     def test_basics(self):