Merge lp:~xavier-antoviaque/ibid/factoidknowonethings-723098 into lp:ibid

[XavierAntoviaque]

[Keegan Carruthers-Smith (keegan-csmith)]

In ibid.utils there is a helper function called plural. So you can go plural(len(factoids), '', 's'). Otherwise this looks good so just gonna go ahead and approve it now.

review: Approve

[Stefano Rivera (stefanor)]

For translation purposes, plural(len(factoids, 'thing', 'things') is better. (Not that we have translation, but we try to keep that idea in mind...)

Unmerged revisions

1045. By XavierAntoviaque on 2012-02-27

Fixes #723098 - "I only know 1 things about foo"

Now uses singular in the error message, when there is only one factoid available and asked for a factoid number higher than 1.

=== modified file 'ibid/plugins/factoid.py'
--- ibid/plugins/factoid.py	2011-08-12 10:04:25 +0000
+++ ibid/plugins/factoid.py	2012-02-27 22:53:23 +0000
@@ -296,9 +296,10 @@
             factoids = get_factoid(event.session, name, None, pattern, is_regex,
                 literal=True)
             if factoids:
-                event.addresponse(u"I only know %(number)d things about %(name)s", {
+                event.addresponse(u"I only know %(number)d thing%(plural)s about %(name)s", {
                     u'number': len(factoids),
                     u'name': name,
+                    u'plural': len(factoids)>1 and 's' or '',
                 })
 
 

=== modified file 'ibid/test/plugins/test_factoid.py'
--- ibid/test/plugins/test_factoid.py	2011-02-01 14:24:21 +0000
+++ ibid/test/plugins/test_factoid.py	2012-02-27 22:53:23 +0000
@@ -133,3 +133,12 @@
         self.assertResponseMatches('. is foo', '.*empty')
         self.failIfResponseMatches('', '.*foo')
         self.failIfResponseMatches('.', '.*foo')
+
+    def test_literal_number_too_large(self):
+        self.assertSucceeds('Foo is bar')
+        self.assertResponseMatches('literal foo #1', '1: is bar')
+        self.assertResponseMatches('literal foo #2', 'I only know 1 thing about foo')
+        self.assertSucceeds('Foo is also zorg')
+        self.assertResponseMatches('literal foo #2', '2: is zorg')
+        self.assertResponseMatches('literal foo #3', 'I only know 2 things about foo')
+        
\ No newline at end of file