From a67dd883a2fb2de187ef8ee0a3db035684255d88 Mon Sep 17 00:00:00 2001
From: "J.-S. Caux" <J.S.Caux@uva.nl>
Date: Tue, 6 Nov 2018 15:54:49 +0100
Subject: [PATCH] Update error message when cleaning Profiles merge form
---
profiles/forms.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/profiles/forms.py b/profiles/forms.py
index f70fea70a..63a46e618 100644
--- a/profiles/forms.py
+++ b/profiles/forms.py
@@ -98,7 +98,8 @@ class ProfileMergeForm(forms.Form):
if self.cleaned_data['to_merge'].has_contributor and \
self.cleaned_data['to_merge_into'].has_contributor:
self.add_error(None, 'Each of these two Profiles has a Contributor. '
- 'Cannot merge. A ProfileNonDuplicate instance should be created; '
+ 'Cannot merge. If these are distinct people or if two separate '
+ 'accounts are needed, a ProfileNonDuplicate instance should be created; '
'contact techsupport.')
return data
--
GitLab