Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions babel/support.py
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,8 @@ def compact_decimal(
>>> fmt = Format('en_US')
>>> fmt.compact_decimal(123456789)
u'123M'
>>> fmt.compact_decimal(1234567, format_type='long', fraction_digits=2)
'1.23 million'
"""
return format_compact_decimal(number, format_type=format_type,
fraction_digits=fraction_digits,
Expand All @@ -170,6 +172,9 @@ def compact_currency(
) -> str:
"""Return a number in the given currency formatted for the locale
using the compact number format.

>>> Format('en_US').compact_currency(1234567, "USD", format_type='short', fraction_digits=2)
'$1.23M'
"""
return format_compact_currency(number, currency, format_type=format_type,
fraction_digits=fraction_digits, locale=self.locale)
Expand Down
42 changes: 4 additions & 38 deletions tests/test_support.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
# individuals. For the exact contribution history, see the revision
# history and logs, available at http://babel.edgewall.org/log/.

import datetime
import inspect
import os
import shutil
import sys
import tempfile
import unittest
from datetime import date, datetime, timedelta
from io import BytesIO

import pytest
Expand Down Expand Up @@ -296,50 +296,16 @@ def raise_attribute_error():
assert str(exception.value) == 'message'


def test_format_date():
fmt = support.Format('en_US')
assert fmt.date(date(2007, 4, 1)) == 'Apr 1, 2007'

WHEN = datetime.datetime(2007, 4, 1, 15, 30)

def test_format_datetime(timezone_getter):
fmt = support.Format('en_US', tzinfo=timezone_getter('US/Eastern'))
when = datetime(2007, 4, 1, 15, 30)
assert fmt.datetime(when) == 'Apr 1, 2007, 11:30:00\u202fAM'
assert fmt.datetime(WHEN) == 'Apr 1, 2007, 11:30:00\u202fAM'


def test_format_time(timezone_getter):
fmt = support.Format('en_US', tzinfo=timezone_getter('US/Eastern'))
assert fmt.time(datetime(2007, 4, 1, 15, 30)) == '11:30:00\u202fAM'


def test_format_timedelta():
fmt = support.Format('en_US')
assert fmt.timedelta(timedelta(weeks=11)) == '3 months'


def test_format_number():
fmt = support.Format('en_US')
assert fmt.number(1099) == '1,099'


def test_format_decimal():
fmt = support.Format('en_US')
assert fmt.decimal(1.2345) == '1.234'


def test_format_compact_decimal():
fmt = support.Format('en_US')
assert fmt.compact_decimal(1234567, format_type='long', fraction_digits=2) == '1.23 million'


def test_format_compact_currency():
fmt = support.Format('en_US')
assert fmt.compact_currency(1234567, "USD", format_type='short', fraction_digits=2) == '$1.23M'


def test_format_percent():
fmt = support.Format('en_US')
assert fmt.percent(0.34) == '34%'
assert fmt.time(WHEN) == '11:30:00\u202fAM'


def test_lazy_proxy():
Expand Down