encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-30 05:24:00 +03:00
Code Issues Packages Projects Releases Wiki Activity

s/Single Character/String/

Browse Source
This commit is contained in:
Oscar Vilaplana 2013-05-19 15:04:43 +02:00
parent f1f5f92d89
commit 696c053f4f
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rest_framework/fields.py
View File

@ -33,7 +33,7 @@ from rest_framework.settings import api_settings
HUMANIZED_FIELD_TYPES = { HUMANIZED_FIELD_TYPES = {
'BooleanField': u'Boolean', 'BooleanField': u'Boolean',
'CharField': u'Single Character', 'CharField': u'String',
'ChoiceField': u'Single Choice', 'ChoiceField': u'Single Choice',
'ComboField': u'Single Choice', 'ComboField': u'Single Choice',
'DateField': u'Date', 'DateField': u'Date',

4
rest_framework/tests/fields.py
View File

@ -885,7 +885,7 @@ class HumanizedSerializer(TestCase):
self.assertEqual(humanized, { self.assertEqual(humanized, {
'field1': { 'field1': {
u'help_text': u'', u'required': True, u'help_text': u'', u'required': True,
u'type': u'Single Character', u'label': 'field one'}, u'type': u'String', u'label': 'field one'},
'field2': { 'field2': {
u'help_text': u'', u'required': True, u'help_text': u'', u'required': True,
u'type': u'Single Character', u'label': 'field two'}}) u'type': u'String', u'label': 'field two'}})

4
rest_framework/tests/generics.py
View File

@ -133,7 +133,7 @@ class TestRootView(TestCase):
#'label': None, #'label': None,
'read_only': False, 'read_only': False,
'required': True, 'required': True,
'type': 'Single Character', 'type': 'String',
}, },
'id': { 'id': {
# TODO add help_text and label when they are available # TODO add help_text and label when they are available
@ -274,7 +274,7 @@ class TestInstanceView(TestCase):
#'label': None, #'label': None,
'read_only': False, 'read_only': False,
'required': True, 'required': True,
'type': 'Single Character', 'type': 'String',
}, },
'id': { 'id': {
# TODO uncomment label and description when they are # TODO uncomment label and description when they are