Merge branch 'mikee2185-master' into mjtorn-master

Conflicts:
	rest_framework/fields.py
	rest_framework/serializers.py
	rest_framework/tests/models.py
	rest_framework/tests/serializer.py

Fixed all the conflicts.

2 files changed, 32 insertions, 2 deletions

diff --git a/rest_framework/tests/models.py b/rest_framework/tests/models.py
index 40e41a64..3465268b 100644
--- a/rest_framework/tests/models.py
+++ b/rest_framework/tests/models.py
@@ -1,5 +1,6 @@
 from __future__ import unicode_literals
 from django.db import models
+from django.utils.translation import ugettext_lazy as _
 
 
 def foobar():
@@ -32,7 +33,7 @@ class Anchor(RESTFrameworkModel):
 
 
 class BasicModel(RESTFrameworkModel):
-    text = models.CharField(max_length=100)
+    text = models.CharField(max_length=100, verbose_name=_("Text"), help_text=_("Text description."))
 
 
 class SlugBasedModel(RESTFrameworkModel):
diff --git a/rest_framework/tests/serializer.py b/rest_framework/tests/serializer.py
index db3881f9..b0c7e568 100644
--- a/rest_framework/tests/serializer.py
+++ b/rest_framework/tests/serializer.py
@@ -1,7 +1,7 @@
 from __future__ import unicode_literals
 from django.utils.datastructures import MultiValueDict
 from django.test import TestCase
-from rest_framework import serializers
+from rest_framework import serializers, fields
 from rest_framework.tests.models import (HasPositiveIntegerAsChoice, Album, ActionItem, Anchor, BasicModel,
     BlankFieldModel, BlogPost, BlogPostComment, Book, CallableDefaultValueModel, DefaultValueModel,
     ManyToManyModel, Person, ReadOnlyManyToManyModel, Photo)
@@ -1143,3 +1143,32 @@ class DeserializeListTestCase(TestCase):
         self.assertFalse(serializer.is_valid())
         expected = [{}, {'email': ['This field is required.']}, {}]
         self.assertEqual(serializer.errors, expected)
+
+
+# Test for issue #467
+class FieldLabelTest(TestCase):
+    def setUp(self):
+        class LabelModelSerializer(serializers.ModelSerializer):
+            class Meta:
+                model = BasicModel
+
+        self.serializer_class = LabelModelSerializer
+
+    def test_label_from_model(self):
+        """
+        Validates that label and help_text are correctly copied from the model class.
+        """
+        serializer = self.serializer_class()
+        text_field = serializer.fields['text']
+
+        self.assertEquals(u'Text', text_field.label)
+        self.assertEquals(u'Text description.', text_field.help_text)
+
+    def test_field_ctor(self):
+        """
+        This is check that ctor supports both label and help_text.
+        """
+        self.assertEquals(u'Label', fields.Field(label='Label', help_text='Help').label)
+        self.assertEquals(u'Help', fields.CharField(label='Label', help_text='Help').help_text)
+        self.assertEquals(u'Label', fields.ManyHyperlinkedRelatedField(view_name='fake', label='Label', help_text='Help').label)
+