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

Tweak wording for master merge template

Browse source
This commit is contained in:
Lance Edgar 2017-07-11 23:23:23 -05:00
parent 1685d37c01
commit 5bff7d16b9
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
tailbone/templates/master/merge.mako
View file

@ -101,10 +101,10 @@
</p> </p>
<p> <p>
The ${h.link_to("{} on the right".format(model_title), view_url(object_to_keep), target='_blank', class_='merge-object')} The ${h.link_to("{} on the left".format(model_title), view_url(object_to_remove), target='_blank', class_='merge-object')}
will be <strong>kept</strong> will be <strong>deleted</strong>
and the ${h.link_to("{} on the left".format(model_title), view_url(object_to_remove), target='_blank', class_='merge-object')} and the ${h.link_to("{} on the right".format(model_title), view_url(object_to_keep), target='_blank', class_='merge-object')}
will be <strong>deleted</strong>.&nbsp; The one which is to be kept may also will be <strong>kept</strong>.&nbsp; The one which is to be kept may also
be updated to reflect certain aspects of the one being deleted; however again be updated to reflect certain aspects of the one being deleted; however again
the details are up to the app logic for this type of merge and aren't fully the details are up to the app logic for this type of merge and aren't fully
known to the generic tool which you're using now. known to the generic tool which you're using now.