Admin should not use verbose_name_plural for OneToOne field

[Roy Smith]

Do something like the following:

class Foo(Model):
     i = IntegerField()
     bar = OneToOneField("Bar")

class FooInline(admin.TabularInline):
    model = Foo

class Bar(Model):
    i = Integerfield()

class BarAdmin(admin.ModelAdmin):
    inlines = [FooInline]

admin.site.register(Foo, FooAdmin)
admin.site.register(Bar)

When you edit a Bar in the admin, the formset section for entering a Foo will be labeled "Foos" (plural). Since it's a one-to-one mapping, it should be labeled "Foo" (singular).

[harph]

Fixed adding two conditions to the stacked.html and tabular.html templates.

[harph]

I submitted a pull request. This is the url: ​https://github.com/django/django/pull/498

[Claude Paroz]

Note that you are hard-coding usage of plural for 0 items, which is not true for all languages. However, I'm not sure there is a better solution i18n-wise (as using blocktrans will only partially solve it and add a non-sense translatable string to po files).

[Tim Graham]

This needs tests, ideally adding max_num=1 to an existing tabular and stacked inline and verifying the <h2> text. The existing patch also causes some test failures due to the added whitespace.

[Mariusz Felisiak <felisiak.mariusz@…>]

In 13409a0c:

Refs #18549 -- Added test for heading of foreign key inlines.

[Mariusz Felisiak <felisiak.mariusz@…>]

In 0aff3fd7:

Fixed #18549 -- Fixed heading for inlines with a OneToOneField.

Used verbose_name instead of verbose_name_plural.

[Mariusz Felisiak <felisiak.mariusz@…>]

In a91bf804:

[3.2.x] Fixed #18549 -- Fixed heading for inlines with a OneToOneField.

Used verbose_name instead of verbose_name_plural.

Backport of 0aff3fd7110d1bd431a35bb28d8688693b98d886 from master.