Commit 86aaff75 authored by matiasb's avatar matiasb Committed by Florian Apolloner
Browse files

Fixed #20059 -- Updated humanize tests to force 'en' language setting.

parent 50803119

django/contrib/humanize/tests.py

+17 −10
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ class HumanizeTests(TestCase): 
                       '12th', '13th', '101st', '102nd', '103rd',

                       '111th', 'something else', None)



        with translation.override('en'):

            self.humanize_tester(test_list, result_list, 'ordinal')



    def test_intcomma(self):
@@ -63,6 +64,7 @@ class HumanizeTests(TestCase): 
                       '100', '1,000', '10,123', '10,311', '1,000,000', '1,234,567.1234567', '1,234,567.1234567',

                     None)



        with translation.override('en'):

            self.humanize_tester(test_list, result_list, 'intcomma')



    def test_l10n_intcomma(self):
@@ -74,6 +76,7 @@ class HumanizeTests(TestCase): 
                     None)



        with self.settings(USE_L10N=True, USE_THOUSAND_SEPARATOR=False):

            with translation.override('en'):

                self.humanize_tester(test_list, result_list, 'intcomma')



    def test_intcomma_without_number_grouping(self):
@@ -91,6 +94,7 @@ class HumanizeTests(TestCase): 
                       '1.0 billion', '2.0 billion', '6.0 trillion',

                       '1.3 quadrillion', '3.5 sextillion',

                       '8.1 decillion', None)

        with translation.override('en'):

            self.humanize_tester(test_list, result_list, 'intword')



    def test_i18n_intcomma(self):
@@ -116,7 +120,7 @@ class HumanizeTests(TestCase): 
        test_list.append(None)

        result_list = ('one', 'two', 'three', 'four', 'five', 'six',

                       'seven', 'eight', 'nine', '10', None)



        with translation.override('en'):

            self.humanize_tester(test_list, result_list, 'apnumber')



    def test_naturalday(self):
@@ -157,6 +161,7 @@ class HumanizeTests(TestCase): 
        orig_humanize_datetime, humanize.datetime = humanize.datetime, MockDateTime

        try:

            with override_settings(TIME_ZONE="America/Chicago", USE_TZ=True):

                with translation.override('en'):

                    self.humanize_tester([dt], ['yesterday'], 'naturalday')

        finally:

            humanize.datetime = orig_humanize_datetime
@@ -218,8 +223,10 @@ class HumanizeTests(TestCase): 


        orig_humanize_datetime, humanize.datetime = humanize.datetime, MockDateTime

        try:

            with translation.override('en'):

                self.humanize_tester(test_list, result_list, 'naturaltime')

                with override_settings(USE_TZ=True):

                self.humanize_tester(test_list, result_list_with_tz_support, 'naturaltime')

                    self.humanize_tester(

                        test_list, result_list_with_tz_support, 'naturaltime')

        finally:

            humanize.datetime = orig_humanize_datetime