diff --git a/django/core/management/base.py b/django/core/management/base.py index d2dd266527..e8f461e354 100644 --- a/django/core/management/base.py +++ b/django/core/management/base.py @@ -119,7 +119,7 @@ class BaseCommand(object): option_list = ( make_option('-v', '--verbosity', action='store', dest='verbosity', default='1', type='choice', choices=['0', '1', '2', '3'], - help='Verbosity level; 0=minimal output, 1=normal output, 2=verbose output 3=very verbose output'), + help='Verbosity level; 0=minimal output, 1=normal output, 2=verbose output, 3=very verbose output'), make_option('--settings', help='The Python path to a settings module, e.g. "myproject.settings.main". If this isn\'t provided, the DJANGO_SETTINGS_MODULE environment variable will be used.'), make_option('--pythonpath', diff --git a/tests/regressiontests/i18n/forms.py b/tests/regressiontests/i18n/forms.py index b2eb74c74c..abb99f443a 100644 --- a/tests/regressiontests/i18n/forms.py +++ b/tests/regressiontests/i18n/forms.py @@ -18,7 +18,7 @@ class SelectDateForm(forms.Form): date_field = forms.DateField(widget=SelectDateWidget) class CompanyForm(forms.ModelForm): - cents_payed = forms.DecimalField(max_digits=4, decimal_places=2, localize=True) + cents_paid = forms.DecimalField(max_digits=4, decimal_places=2, localize=True) products_delivered = forms.IntegerField(localize=True) date_added = forms.DateTimeField(localize=True) diff --git a/tests/regressiontests/i18n/models.py b/tests/regressiontests/i18n/models.py index 9b92705a20..9f2c293303 100644 --- a/tests/regressiontests/i18n/models.py +++ b/tests/regressiontests/i18n/models.py @@ -10,8 +10,8 @@ class TestModel(models.Model): class Company(models.Model): name = models.CharField(max_length=50) date_added = models.DateTimeField(default=datetime(1799,1,31,23,59,59,0)) - cents_payed = models.DecimalField(max_digits=4, decimal_places=2) + cents_paid = models.DecimalField(max_digits=4, decimal_places=2) products_delivered = models.IntegerField() class Meta: - verbose_name = _('Company') \ No newline at end of file + verbose_name = _('Company') diff --git a/tests/regressiontests/i18n/tests.py b/tests/regressiontests/i18n/tests.py index cefb6b1819..33b16886cb 100644 --- a/tests/regressiontests/i18n/tests.py +++ b/tests/regressiontests/i18n/tests.py @@ -610,13 +610,13 @@ class FormattingTests(TestCase): form6 = CompanyForm({ 'name': u'acme', 'date_added': datetime.datetime(2009, 12, 31, 6, 0, 0), - 'cents_payed': decimal.Decimal('59.47'), + 'cents_paid': decimal.Decimal('59.47'), 'products_delivered': 12000, }) self.assertEqual(True, form6.is_valid()) self.assertEqual( form6.as_ul(), - u'
  • \n
  • \n
  • \n
  • ' + u'
  • \n
  • \n
  • \n
  • ' ) self.assertEqual(localize_input(datetime.datetime(2009, 12, 31, 6, 0, 0)), '31.12.2009 06:00:00') self.assertEqual(datetime.datetime(2009, 12, 31, 6, 0, 0), form6.cleaned_data['date_added']) @@ -889,7 +889,7 @@ class TestModels(TestCase): tm.save() def test_safestr(self): - c = Company(cents_payed=12, products_delivered=1) + c = Company(cents_paid=12, products_delivered=1) c.name = SafeUnicode(u'Iñtërnâtiônàlizætiøn1') c.save() c.name = SafeString(u'Iñtërnâtiônàlizætiøn1'.encode('utf-8'))