changeset 785:f3c1ea6ef86e

Refactored conflict messages, removed link to diff because it is not necessary for a 3-way merge.
author Alexander Schremmer <alex AT alexanderweb DOT de>
date Sun, 04 Jun 2006 23:14:13 +0200
parents 73850527064e
children 503f0b91ba41
files MoinMoin/PageEditor.py MoinMoin/PageGraphicalEditor.py
diffstat 2 files changed, 4 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/PageEditor.py	Sun Jun 04 23:00:23 2006 +0200
+++ b/MoinMoin/PageEditor.py	Sun Jun 04 23:14:13 2006 +0200
@@ -218,11 +218,7 @@
                 conflict_msg = _('Someone else changed this page while you were editing!')
                 if self.mergeEditConflict(rev):
                     conflict_msg = _("""Someone else saved this page while you were editing!
-Please review the page and save then. Do not save this page as it is!
-Have a look at the diff of %(difflink)s to see what has been changed.""") % {
-                        'difflink': self.link_to(self.request,
-                                                 querystr='action=diff&rev=%d' % rev)
-                        }
+Please review the page and save then. Do not save this page as it is!""") 
                     rev = self.current_rev()
             if conflict_msg:
                 # We don't show preview when in conflict
@@ -928,16 +924,8 @@
                     msg = _("You already edited this page! Please do not use the back button.")
                     raise self.EditConflict, msg
 
-            msg = _("""Sorry, someone else saved the page while you edited it.
-
-Please do the following: Use the back button of your browser, and cut&paste
-your changes from there. Then go forward to here, and click EditText again.
-Now re-add your changes to the current page contents.
-
-''Do not just replace
-the content editbox with your version of the page, because that would
-delete the changes of the other person, which is excessively rude!''
-""")
+                msg = _("""Someone else saved this page while you were editing!
+Please review the page and save then. Do not save this page as it is!""") 
 
             if backup_url:
                 msg += "<p>%s</p>" % _(
--- a/MoinMoin/PageGraphicalEditor.py	Sun Jun 04 23:00:23 2006 +0200
+++ b/MoinMoin/PageGraphicalEditor.py	Sun Jun 04 23:14:13 2006 +0200
@@ -124,11 +124,7 @@
                 conflict_msg = _('Someone else changed this page while you were editing!')
                 if self.mergeEditConflict(rev):
                     conflict_msg = _("""Someone else saved this page while you were editing!
-Please review the page and save then. Do not save this page as it is!
-Have a look at the diff of %(difflink)s to see what has been changed.""") % {
-                        'difflink': self.link_to(self.request,
-                                                 querystr='action=diff&rev=%d' % rev)
-                        }
+Please review the page and save then. Do not save this page as it is!""")
                     rev = self.current_rev()
             if conflict_msg:
                 # We don't show preview when in conflict