From 20036816c852d171e97134e864a67be87c77acbe Mon Sep 17 00:00:00 2001 From: Jeremy Fincher Date: Fri, 5 Sep 2003 06:49:14 +0000 Subject: [PATCH] Converted uses of utils.pluralize to utils.nItems. --- plugins/Alias.py | 4 +--- plugins/FunDB.py | 9 ++++----- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/plugins/Alias.py b/plugins/Alias.py index 5c50142c4..57f47d711 100644 --- a/plugins/Alias.py +++ b/plugins/Alias.py @@ -128,9 +128,7 @@ def makeNewAlias(name, alias): alias_ = dollarRe.sub(replace, alias_) self.Proxy(irc.irc, msg, callbacks.tokenize(alias_)) f.__doc__ ='\n\nAlias for %r' % \ - (biggestDollar, - utils.pluralize(biggestDollar, 'argument'), - alias) + (utils.nItems(biggestDollar, 'argument'), alias) #f = new.function(f.func_code, f.func_globals, name) return f diff --git a/plugins/FunDB.py b/plugins/FunDB.py index 6a257533b..e6eda3521 100755 --- a/plugins/FunDB.py +++ b/plugins/FunDB.py @@ -333,8 +333,8 @@ class FunDB(callbacks.Privmsg): total = int(cursor.fetchone()[0]) except ValueError: irc.error(msg, 'Unexpected response from database') - irc.reply(msg, 'There %s currently %s %s in my database' % \ - (utils.be(total), total, utils.pluralize(total, table))) + irc.reply(msg, 'There %s currently %s in my database' % \ + (utils.be(total), utils.nItems(total, table))) def dbget(self, irc, msg, args): """ @@ -386,9 +386,8 @@ class FunDB(callbacks.Privmsg): else: (add,req,count) = cursor.fetchone() reply = '%s #%s: Created by %s. last requested by %s, requested '\ - ' a total of %s %s' % \ - (table, id, add, req, - count, utils.pluralize(count, 'time')) + ' a total of %s' % \ + (table, id, add, req, utils.nItems(count, 'time')) irc.reply(msg, reply) def lart(self, irc, msg, args):