changeset 3586:35366465d4fe

AttachFile/Load: remove misleading/outdated text, Load: fix UI cosmetics, reuse i18n texts
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Mon, 12 May 2008 14:46:02 +0200
parents fc32d580fe37
children 1acfce5064d2
files MoinMoin/action/AttachFile.py MoinMoin/action/Load.py
diffstat 2 files changed, 5 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/action/AttachFile.py	Mon May 12 13:59:31 2008 +0200
+++ b/MoinMoin/action/AttachFile.py	Mon May 12 14:46:02 2008 +0200
@@ -465,10 +465,7 @@
     # This avoids usability issues if you have to scroll down a lot to upload
     # a new file when the page already has lots of attachments:
     if writeable:
-        request.write('<h2>' + _("New Attachment") + '</h2><p>' +
-_("""An upload will never overwrite an existing file. If there is a name
-conflict, you have to rename the file that you want to upload.
-Otherwise, if "Rename to" is left blank, the original filename will be used.""") + '</p>')
+        request.write('<h2>' + _("New Attachment") + '</h2>')
         request.write("""
 <form action="%(baseurl)s/%(pagename)s" method="POST" enctype="multipart/form-data">
 <dl>
--- a/MoinMoin/action/Load.py	Mon May 12 13:59:31 2008 +0200
+++ b/MoinMoin/action/Load.py	Mon May 12 14:46:02 2008 +0200
@@ -118,8 +118,8 @@
 <dt>%(upload_label_rename)s</dt>
 <dd><input type="text" name="rename" size="50" value=""></dd>
 %(querytext_attachment)s
-<dt>%(upload)s <input type="checkbox" name="attachment" value="off">
-%(overwrite)s <input type="checkbox" name="overwrite" value="off"></dt>
+<dt><input type="checkbox" name="attachment" value="off"> %(upload)s</dt>
+<dt><input type="checkbox" name="overwrite" value="off"> %(overwrite)s</dt>
 </dl>
 <p>
 <input type="hidden" name="action" value="%(action_name)s">
@@ -130,13 +130,10 @@
 </td>""" % {
     'querytext_pages': '<h2>' + _("New Page or New Attachment") + '</h2><p>' +
 _("""You can upload a file to a new page or choose to upload a file as attachment for the current page""") + '</p>',
-    'querytext_attachment': '<h2>' + _("New Attachment") + '</h2><p>' +
-_("""An upload will never overwrite an existing file. If there is a name
-conflict, you have to rename the file that you want to upload.
-Otherwise, if "Rename to" is left blank, the original filename will be used.""") + '</p>',
+    'querytext_attachment': '<h2>' + _("New Attachment") + '</h2>',
     'buttons_html': buttons_html,
     'upload': _('attachment'),
-    'overwrite': _('overwrite'),
+    'overwrite': _('Overwrite existing attachment of same name'),
     'action_name': self.form_trigger,
     'upload_label_file': _('Upload'),
     'upload_label_rename': _('New Name'),