diff MoinMoin/formatter/text_html.py @ 3123:5cb80bd604b4

refactored _() getText calls to match new api
author Radomir Dopieralski <moindev@sheep.art.pl>
date Wed, 27 Feb 2008 00:28:28 +0100
parents d2e9afd64276
children ea5383222f2f
line wrap: on
line diff
--- a/MoinMoin/formatter/text_html.py	Wed Feb 27 00:23:46 2008 +0100
+++ b/MoinMoin/formatter/text_html.py	Wed Feb 27 00:28:28 2008 +0100
@@ -626,7 +626,7 @@
                 css = 'attachment'
             else:
                 target = AttachFile.getAttachUploadUrl(pagename, fname, self.request)
-                title = _('Upload new attachment "%(filename)s"', formatted=False) % {'filename': wikiutil.escape(fname)}
+                title = _('Upload new attachment "%(filename)s"') % {'filename': wikiutil.escape(fname)}
                 css = 'attachment nonexistent'
             return self.url(on, target, css=css, title=title)
         else:
@@ -640,7 +640,7 @@
         if exists:
             kw['css'] = 'attachment'
             kw['src'] = AttachFile.getAttachUrl(pagename, filename, self.request, addts=1)
-            title = _('Inlined image: %(url)s', formatted=False) % {'url': self.text(url)}
+            title = _('Inlined image: %(url)s') % {'url': self.text(url)}
             if not 'title' in kw:
                 kw['title'] = title
             # alt is required for images:
@@ -648,7 +648,7 @@
                 kw['alt'] = kw['title']
             return self.image(**kw)
         else:
-            title = _('Upload new attachment "%(filename)s"', formatted=False) % {
+            title = _('Upload new attachment "%(filename)s"') % {
                       'filename': wikiutil.escape(fname)}
             img = self.icon('attachimg')
             css = 'nonexistent'
@@ -679,7 +679,7 @@
 
         # check whether attachment exists, possibly point to upload form
         if not exists:
-            linktext = _('Create new drawing "%(filename)s (opens in new window)"', formatted=False)
+            linktext = _('Create new drawing "%(filename)s (opens in new window)"')
             return wikiutil.link_tag(
                 self.request,
                 ('%s?action=AttachFile&rename=%s%s' %
@@ -710,18 +710,18 @@
                 # add alt and title tags to areas
                 map = re.sub('href\s*=\s*"((?!%TWIKIDRAW%).+?)"', r'href="\1" alt="\1" title="\1"', map)
                 # add in edit links plus alt and title attributes
-                alt = title = _('Edit drawing %(filename)s (opens in new window)', formatted=False) % {'filename': self.text(fname)}
+                alt = title = _('Edit drawing %(filename)s (opens in new window)') % {'filename': self.text(fname)}
                 map = map.replace('%TWIKIDRAW%"', '%s" alt="%s" title="%s"' % (edit_link, alt, title))
                 # unxml, because 4.01 concrete will not validate />
                 map = map.replace('/>', '>')
-                alt = title = _('Clickable drawing: %(filename)s', formatted=False) % {'filename': self.text(fname)}
+                alt = title = _('Clickable drawing: %(filename)s') % {'filename': self.text(fname)}
                 return (map + self.image(
                     alt=alt,
                     title=title,
                     src=AttachFile.getAttachUrl(pagename, filename, self.request, addts=1),
                     usemap='#'+mapid, css="drawing"))
         else:
-            alt = title = _('Edit drawing %(filename)s (opens in new window)', formatted=False) % {'filename': self.text(fname)}
+            alt = title = _('Edit drawing %(filename)s (opens in new window)') % {'filename': self.text(fname)}
             return wikiutil.link_tag(self.request,
                                      edit_link,
                                      self.image(alt=alt,