rattail/tailbone
2
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

Tweak verbiage for merge template etc.

Browse source
This commit is contained in:
Lance Edgar 2016-11-09 02:17:01 -06:00
parent 63d89b696a
commit ba1fa6d617
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tailbone/views/master.py
View file

@ -429,7 +429,7 @@ class MasterView(View):
try:
self.validate_merge(object_to_remove, object_to_keep)
except Exception as error:
self.request.session.flash("Requested merge cannot proceed (maybe swap keep/remove and try again?): {}".format(error), 'error')
self.request.session.flash("Requested merge cannot proceed (maybe swap kept/removed and try again?): {}".format(error), 'error')
else:
self.merge_objects(object_to_remove, object_to_keep)
self.request.session.flash("{} has been merged into {}".format(msg, object_to_keep))