summaryrefslogtreecommitdiff
path: root/django/apps
diff options
context:
space:
mode:
authorMarten Kenbeek <marten.knbk@gmail.com>2015-06-30 20:38:07 +0200
committerTim Graham <timograham@gmail.com>2015-06-30 15:01:22 -0400
commit42aa919de9ef9d039a72e468bdb4e868daa32e5c (patch)
treeb85e29c5c824648f8936f69e85da05774ca72999 /django/apps
parentfdaf9359ab84b06da48f3bb0d5a924b62ace0561 (diff)
[1.8.x] Refs #23621 -- Fixed warning message when reloading models.
Backport of aabb58428beae0bd34f32e5d620a82486b670499 from master
Diffstat (limited to 'django/apps')
-rw-r--r--django/apps/registry.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/apps/registry.py b/django/apps/registry.py
index 0cda55d8fa..2a496affda 100644
--- a/django/apps/registry.py
+++ b/django/apps/registry.py
@@ -213,7 +213,7 @@ class Apps(object):
warnings.warn(
"Model '%s.%s' was already registered. "
"Reloading models is not advised as it can lead to inconsistencies, "
- "most notably with related models." % (model_name, app_label),
+ "most notably with related models." % (app_label, model_name),
RuntimeWarning, stacklevel=2)
else:
raise RuntimeError(