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

fix

Browse Source
This commit is contained in:
shuma 2017-08-02 10:35:05 +04:00
parent 88e995c310
commit 805283fe38
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rest_framework/fields.py
View File

@ -577,8 +577,8 @@ class Field(object):
"""
A helper method that simply raises a validation error.
"""
if hasattr(api_settings, 'global_error_messages'):
self.error_messages.update(api_settings['global_error_messages'])
if 'GLOBAL_ERROR_MESSAGES' in api_settings.user_settings.keys():
self.error_messages.update(api_settings.user_settings['GLOBAL_ERROR_MESSAGES'])
try:
msg = self.error_messages[key]
except KeyError: