changeset 3122:a1322262398a

refactored _() getText calls to match new api
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Wed, 27 Feb 2008 00:23:46 +0100
parents ca1c60a5285c
children 5cb80bd604b4
files MoinMoin/PageEditor.py MoinMoin/action/AttachFile.py MoinMoin/action/LikePages.py MoinMoin/action/MyPages.py MoinMoin/action/PackagePages.py MoinMoin/action/SubscribeUser.py MoinMoin/action/SyncPages.py MoinMoin/action/backup.py MoinMoin/action/diff.py MoinMoin/action/edit.py MoinMoin/action/fullsearch.py MoinMoin/action/newaccount.py MoinMoin/action/quicklink.py MoinMoin/action/quickunlink.py MoinMoin/action/recoverpass.py MoinMoin/action/subscribe.py MoinMoin/action/supplementation.py MoinMoin/action/unsubscribe.py MoinMoin/action/userprefs.py MoinMoin/parser/text_moin_wiki.py MoinMoin/parser/text_xslt.py MoinMoin/request/__init__.py MoinMoin/stats/languages.py MoinMoin/stats/useragents.py MoinMoin/userprefs/changepass.py MoinMoin/userprefs/notification.py MoinMoin/userprefs/oid.py MoinMoin/userprefs/prefs.py MoinMoin/userprefs/suid.py
diffstat 29 files changed, 91 insertions(+), 89 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/PageEditor.py	Tue Feb 26 22:40:33 2008 +0100
+++ b/MoinMoin/PageEditor.py	Wed Feb 27 00:23:46 2008 +0100
@@ -305,7 +305,7 @@
                     loadable_draft = True
                     page_rev = rev
                     draft_timestamp_str = request.user.getFormattedDateTime(draft_timestamp)
-                    draft_message = _(u"'''<<BR>>Your draft based on revision %(draft_rev)d (saved %(draft_timestamp_str)s) can be loaded instead of the current revision %(page_rev)d by using the load draft button - in case you lost your last edit somehow without saving it.''' A draft gets saved for you when you do a preview, cancel an edit or unsuccessfully save.") % locals()
+                    draft_message = _(u"'''<<BR>>Your draft based on revision %(draft_rev)d (saved %(draft_timestamp_str)s) can be loaded instead of the current revision %(page_rev)d by using the load draft button - in case you lost your last edit somehow without saving it.''' A draft gets saved for you when you do a preview, cancel an edit or unsuccessfully save.", wiki=True) % locals()
 
         # Setup status message
         status = [kw.get('msg', ''), conflict_msg, edit_lock_message, draft_message]
@@ -369,7 +369,7 @@
         if self.cfg.page_license_enabled:
             request.write('<p><em>', _(
 """By hitting '''%(save_button_text)s''' you put your changes under the %(license_link)s.
-If you don't want that, hit '''%(cancel_button_text)s''' to cancel your changes.""") % {
+If you don't want that, hit '''%(cancel_button_text)s''' to cancel your changes.""", wiki=True) % {
                 'save_button_text': save_button_text,
                 'cancel_button_text': cancel_button_text,
                      'license_link': wikiutil.getLocalizedPage(request, self.cfg.page_license_page).link_to(request),
@@ -416,7 +416,7 @@
     //-->
 </script> ''' % {
                 'checked': ('', 'checked')[form.get('trivial', ['0'])[0] == '1'],
-                'label': _("Trivial change", formatted=False),
+                'label': _("Trivial change"),
             })
 
         from MoinMoin.security.textcha import TextCha
@@ -451,7 +451,7 @@
         cat_pages = request.rootpage.getPageList(filter=filterfn)
         cat_pages.sort()
         cat_pages = [wikiutil.pagelinkmarkup(p) for p in cat_pages]
-        cat_pages.insert(0, ('', _('<No addition>', formatted=False)))
+        cat_pages.insert(0, ('', _('<No addition>')))
         request.write("<p>")
         request.write(_('Add to: %(category)s') % {
             'category': unicode(web.makeSelection('category', cat_pages)),
@@ -494,7 +494,7 @@
         quickhelp = request.cfg.editor_quickhelp.get(markup, "")
         if quickhelp:
             request.write(request.formatter.div(1, id="editor-help"))
-            request.write(_(quickhelp))
+            request.write(_(quickhelp, wiki=True))
             request.write(request.formatter.div(0))
 
         if preview is not None:
@@ -522,7 +522,7 @@
 
         backto = request.form.get('backto', [None])[0]
         page = backto and Page(request, backto) or self
-        request.theme.add_msg(_('Edit was cancelled.', formatted=False), "error")
+        request.theme.add_msg(_('Edit was cancelled.'), "error")
         page.send_page()
 
     def copyPage(self, newpagename, comment=None):
@@ -545,7 +545,7 @@
 
         pageexists_error = _("""'''A page with the name {{{'%s'}}} already exists.'''
 
-Try a different name.""") % (wikiutil.escape(newpagename), )
+Try a different name.""", wiki=True) % (wikiutil.escape(newpagename), )
 
         # Check whether a page with the new name already exists
         if newpage.exists(includeDeleted=1):
@@ -603,7 +603,7 @@
 
         pageexists_error = _("""'''A page with the name {{{'%s'}}} already exists.'''
 
-Try a different name.""") % (wikiutil.escape(newpagename), )
+Try a different name.""", wiki=True) % (wikiutil.escape(newpagename), )
 
         # Check whether a page with the new name already exists
         if newpage.exists(includeDeleted=1):
@@ -1230,12 +1230,12 @@
 
             if self.locktype == 'lock':
                 msg.append(_(
-                    "Other users will be ''blocked'' from editing this page until %(bumptime)s."
-                    ) % {'bumptime': bumptime})
+                    "Other users will be ''blocked'' from editing this page until %(bumptime)s.",
+                    wiki=True) % {'bumptime': bumptime})
             else:
                 msg.append(_(
-                    "Other users will be ''warned'' until %(bumptime)s that you are editing this page."
-                    ) % {'bumptime': bumptime})
+                    "Other users will be ''warned'' until %(bumptime)s that you are editing this page.",
+                    wiki=True) % {'bumptime': bumptime})
             msg.append(_(
                 "Use the Preview button to extend the locking period."
                 ))
@@ -1246,8 +1246,8 @@
                 # lout out user
                 result = 0, _(
                     "This page is currently ''locked'' for editing by %(owner)s until %(timestamp)s,"
-                    " i.e. for %(mins_valid)d minute(s)."
-                    ) % {'owner': owner, 'timestamp': timestamp, 'mins_valid': mins_valid}
+                    " i.e. for %(mins_valid)d minute(s).",
+                    wiki=True) % {'owner': owner, 'timestamp': timestamp, 'mins_valid': mins_valid}
             else:
                 # warn user about existing lock
 
@@ -1255,7 +1255,7 @@
 """This page was opened for editing or last previewed at %(timestamp)s by %(owner)s.<<BR>>
 '''You should ''refrain from editing'' this page for at least another %(mins_valid)d minute(s),
 to avoid editing conflicts.'''<<BR>>
-To leave the editor, press the Cancel button.""") % {
+To leave the editor, press the Cancel button.""", wiki=True) % {
                     'timestamp': timestamp, 'owner': owner, 'mins_valid': mins_valid}
 
         return result
--- a/MoinMoin/action/AttachFile.py	Tue Feb 26 22:40:33 2008 +0100
+++ b/MoinMoin/action/AttachFile.py	Wed Feb 27 00:23:46 2008 +0100
@@ -193,7 +193,7 @@
         files = os.listdir(attach_dir)
     page = Page(request, pagename)
     link = page.url(request, {'action': 'AttachFile'})
-    attach_info = _('There are <a href="%(link)s">%(count)s attachment(s)</a> stored for this page.', formatted=False) % {
+    attach_info = _('There are <a href="%(link)s">%(count)s attachment(s)</a> stored for this page.') % {
         'count': len(files),
         'link': wikiutil.escape(link)
         }
@@ -309,7 +309,8 @@
                 "To refer to attachments on a page, use '''{{{[[attachment:filename]]}}}''', \n"
                 "as shown below in the list of files. \n"
                 "Do '''NOT''' use the URL of the {{{[get]}}} link, \n"
-                "since this is subject to change and can break easily."
+                "since this is subject to change and can break easily.",
+                wiki=True
             )
         html += "<ul>"
 
@@ -595,7 +596,7 @@
         # Currently we only check TextCha for upload (this is what spammers ususally do),
         # but it could be extended to more/all attachment write access
         if not TextCha(request).check_answer_from_form():
-            msg = _('TextCha: Wrong answer! Go back and try again...', formatted=False)
+            msg = _('TextCha: Wrong answer! Go back and try again...')
         else:
             overwrite = 0
             if 'overwrite' in request.form:
@@ -1097,7 +1098,7 @@
     request.emit_http_headers()
     # Use user interface language for this generated page
     request.setContentLanguage(request.lang)
-    title = _('attachment:%(filename)s of %(pagename)s', formatted=True) % {
+    title = _('attachment:%(filename)s of %(pagename)s') % {
         'filename': filename, 'pagename': pagename}
     request.theme.send_title(title, pagename=pagename)
 
--- a/MoinMoin/action/LikePages.py	Tue Feb 26 22:40:33 2008 +0100
+++ b/MoinMoin/action/LikePages.py	Wed Feb 27 00:23:46 2008 +0100
@@ -36,7 +36,7 @@
 
     # One match - display it
     if len(matches) == 1:
-        request.theme.add_msg(_('Exactly one page like "%s" found, redirecting to page.', formatted=False) % (pagename, ), "info")
+        request.theme.add_msg(_('Exactly one page like "%s" found, redirecting to page.') % (pagename, ), "info")
         Page(request, matches.keys()[0]).send_page()
         return
 
--- a/MoinMoin/action/MyPages.py	Tue Feb 26 22:40:33 2008 +0100
+++ b/MoinMoin/action/MyPages.py	Wed Feb 27 00:23:46 2008 +0100
@@ -52,7 +52,7 @@
 ||<<NewPage(HomepageReadPageTemplate,read-only page,%(username)s)>>||["%(username)s/ReadGroup"]||
 ||<<NewPage(HomepagePrivatePageTemplate,private page,%(username)s)>>||%(username)s only||
 
-""", formatted=False)
+""")
     pagecontent = pagecontent % locals()
 
     pagecontent = pagecontent.replace('\n', '\r\n')
@@ -62,7 +62,7 @@
 
     # This action generate data using the user language
     request.setContentLanguage(request.lang)
-    request.theme.send_title(_('MyPages management', formatted=False), page=homepage)
+    request.theme.send_title(_('MyPages management'), page=homepage)
 
     # Start content - IMPORTANT - without content div, there is no direction support!
     request.write(request.formatter.startContent("content"))
--- a/MoinMoin/action/PackagePages.py	Tue Feb 26 22:40:33 2008 +0100
+++ b/MoinMoin/action/PackagePages.py	Wed Feb 27 00:23:46 2008 +0100
@@ -55,7 +55,7 @@
                 self.request.theme.add_msg(_('You are not allowed to edit this page.'), "error")
                 raise ActionError
             elif not self.page.exists():
-                self.request.theme.add_msg(_('This page is already deleted or was never created!', formatted=False))
+                self.request.theme.add_msg(_('This page is already deleted or was never created!'))
                 raise ActionError
 
             self.package()
@@ -193,7 +193,7 @@
                 if page.exists() and self.request.user.may.read(pagename):
                     pages.append(page)
         if not pages:
-            return (_('No pages like "%s"!', formatted=False) % wikiutil.escape(pagelist))
+            return (_('No pages like "%s"!') % wikiutil.escape(pagelist))
 
         # Set zipfile output
         zf = zipfile.ZipFile(fileobject, "w", COMPRESSION_LEVEL)
--- a/MoinMoin/action/SubscribeUser.py	Tue Feb 26 22:40:33 2008 +0100
+++ b/MoinMoin/action/SubscribeUser.py	Wed Feb 27 00:23:46 2008 +0100
@@ -26,7 +26,7 @@
 <input type="submit" value="Subscribe">
 </form>
 """ % (request.getScriptname(), wikiutil.quoteWikinameURL(pagename),
-      _("Enter user names (comma separated):", formatted=False)))
+      _("Enter user names (comma separated):")))
     request.theme.send_footer(pagename)
     request.theme.send_closing_html()
 
--- a/MoinMoin/action/SyncPages.py	Tue Feb 26 22:40:33 2008 +0100
+++ b/MoinMoin/action/SyncPages.py	Wed Feb 27 00:23:46 2008 +0100
@@ -137,7 +137,7 @@
 
     def show_password_form(self):
         _ = self.request.getText
-        d = {"message": _(r"Please enter your password of your account at the remote wiki below. <<BR>> /!\ You should trust both wikis because the password could be read by the particular administrators."),
+        d = {"message": _(r"Please enter your password of your account at the remote wiki below. <<BR>> /!\ You should trust both wikis because the password could be read by the particular administrators.", wiki=True),
              "passwordlabel": _("Password"),
              "submit": _("Login"),
              "cancel": _("Cancel"),
@@ -180,10 +180,10 @@
                 raise ActionStatus(_("The only supported directions are BOTH and DOWN."), "error")
 
             if not self.request.cfg.interwikiname:
-                raise ActionStatus(_("Please set an interwikiname in your wikiconfig (see HelpOnConfiguration) to be able to use this action."), "error")
+                raise ActionStatus(_("Please set an interwikiname in your wikiconfig (see HelpOnConfiguration) to be able to use this action.", wiki=True), "error")
 
             if not params["remoteWiki"]:
-                raise ActionStatus(_("Incorrect parameters. Please supply at least the ''remoteWiki'' parameter. Refer to HelpOnSynchronisation for help."), "error")
+                raise ActionStatus(_("Incorrect parameters. Please supply at least the ''remoteWiki'' parameter. Refer to HelpOnSynchronisation for help.", wiki=True), "error")
 
             local = MoinLocalWiki(self.request, params["localPrefix"], params["pageList"])
             try:
@@ -192,7 +192,7 @@
                 raise ActionStatus(msg)
 
             if not remote.valid:
-                raise ActionStatus(_("The ''remoteWiki'' is unknown."), "error")
+                raise ActionStatus(_("The ''remoteWiki'' is unknown.", wiki=True), "error")
             # if only the username is supplied, we ask for the password
             if params["user"] and not params["password"]:
                 return self.show_password_form()
@@ -205,7 +205,7 @@
                 except Exception, e:
                     temp_file = StringIO.StringIO()
                     traceback.print_exc(file=temp_file)
-                    self.log_status(self.ERROR, _("A severe error occured:"), raw_suffix=temp_file.getvalue())
+                    self.log_status(self.ERROR, _("A severe error occurred:"), raw_suffix=temp_file.getvalue())
                     raise
                 else:
                     self.request.theme.add_msg(u"%s" % (_("Synchronisation finished. Look below for the status messages."), ), "info")
--- a/MoinMoin/action/backup.py	Tue Feb 26 22:40:33 2008 +0100
+++ b/MoinMoin/action/backup.py	Wed Feb 27 00:23:46 2008 +0100
@@ -89,7 +89,7 @@
 
 Please make sure your wiki configuration backup_* values are correct and complete.
 
-"""))
+""", wiki=True))
 
     request.write("""
 <form action="%(baseurl)s/%(pagename)s" method="POST" enctype="multipart/form-data">
--- a/MoinMoin/action/diff.py	Tue Feb 26 22:40:33 2008 +0100
+++ b/MoinMoin/action/diff.py	Wed Feb 27 00:23:46 2008 +0100
@@ -111,7 +111,7 @@
         from MoinMoin.util import diff_text
         lines = diff_text.diff(oldpage.getlines(), newpage.getlines())
         if not lines:
-            msg = f.text(" - " + _("No differences found!", formatted=False))
+            msg = f.text(" - " + _("No differences found!"))
             if edit_count > 1:
                 msg = msg + f.paragraph(1) + f.text(_('The page was saved %(count)d times, though!') % {
                     'count': edit_count}) + f.paragraph(0)
--- a/MoinMoin/action/edit.py	Tue Feb 26 22:40:33 2008 +0100
+++ b/MoinMoin/action/edit.py	Wed Feb 27 00:23:46 2008 +0100
@@ -121,7 +121,7 @@
     # a full interface for categories (add, delete) or just add them by
     # markup.
 
-    if category and category != _('<No addition>', formatted=False): # opera 8.5 needs this
+    if category and category != _('<No addition>'): # opera 8.5 needs this
         # strip trailing whitespace
         savetext = savetext.rstrip()
 
@@ -160,7 +160,7 @@
         try:
             from MoinMoin.security.textcha import TextCha
             if not TextCha(request).check_answer_from_form():
-                raise pg.SaveError(_('TextCha: Wrong answer! Go back and try again...', formatted=False))
+                raise pg.SaveError(_('TextCha: Wrong answer! Go back and try again...'))
             savemsg = pg.saveText(savetext, rev, trivial=trivial, comment=comment)
         except pg.EditConflict, e:
             msg = e.message
--- a/MoinMoin/action/fullsearch.py	Tue Feb 26 22:40:33 2008 +0100
+++ b/MoinMoin/action/fullsearch.py	Wed Feb 27 00:23:46 2008 +0100
@@ -130,12 +130,12 @@
             # show info
             if mtime_parsed:
                 # XXX mtime_msg is not shown in some cases
-                mtime_msg = _("(!) Only pages changed since '''%s''' are being "
-                        "displayed!") % request.user.getFormattedDateTime(mtime)
+                mtime_msg = _("(!) Only pages changed since '''%s''' are being displayed!",
+                              wiki=True) % request.user.getFormattedDateTime(mtime)
             else:
                 mtime_msg = _('/!\\ The modification date you entered was not '
                         'recognized and is therefore not considered for the '
-                        'search results!')
+                        'search results!', wiki=True)
         else:
             mtime_msg = None
 
@@ -162,7 +162,7 @@
     stripped = needle.strip()
     if len(stripped) == 0:
         request.theme.add_msg(_('Please use a more selective search term instead '
-                'of {{{"%s"}}}') % wikiutil.escape(needle), "error")
+                'of {{{"%s"}}}', wiki=True) % wikiutil.escape(needle), "error")
         Page(request, pagename).send_page()
         return
     needle = stripped
@@ -186,7 +186,7 @@
         results = searchPages(request, query, sort, mtime, historysearch)
     except ValueError: # catch errors in the search query
         request.theme.add_msg(_('Your search query {{{"%s"}}} is invalid. Please refer to '
-                'HelpOnSearching for more information.') % wikiutil.escape(needle), "error")
+                'HelpOnSearching for more information.', wiki=True) % wikiutil.escape(needle), "error")
         Page(request, pagename).send_page()
         return
 
@@ -212,10 +212,10 @@
 
         request.theme.add_msg(_('Your search query {{{"%s"}}} didn\'t return any results. '
                 'Please change some terms and refer to HelpOnSearching for '
-                'more information.%s', formatted=True, percent=True) % (wikiutil.escape(needle),
+                'more information.%s', wiki=True, percent=True) % (wikiutil.escape(needle),
                     titlesearch and ''.join([
                         '<br>',
-                        _('(!) Consider performing a'), ' ',
+                        _('(!) Consider performing a', wiki=True), ' ',
                         f.url(1, href=request.page.url(request, querydict,
                             escape=0, relative=False)),
                         _('full-text search with your search terms'),
@@ -245,7 +245,7 @@
 
         hints.append(''.join([
             _("(!) You're performing a title search that might not include"
-                ' all related results of your search query in this wiki. <<BR>>'),
+                ' all related results of your search query in this wiki. <<BR>>', wiki=True),
             ' ',
             f.url(1, href=request.page.url(request, querydict, escape=0,
                 relative=False)),
--- a/MoinMoin/action/newaccount.py	Tue Feb 26 22:40:33 2008 +0100
+++ b/MoinMoin/action/newaccount.py	Wed Feb 27 00:23:46 2008 +0100
@@ -20,10 +20,10 @@
     form = request.form
 
     if request.request_method != 'POST':
-        return _("Use UserPreferences to change your settings or create an account.")
+        return _("Use UserPreferences to change your settings or create an account.", wiki=True)
 
     if not TextCha(request).check_answer_from_form():
-        return _('TextCha: Wrong answer! Go back and try again...', formatted=False)
+        return _('TextCha: Wrong answer! Go back and try again...')
 
     # Create user profile
     theuser = user.User(request, auth_method="new-user")
@@ -38,7 +38,7 @@
     if not user.isValidName(request, theuser.name):
         return _("""Invalid user name {{{'%s'}}}.
 Name may contain any Unicode alpha numeric character, with optional one
-space between words. Group page name is not allowed.""") % wikiutil.escape(theuser.name)
+space between words. Group page name is not allowed.""", wiki=True) % wikiutil.escape(theuser.name)
 
     # Name required to be unique. Check if name belong to another user.
     if user.getUserId(request, theuser.name):
@@ -133,7 +133,7 @@
     row = html.TR()
     tbl.append(row)
     row.append(html.TD().append(html.STRONG().append(
-                                  html.Text(_('TextCha (required)', formatted=False)))))
+                                  html.Text(_('TextCha (required)')))))
     td = html.TD()
     textcha = TextCha(request).render()
     if textcha:
--- a/MoinMoin/action/quicklink.py	Tue Feb 26 22:40:33 2008 +0100
+++ b/MoinMoin/action/quicklink.py	Wed Feb 27 00:23:46 2008 +0100
@@ -20,7 +20,7 @@
         else: # should not happen
             request.theme.add_msg(_('A quicklink to this page could not be added for you.'), "error")
     else:
-        request.theme.add_msg(_('You already have a quicklink to this page.', formatted=False))
+        request.theme.add_msg(_('You already have a quicklink to this page.'))
 
     Page(request, pagename).send_page()
 
--- a/MoinMoin/action/quickunlink.py	Tue Feb 26 22:40:33 2008 +0100
+++ b/MoinMoin/action/quickunlink.py	Wed Feb 27 00:23:46 2008 +0100
@@ -14,13 +14,13 @@
     msg = None
 
     if not request.user.valid:
-        msg = _("You must login to remove a quicklink.", formatted=False)
+        msg = _("You must login to remove a quicklink.")
     elif request.user.isQuickLinkedTo([pagename]):
         if request.user.removeQuicklink(pagename):
-            msg = _('Your quicklink to this page has been removed.', formatted=False)
+            msg = _('Your quicklink to this page has been removed.')
         else: # should not happen
-            msg = _('Your quicklink to this page could not be removed.', formatted=False)
+            msg = _('Your quicklink to this page could not be removed.')
     else:
-        msg = _('You need to have a quicklink to this page to remove it.', formatted=False)
+        msg = _('You need to have a quicklink to this page to remove it.')
 
     Page(request, pagename).send_page(msg=msg)
--- a/MoinMoin/action/recoverpass.py	Tue Feb 26 22:40:33 2008 +0100
+++ b/MoinMoin/action/recoverpass.py	Wed Feb 27 00:23:46 2008 +0100
@@ -26,14 +26,14 @@
             if not username:
                 raise KeyError
         except KeyError:
-            return _("Please provide a valid email address!", formatted=False)
+            return _("Please provide a valid email address!")
 
         u = user.User(self.request, user.getUserId(self.request, username))
         if u.valid:
             is_ok, msg = u.mailAccountData()
             if not is_ok:
                 return wikiutil.escape(msg)
-        return _("If an account with this username exists, an email was sent.", formatted=False)
+        return _("If an account with this username exists, an email was sent.")
 
     u = user.get_by_email_address(request, email)
     if u:
@@ -100,7 +100,7 @@
 If you have forgotten your password, provide your email address and click on '''Mail me my account data'''.
 <<BR>>
 The email you get contains the encrypted password (so even if someone intercepts the mail, he won't know your REAL password). Just copy and paste it into the login mask into the password field and log in.
-After logging in you should change your password."""))
+After logging in you should change your password.""", wiki=True))
 
         request.write(request.formatter.endContent())
 
--- a/MoinMoin/action/subscribe.py	Tue Feb 26 22:40:33 2008 +0100
+++ b/MoinMoin/action/subscribe.py	Wed Feb 27 00:23:46 2008 +0100
@@ -26,10 +26,11 @@
 
     # Suggest users without email to add their email address
     elif not request.user.email and not request.user.jid:
-        request.theme.add_msg(_("Add your email address or Jabber ID in your UserPreferences to use subscriptions."), "error")
+        request.theme.add_msg(_("Add your email address or Jabber ID in your UserPreferences to use subscriptions.",
+                                wiki=True), "error")
 
     elif request.user.isSubscribedTo([pagename]):
-        request.theme.add_msg(_('You are already subscribed to this page.', formatted=False))
+        request.theme.add_msg(_('You are already subscribed to this page.'))
     else:
         # Try to subscribe
         if request.user.subscribe(pagename):
--- a/MoinMoin/action/supplementation.py	Tue Feb 26 22:40:33 2008 +0100
+++ b/MoinMoin/action/supplementation.py	Wed Feb 27 00:23:46 2008 +0100
@@ -16,7 +16,7 @@
     sub_page_name = request.cfg.supplementation_page_name
     sub_page_template = request.cfg.supplementation_page_template
     newpagename = "%s/%s" % (pagename, sub_page_name)
-    errormsg = _("You are not allowed to create the supplementation page.", formatted=False)
+    errormsg = _("You are not allowed to create the supplementation page.")
 
     if pagename.endswith(sub_page_name): # sub_sub_page redirects to sub_page
         query = {}
--- a/MoinMoin/action/unsubscribe.py	Tue Feb 26 22:40:33 2008 +0100
+++ b/MoinMoin/action/unsubscribe.py	Wed Feb 27 00:23:46 2008 +0100
@@ -17,14 +17,14 @@
     if request.user.isSubscribedTo([pagename]):
         # Try to unsubscribe
         if request.user.unsubscribe(pagename):
-            msg = _('Your subscription to this page has been removed.', formatted=False)
+            msg = _('Your subscription to this page has been removed.')
         else:
-            msg = _("Can't remove regular expression subscription!", formatted=False) + u' ' + \
+            msg = _("Can't remove regular expression subscription!") + u' ' + \
                   _("Edit the subscription regular expressions in your "
-                    "UserPreferences.", formatted=True)
+                    "UserPreferences.", wiki=True)
     else:
         # The user is not subscribed
-        msg = _('You need to be subscribed to unsubscribe.', formatted=False)
+        msg = _('You need to be subscribed to unsubscribe.')
 
     Page(request, pagename).send_page(msg=msg)
 
--- a/MoinMoin/action/userprefs.py	Tue Feb 26 22:40:33 2008 +0100
+++ b/MoinMoin/action/userprefs.py	Wed Feb 27 00:23:46 2008 +0100
@@ -88,9 +88,9 @@
     _ = request.getText
     text, title, msg = _create_page(request)
     if not title:
-        title = _("Settings", formatted=False)
+        title = _("Settings")
     else:
-        lnk = html.A(href='xx').append(html.Text(_("Settings", formatted=False)))
+        lnk = html.A(href='xx').append(html.Text(_("Settings")))
         lnk = unicode(lnk)
         title = _("Settings") + "/" + title
     request.emit_http_headers()
--- a/MoinMoin/parser/text_moin_wiki.py	Tue Feb 26 22:40:33 2008 +0100
+++ b/MoinMoin/parser/text_moin_wiki.py	Wed Feb 27 00:23:46 2008 +0100
@@ -1052,13 +1052,13 @@
                 token = parser.get_token()
                 if token != '%':
                     wanted = '%'
-                    msg = _('Expected "%(wanted)s" after "%(key)s", got "%(token)s"', formatted=False) % {
+                    msg = _('Expected "%(wanted)s" after "%(key)s", got "%(token)s"') % {
                         'wanted': wanted, 'key': key, 'token': token}
                 else:
                     try:
                         dummy = int(key)
                     except ValueError:
-                        msg = _('Expected an integer "%(key)s" before "%(token)s"', formatted=False) % {
+                        msg = _('Expected an integer "%(key)s" before "%(token)s"') % {
                             'key': key, 'token': token}
                     else:
                         found = True
@@ -1068,7 +1068,7 @@
                 try:
                     dummy = int(arg)
                 except ValueError:
-                    msg = _('Expected an integer "%(arg)s" after "%(key)s"', formatted=False) % {
+                    msg = _('Expected an integer "%(arg)s" after "%(key)s"') % {
                         'arg': arg, 'key': key}
                 else:
                     found = True
@@ -1078,7 +1078,7 @@
                 try:
                     dummy = int(arg)
                 except ValueError:
-                    msg = _('Expected an integer "%(arg)s" after "%(key)s"', formatted=False) % {
+                    msg = _('Expected an integer "%(arg)s" after "%(key)s"') % {
                         'arg': arg, 'key': key}
                 else:
                     found = True
@@ -1105,7 +1105,7 @@
                         raise ValueError
                     dummy = int(arg, 16)
                 except ValueError:
-                    msg = _('Expected a color value "%(arg)s" after "%(key)s"', formatted=False) % {
+                    msg = _('Expected a color value "%(arg)s" after "%(key)s"') % {
                         'arg': arg, 'key': key}
                 else:
                     found = True
--- a/MoinMoin/parser/text_xslt.py	Tue Feb 26 22:40:33 2008 +0100
+++ b/MoinMoin/parser/text_xslt.py	Wed Feb 27 00:23:46 2008 +0100
@@ -45,7 +45,7 @@
             # can be activated in wikiconfig.py
             from MoinMoin.parser.text import Parser as TextParser
             self.request.write(formatter.sysmsg(1) +
-                               formatter.rawHTML(_('XSLT option disabled, please look at HelpOnConfiguration.')) +
+                               formatter.rawHTML(_('XSLT option disabled, please look at HelpOnConfiguration.', wiki=True)) +
                                formatter.sysmsg(0))
             TextParser(self.raw, self.request).format(formatter)
             return
--- a/MoinMoin/request/__init__.py	Tue Feb 26 22:40:33 2008 +0100
+++ b/MoinMoin/request/__init__.py	Wed Feb 27 00:23:46 2008 +0100
@@ -1240,16 +1240,16 @@
                 msg = None
                 # Complain about unknown actions
                 if not action_name in self.getKnownActions():
-                    msg = _("Unknown action %(action_name)s.", formatted=False) % {
+                    msg = _("Unknown action %(action_name)s.") % {
                             'action_name': wikiutil.escape(action_name), }
 
                 # Disallow non available actions
                 elif action_name[0].isupper() and not action_name in self.getAvailableActions(self.page):
-                    msg = _("You are not allowed to do %(action_name)s on this page.", formatted=False) % {
+                    msg = _("You are not allowed to do %(action_name)s on this page.") % {
                             'action_name': wikiutil.escape(action_name), }
                     if not self.user.valid:
                         # Suggest non valid user to login
-                        msg += " " + _("Login and try again.", formatted=False)
+                        msg += " " + _("Login and try again.")
 
                 if msg:
                     self.request.theme.add_msg(msg, "error")
@@ -1259,11 +1259,11 @@
                     from MoinMoin import action
                     handler = action.getHandler(self, action_name)
                     if handler is None:
-                        msg = _("You are not allowed to do %(action_name)s on this page.", formatted=False) % {
+                        msg = _("You are not allowed to do %(action_name)s on this page.") % {
                                 'action_name': wikiutil.escape(action_name), }
                         if not self.user.valid:
                             # Suggest non valid user to login
-                            msg += " " + _("Login and try again.", formatted=False)
+                            msg += " " + _("Login and try again.")
                         self.request.theme.add_msg(msg, "error")
                         self.page.send_page()
                     else:
--- a/MoinMoin/stats/languages.py	Tue Feb 26 22:40:33 2008 +0100
+++ b/MoinMoin/stats/languages.py	Wed Feb 27 00:23:46 2008 +0100
@@ -54,14 +54,14 @@
 
 
     languages = TupleDataset()
-    languages.columns = [Column('language', label=_("Language", formatted=False), align='left'),
+    languages.columns = [Column('language', label=_("Language"), align='left'),
                          Column('value', label='%', align='right')]
 
     cnt_printed = 0
     data = data[:10]
 
     # Preparing "<Browser setting>"
-    browserlang = _('<Browser setting>', formatted=False)
+    browserlang = _('<Browser setting>')
     browserlang = browserlang[1:len(browserlang) - 1].capitalize()
     if total:
         for cnt, lang in data:
@@ -79,7 +79,7 @@
             except UnicodeError:
                 pass
         if total > cnt_printed:
-            languages.addRow((_('Others', formatted=False), "%(percent).2f%% (%(count)d)" % {
+            languages.addRow((_('Others'), "%(percent).2f%% (%(count)d)" % {
                 'percent': 100.0 * (total - cnt_printed) / total,
                 'count': total - cnt_printed}))
 
--- a/MoinMoin/stats/useragents.py	Tue Feb 26 22:40:33 2008 +0100
+++ b/MoinMoin/stats/useragents.py	Wed Feb 27 00:23:46 2008 +0100
@@ -113,7 +113,7 @@
             except UnicodeError:
                 pass
         if total > cnt_printed:
-            agents.addRow((_('Others', formatted=False), "%.2f" % (100 * (total - cnt_printed) / total)))
+            agents.addRow((_('Others'), "%.2f" % (100 * (total - cnt_printed) / total)))
 
     table = DataBrowserWidget(request)
     table.setData(agents)
--- a/MoinMoin/userprefs/changepass.py	Tue Feb 26 22:40:33 2008 +0100
+++ b/MoinMoin/userprefs/changepass.py	Wed Feb 27 00:23:46 2008 +0100
@@ -22,7 +22,7 @@
         self._ = request.getText
         _ = request.getText
         self.cfg = request.cfg
-        self.title = _("Change password", formatted=False)
+        self.title = _("Change password")
         self.name = 'changepass'
 
 
--- a/MoinMoin/userprefs/notification.py	Tue Feb 26 22:40:33 2008 +0100
+++ b/MoinMoin/userprefs/notification.py	Wed Feb 27 00:23:46 2008 +0100
@@ -93,16 +93,16 @@
 
         types = []
         if self.cfg.mail_enabled and self.request.user.email:
-            types.append(('email', _("'''Email'''")))
+            types.append(('email', _("'''Email'''", wiki=True)))
         if self.cfg.jabber_enabled and self.request.user.jid:
-            types.append(('jabber', _("'''Jabber'''")))
+            types.append(('jabber', _("'''Jabber'''", wiki=True)))
 
         table = html.TABLE()
         header = html.TR()
         table.append(header)
         for name, descr in types:
             header.append(html.TH().append(html.Raw(descr)))
-        header.append(html.TH(align='left').append(html.Raw(_("'''Event type'''"))))
+        header.append(html.TH(align='left').append(html.Raw(_("'''Event type'''", wiki=True))))
 
         event_list = events.get_subscribable_events()
         super = self.request.user.isSuperUser()
@@ -156,7 +156,7 @@
         notifylist = self.request.user.getSubscriptionList()
 
         self.make_row(
-            html.Raw(_('Subscribed wiki pages<<BR>>(one regex per line)')),
+            html.Raw(_('Subscribed wiki pages<<BR>>(one regex per line)', wiki=True)),
             [html.TEXTAREA(name="subscribed_pages", rows="6", cols="50").append(
                 '\n'.join(notifylist)), ],
             valign="top"
--- a/MoinMoin/userprefs/oid.py	Tue Feb 26 22:40:33 2008 +0100
+++ b/MoinMoin/userprefs/oid.py	Wed Feb 27 00:23:46 2008 +0100
@@ -29,7 +29,7 @@
         self._ = request.getText
         self.cfg = request.cfg
         _ = self._
-        self.title = _("OpenID settings", formatted=False)
+        self.title = _("OpenID settings")
         openid_auth = False
         if not _openid_disabled:
             for authm in self.request.cfg.auth:
--- a/MoinMoin/userprefs/prefs.py	Tue Feb 26 22:40:33 2008 +0100
+++ b/MoinMoin/userprefs/prefs.py	Wed Feb 27 00:23:46 2008 +0100
@@ -34,7 +34,7 @@
         self._ = request.getText
         self.cfg = request.cfg
         _ = self._
-        self.title = _("Preferences", formatted=False)
+        self.title = _("Preferences")
         self.name = 'prefs'
 
     def _decode_pagelist(self, key):
@@ -61,7 +61,7 @@
         form = self.request.form
 
         if self.request.request_method != 'POST':
-            return _("Use UserPreferences to change your settings or create an account.")
+            return _("Use UserPreferences to change your settings or create an account.", wiki=True)
         theuser = self.request.user
         if not theuser:
             return
@@ -74,7 +74,7 @@
             if not user.isValidName(self.request, theuser.name):
                 return _("""Invalid user name {{{'%s'}}}.
 Name may contain any Unicode alpha numeric character, with optional one
-space between words. Group page name is not allowed.""") % wikiutil.escape(theuser.name)
+space between words. Group page name is not allowed.""", wiki=True) % wikiutil.escape(theuser.name)
 
             # Is this an existing user trying to change information or a new user?
             # Name required to be unique. Check if name belong to another user.
@@ -279,7 +279,7 @@
         cur_lang = self.request.user.valid and self.request.user.language or ''
         langs = i18n.wikiLanguages().items()
         langs.sort(lambda x, y: cmp(x[1]['x-language'], y[1]['x-language']))
-        options = [('', _('<Browser setting>', formatted=False))]
+        options = [('', _('<Browser setting>'))]
         for lang in langs:
             name = lang[1]['x-language']
             options.append((lang[0], name))
--- a/MoinMoin/userprefs/suid.py	Tue Feb 26 22:40:33 2008 +0100
+++ b/MoinMoin/userprefs/suid.py	Wed Feb 27 00:23:46 2008 +0100
@@ -22,7 +22,7 @@
         self._ = request.getText
         self.cfg = request.cfg
         _ = self._
-        self.title = _("Switch user", formatted=False)
+        self.title = _("Switch user")
         self.name = 'suid'
 
     def allowed(self):