Merge lp:~keegan-csmith/ibid/memoplurality-634257-0.1 into lp:~ibid-core/ibid/old-release-0.1-1.6

[Keegan Carruthers-Smith]

Use correct plurality in pending memos message

[Max Rabkin (max-rabkin)]

review: Approve

[marcog (marco-gallotta)]

review: Approve

[Stefano Rivera (stefanor)]

review: Approve

=== modified file 'ibid/plugins/memo.py'
--- ibid/plugins/memo.py	2011-01-12 14:16:31 +0000
+++ ibid/plugins/memo.py	2011-01-21 21:16:11 +0000
@@ -15,7 +15,7 @@
 from ibid.db.models import Identity, Account
 from ibid.auth import permission
 from ibid.plugins.identity import get_identities
-from ibid.utils import ago, format_date
+from ibid.utils import ago, format_date, plural
 
 features = {'memo': {
     'description': u'Keeps messages for people.',
@@ -324,9 +324,14 @@
                 u' so ask me in private.',
                 len(memos), target=event.sender['connection'])
         elif len(memos) > 0:
-            event.addresponse(u'You have %s messages. '
-                    u"Would you like to read them now?",
-                len(memos),
+            event.addresponse(
+                plural(
+                    len(memos),
+                    u'You have %(memo_count)d message. '
+                    u'Would you like to read it now?',
+                    u'You have %(memo_count)d messages. '
+                    u'Would you like to read them now?'),
+                { 'memo_count' : len(memos) },
                 target=event.sender['connection'])
         else:
             nomemos_cache.add(event.identity)

=== modified file 'ibid/utils/__init__.py'
--- ibid/utils/__init__.py	2011-01-12 14:16:31 +0000
+++ ibid/utils/__init__.py	2011-01-21 21:16:11 +0000
@@ -262,7 +262,7 @@
             .join(filter(None, [separator.join(items[:-1])] + items[-1:])))
 
 def plural(count, singular, plural):
-    "Return sigular or plural depending on count"
+    "Return singular or plural depending on count"
     if count == 1:
         return singular
     return plural