changeset 5887:b397401dda7f

fix typos, correct is: 'occurred'
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Wed, 19 Sep 2012 11:29:46 +0200
parents 5dfb9a831d8d
children d9a35af73a83
files MoinMoin/PageEditor.py MoinMoin/config/multiconfig.py MoinMoin/macro/FullSearch.py MoinMoin/mail/mailimport.py MoinMoin/xmlrpc/ProcessMail.py jabberbot/i18n.py jabberbot/xmlrpcbot.py
diffstat 7 files changed, 10 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/PageEditor.py	Mon Sep 17 14:03:37 2012 +0200
+++ b/MoinMoin/PageEditor.py	Wed Sep 19 11:29:46 2012 +0200
@@ -723,7 +723,7 @@
             # XXX do not only catch base class SaveError here, but
             # also the derived classes, so we can give better err msgs
             success = False
-            msg = "SaveError has occured in PageEditor.deletePage. We need locking there."
+            msg = "SaveError has occurred in PageEditor.deletePage. We need locking there."
 
         # delete pagelinks
         arena = self
--- a/MoinMoin/config/multiconfig.py	Mon Sep 17 14:03:37 2012 +0200
+++ b/MoinMoin/config/multiconfig.py	Wed Sep 19 11:29:46 2012 +0200
@@ -142,7 +142,7 @@
 }
         raise error.ConfigurationError(msg)
     except AttributeError, err:
-        logging.exception('An exception occured.')
+        logging.exception('An exception occurred.')
         msg = """AttributeError: %(err)s
 
 Could not find required "Config" class in "%(name)s.py".
--- a/MoinMoin/macro/FullSearch.py	Mon Sep 17 14:03:37 2012 +0200
+++ b/MoinMoin/macro/FullSearch.py	Wed Sep 19 11:29:46 2012 +0200
@@ -121,7 +121,7 @@
                 else:
                     err = _(u"More than one needle with "
                              "search_macro_parse_args config option enabled "
-                             "('%(needle)s' found already, '%(arg)s' occured)"
+                             "('%(needle)s' found already, '%(arg)s' occurred)"
                              ) % {'needle': wikiutil.escape(needle),
                                   'arg': wikiutil.escape(arg)}
 
--- a/MoinMoin/mail/mailimport.py	Mon Sep 17 14:03:37 2012 +0200
+++ b/MoinMoin/mail/mailimport.py	Wed Sep 19 11:29:46 2012 +0200
@@ -326,5 +326,5 @@
     try:
         import_mail_from_file(request, infile)
     except ProcessingError, e:
-        print >> sys.stderr, "An error occured while processing the message:", e.args
+        print >> sys.stderr, "An error occurred while processing the message:", e.args
 
--- a/MoinMoin/xmlrpc/ProcessMail.py	Mon Sep 17 14:03:37 2012 +0200
+++ b/MoinMoin/xmlrpc/ProcessMail.py	Wed Sep 19 11:29:46 2012 +0200
@@ -22,7 +22,7 @@
     try:
         mailimport.import_mail_from_string(request, mail)
     except mailimport.ProcessingError, e:
-        err = u"An error occured while processing the message: " + str(e.args)
+        err = u"An error occurred while processing the message: " + str(e.args)
         logging.error(err)
         return xmlrpcobj._outstr(err)
     return xmlrpcobj._outstr(u"OK")
--- a/jabberbot/i18n.py	Mon Sep 17 14:03:37 2012 +0200
+++ b/jabberbot/i18n.py	Wed Sep 19 11:29:46 2012 +0200
@@ -54,11 +54,11 @@
         translations =  wiki.getBotTranslations()
         return translations
     except xmlrpclib.Fault, fault:
-        log.error("XML RPC fault occured while getting translations: %s" % (str(fault), ))
+        log.error("XML RPC fault occurred while getting translations: %s" % (str(fault), ))
     except xmlrpclib.Error, error:
-        log.error("XML RPC error occured while getting translations: %s" % (str(error), ))
+        log.error("XML RPC error occurred while getting translations: %s" % (str(error), ))
     except Exception, exc:
-        log.error("Unexpected exception occured while getting translations: %s" % (str(exc), ))
+        log.error("Unexpected exception occurred while getting translations: %s" % (str(exc), ))
 
     log.error("Translations could not be downloaded, is wiki is accesible?")
     return None
--- a/jabberbot/xmlrpcbot.py	Mon Sep 17 14:03:37 2012 +0200
+++ b/jabberbot/xmlrpcbot.py	Wed Sep 19 11:29:46 2012 +0200
@@ -51,11 +51,11 @@
                 self.log.error(str(fault))
                 self.report_error(jid, msg, {'error': fault.faultString})
             except xmlrpclib.Error, err:
-                msg = _("A serious error occured while processing your request:\n%(error)s")
+                msg = _("A serious error occurred while processing your request:\n%(error)s")
                 self.log.error(str(err))
                 self.report_error(jid, msg, {'error': str(err)})
             except Exception, exc:
-                msg = _("An internal error has occured, please contact the administrator.")
+                msg = _("An internal error has occurred, please contact the administrator.")
                 self.log.critical(str(exc))
                 self.report_error(jid, msg)