[2.2.x] Fixed #30280 -- Restored Model.get_FIELD_display()'s coercion of lazy strings.

Reverted cc79c7ee63.

Backport of ea071870f9 from master.

tests/choices/models.py

@@ -10,12 +10,13 @@ field. This method returns the "human-readable" value of the field.
 """
 
 from django.db import models
+from django.utils.translation import gettext_lazy as _
 
 
 class Person(models.Model):
     GENDER_CHOICES = (
-        ('M', 'Male'),
-        ('F', 'Female'),
+        ('M', _('Male')),
+        ('F', _('Female')),
     )
     name = models.CharField(max_length=20)
     gender = models.CharField(max_length=1, choices=GENDER_CHOICES)

tests/choices/tests.py

@@ -20,3 +20,6 @@ class ChoicesTests(TestCase):
 
         a.gender = 'U'
         self.assertEqual(a.get_gender_display(), 'U')
+
+        # _get_FIELD_display() coerces lazy strings.
+        self.assertIsInstance(a.get_gender_display(), str)