Commit 0a341ab4 authored by Honza Král's avatar Honza Král
Browse files

Merge pull request #791 from khalas/ticket_19811 

Changed %r to %s in get_language_info error message
parents f368c25f 48dc0cbf

django/utils/translation/__init__.py

+2 −2
Original line number Diff line number Diff line
@@ -192,5 +192,5 @@ def get_language_info(lang_code): 
            try:

                return LANG_INFO[splited_lang_code]

            except KeyError:

                raise KeyError("Unknown language code %r and %r." % (lang_code, splited_lang_code))

        raise KeyError("Unknown language code %r." % lang_code)
 
                raise KeyError("Unknown language code %s and %s." % (lang_code, splited_lang_code))

        raise KeyError("Unknown language code %s." % lang_code)

tests/regressiontests/i18n/tests.py

+2 −2
Original line number Diff line number Diff line
@@ -957,7 +957,7 @@ class TestLanguageInfo(TestCase): 
        self.assertEqual(li['bidi'], False)



    def test_unknown_language_code(self):

        with self.assertRaisesRegexp(KeyError, "Unknown language code u\'xx\'."):

        with self.assertRaisesRegexp(KeyError, "Unknown language code xx."):

            get_language_info('xx')



    def test_unknown_only_country_code(self):
@@ -968,7 +968,7 @@ class TestLanguageInfo(TestCase): 
        self.assertEqual(li['bidi'], False)



    def test_unknown_language_code_and_country_code(self):

        with self.assertRaisesRegexp(KeyError, "Unknown language code u\'xx-xx\' and u\'xx\'."):

        with self.assertRaisesRegexp(KeyError, "Unknown language code xx-xx and xx."):

            get_language_info('xx-xx')