Fixed #103 -- Fixed translatable plural string

@@ -82,7 +82,7 @@ class CommentsAdmin(admin.ModelAdmin):
             action(request, comment)
             action(request, comment)
             n_comments += 1
             n_comments += 1
 
 
-        msg = ungettext('1 comment was successfully %(action)s.',
+        msg = ungettext('%(count)s comment was successfully %(action)s.',
                         '%(count)s comments were successfully %(action)s.',
                         '%(count)s comments were successfully %(action)s.',
                         n_comments)
                         n_comments)
         self.message_user(request, msg % {'count': n_comments, 'action': done_message(n_comments)})
         self.message_user(request, msg % {'count': n_comments, 'action': done_message(n_comments)})

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-10 09:06+0100\n"
+"POT-Creation-Date: 2016-09-29 16:05+0200\n"
 "PO-Revision-Date: 2012-02-14 13:24+0000\n"
 "PO-Revision-Date: 2012-02-14 13:24+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
 "Language-Team: English <en@li.org>\n"
 "Language-Team: English <en@li.org>\n"
@@ -16,146 +16,58 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 
-#: admin.py:25
-msgid "Content"
-msgstr "Content"
-
-#: admin.py:28
-msgid "Metadata"
-msgstr "Metadata"
-
-#: admin.py:55
-msgid "flagged"
-msgid_plural "flagged"
-msgstr[0] "flagged"
-msgstr[1] "flagged"
-
-#: admin.py:56
-msgid "Flag selected comments"
-msgstr "Flag selected comments"
-
-#: admin.py:60
-msgid "approved"
-msgid_plural "approved"
-msgstr[0] "approved"
-msgstr[1] "approved"
-
-#: admin.py:61
-msgid "Approve selected comments"
-msgstr "Approve selected comments"
-
-#: admin.py:65
-msgid "removed"
-msgid_plural "removed"
-msgstr[0] "removed"
-msgstr[1] "removed"
-
-#: admin.py:66
-msgid "Remove selected comments"
-msgstr "Remove selected comments"
-
-#: admin.py:78
-#, python-format
-msgid "1 comment was successfully %(action)s."
-msgid_plural "%(count)s comments were successfully %(action)s."
-msgstr[0] "1 comment was successfully %(action)s."
-msgstr[1] "%(count)s comments were successfully %(action)s."
-
-#: feeds.py:14
-#, python-format
-msgid "%(site_name)s comments"
-msgstr "%(site_name)s comments"
-
-#: feeds.py:20
-#, python-format
-msgid "Latest comments on %(site_name)s"
-msgstr "Latest comments on %(site_name)s"
-
-#: forms.py:105
-msgctxt "Person name"
-msgid "Name"
-msgstr "Name"
-
-#: forms.py:97
-msgid "Email address"
-msgstr "Email address"
-
-#: forms.py:98
-msgid "URL"
-msgstr "URL"
-
-#: forms.py:99
-msgid "Comment"
-msgstr "Comment"
-
-#: forms.py:177
-#, python-format
-msgid "Watch your mouth! The word %s is not allowed here."
-msgid_plural "Watch your mouth! The words %s are not allowed here."
-msgstr[0] "Watch your mouth! The word %s is not allowed here."
-msgstr[1] "Watch your mouth! The words %s are not allowed here."
-
-#: forms.py:181 templates/comments/preview.html:16
-msgid "and"
-msgstr "and"
-
-#: forms.py:186
-msgid ""
-"If you enter anything in this field your comment will be treated as spam"
-msgstr ""
-"If you enter anything in this field your comment will be treated as spam"
-
-#: models.py:23
+#: django_comments/abstracts.py:26
 msgid "content type"
 msgid "content type"
 msgstr "content type"
 msgstr "content type"
 
 
-#: models.py:25
+#: django_comments/abstracts.py:29
 msgid "object ID"
 msgid "object ID"
 msgstr "object ID"
 msgstr "object ID"
 
 
-#: models.py:53 models.py:177
+#: django_comments/abstracts.py:57 django_comments/models.py:32
 msgid "user"
 msgid "user"
 msgstr "user"
 msgstr "user"
 
 
-#: models.py:55
+#: django_comments/abstracts.py:60
 msgid "user's name"
 msgid "user's name"
 msgstr "user's name"
 msgstr "user's name"
 
 
-#: models.py:56
+#: django_comments/abstracts.py:62
 msgid "user's email address"
 msgid "user's email address"
 msgstr "user's email address"
 msgstr "user's email address"
 
 
-#: models.py:57
+#: django_comments/abstracts.py:64
 msgid "user's URL"
 msgid "user's URL"
 msgstr "user's URL"
 msgstr "user's URL"
 
 
-#: models.py:59 models.py:79 models.py:178
+#: django_comments/abstracts.py:66 django_comments/abstracts.py:86
+#: django_comments/models.py:36
 msgid "comment"
 msgid "comment"
 msgstr "comment"
 msgstr "comment"
 
 
-#: models.py:62
+#: django_comments/abstracts.py:69
 msgid "date/time submitted"
 msgid "date/time submitted"
 msgstr "date/time submitted"
 msgstr "date/time submitted"
 
 
-#: models.py:63
+#: django_comments/abstracts.py:70
 msgid "IP address"
 msgid "IP address"
 msgstr "IP address"
 msgstr "IP address"
 
 
-#: models.py:64
+#: django_comments/abstracts.py:71
 msgid "is public"
 msgid "is public"
 msgstr "is public"
 msgstr "is public"
 
 
-#: models.py:65
+#: django_comments/abstracts.py:72
 msgid ""
 msgid ""
 "Uncheck this box to make the comment effectively disappear from the site."
 "Uncheck this box to make the comment effectively disappear from the site."
 msgstr ""
 msgstr ""
 "Uncheck this box to make the comment effectively disappear from the site."
 "Uncheck this box to make the comment effectively disappear from the site."
 
 
-#: models.py:67
+#: django_comments/abstracts.py:74
 msgid "is removed"
 msgid "is removed"
 msgstr "is removed"
 msgstr "is removed"
 
 
-#: models.py:68
+#: django_comments/abstracts.py:75
 msgid ""
 msgid ""
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "removed\" message will be displayed instead."
 "removed\" message will be displayed instead."
@@ -163,11 +75,11 @@ msgstr ""
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "removed\" message will be displayed instead."
 "removed\" message will be displayed instead."
 
 
-#: models.py:80
+#: django_comments/abstracts.py:87
 msgid "comments"
 msgid "comments"
 msgstr "comments"
 msgstr "comments"
 
 
-#: models.py:124
+#: django_comments/abstracts.py:132
 msgid ""
 msgid ""
 "This comment was posted by an authenticated user and thus the name is read-"
 "This comment was posted by an authenticated user and thus the name is read-"
 "only."
 "only."
@@ -175,7 +87,7 @@ msgstr ""
 "This comment was posted by an authenticated user and thus the name is read-"
 "This comment was posted by an authenticated user and thus the name is read-"
 "only."
 "only."
 
 
-#: models.py:134
+#: django_comments/abstracts.py:143
 msgid ""
 msgid ""
 "This comment was posted by an authenticated user and thus the email is read-"
 "This comment was posted by an authenticated user and thus the email is read-"
 "only."
 "only."
@@ -183,7 +95,7 @@ msgstr ""
 "This comment was posted by an authenticated user and thus the email is read-"
 "This comment was posted by an authenticated user and thus the email is read-"
 "only."
 "only."
 
 
-#: models.py:160
+#: django_comments/abstracts.py:171
 #, python-format
 #, python-format
 msgid ""
 msgid ""
 "Posted by %(user)s at %(date)s\n"
 "Posted by %(user)s at %(date)s\n"
@@ -198,112 +110,208 @@ msgstr ""
 "\n"
 "\n"
 "http://%(domain)s%(url)s"
 "http://%(domain)s%(url)s"
 
 
-#: models.py:179
+#: django_comments/admin.py:28
+msgid "Content"
+msgstr "Content"
+
+#: django_comments/admin.py:32
+msgid "Metadata"
+msgstr "Metadata"
+
+#: django_comments/admin.py:59
+msgid "flagged"
+msgid_plural "flagged"
+msgstr[0] "flagged"
+msgstr[1] "flagged"
+
+#: django_comments/admin.py:61
+msgid "Flag selected comments"
+msgstr "Flag selected comments"
+
+#: django_comments/admin.py:65
+msgid "approved"
+msgid_plural "approved"
+msgstr[0] "approved"
+msgstr[1] "approved"
+
+#: django_comments/admin.py:67
+msgid "Approve selected comments"
+msgstr "Approve selected comments"
+
+#: django_comments/admin.py:71
+msgid "removed"
+msgid_plural "removed"
+msgstr[0] "removed"
+msgstr[1] "removed"
+
+#: django_comments/admin.py:73
+msgid "Remove selected comments"
+msgstr "Remove selected comments"
+
+#: django_comments/admin.py:85
+#, fuzzy, python-format
+#| msgid "1 comment was successfully %(action)s."
+#| msgid_plural "%(count)s comments were successfully %(action)s."
+msgid "%(count)s comment was successfully %(action)s."
+msgid_plural "%(count)s comments were successfully %(action)s."
+msgstr[0] "1 comment was successfully %(action)s."
+msgstr[1] "%(count)s comments were successfully %(action)s."
+
+#: django_comments/feeds.py:16
+#, python-format
+msgid "%(site_name)s comments"
+msgstr "%(site_name)s comments"
+
+#: django_comments/feeds.py:22
+#, python-format
+msgid "Latest comments on %(site_name)s"
+msgstr "Latest comments on %(site_name)s"
+
+#: django_comments/forms.py:101
+msgctxt "Person name"
+msgid "Name"
+msgstr "Name"
+
+#: django_comments/forms.py:102
+msgid "Email address"
+msgstr "Email address"
+
+#: django_comments/forms.py:103
+msgid "URL"
+msgstr "URL"
+
+#: django_comments/forms.py:104
+msgid "Comment"
+msgstr "Comment"
+
+#: django_comments/forms.py:183
+#, python-format
+msgid "Watch your mouth! The word %s is not allowed here."
+msgid_plural "Watch your mouth! The words %s are not allowed here."
+msgstr[0] "Watch your mouth! The word %s is not allowed here."
+msgstr[1] "Watch your mouth! The words %s are not allowed here."
+
+#: django_comments/forms.py:187
+#: django_comments/templates/comments/preview.html:17
+msgid "and"
+msgstr "and"
+
+#: django_comments/forms.py:193
+msgid ""
+"If you enter anything in this field your comment will be treated as spam"
+msgstr ""
+"If you enter anything in this field your comment will be treated as spam"
+
+#: django_comments/models.py:38
 msgid "flag"
 msgid "flag"
 msgstr "flag"
 msgstr "flag"
 
 
-#: models.py:180
+#: django_comments/models.py:39
 msgid "date"
 msgid "date"
 msgstr "date"
 msgstr "date"
 
 
-#: models.py:190
+#: django_comments/models.py:49
 msgid "comment flag"
 msgid "comment flag"
 msgstr "comment flag"
 msgstr "comment flag"
 
 
-#: models.py:191
+#: django_comments/models.py:50
 msgid "comment flags"
 msgid "comment flags"
 msgstr "comment flags"
 msgstr "comment flags"
 
 
-#: moderation.py:253
+#: django_comments/moderation.py:253
 #, python-format
 #, python-format
 msgid "[%(site)s] New comment posted on \"%(object)s\""
 msgid "[%(site)s] New comment posted on \"%(object)s\""
 msgstr ""
 msgstr ""
 
 
-#: templates/comments/approve.html:4
+#: django_comments/templates/comments/approve.html:4
 msgid "Approve a comment"
 msgid "Approve a comment"
 msgstr "Approve a comment"
 msgstr "Approve a comment"
 
 
-#: templates/comments/approve.html:7
+#: django_comments/templates/comments/approve.html:7
 msgid "Really make this comment public?"
 msgid "Really make this comment public?"
 msgstr "Really make this comment public?"
 msgstr "Really make this comment public?"
 
 
-#: templates/comments/approve.html:12
+#: django_comments/templates/comments/approve.html:13
 msgid "Approve"
 msgid "Approve"
 msgstr "Approve"
 msgstr "Approve"
 
 
-#: templates/comments/approved.html:4
+#: django_comments/templates/comments/approved.html:4
 msgid "Thanks for approving"
 msgid "Thanks for approving"
 msgstr "Thanks for approving"
 msgstr "Thanks for approving"
 
 
-#: templates/comments/approved.html:7 templates/comments/deleted.html:7
-#: templates/comments/flagged.html:7
+#: django_comments/templates/comments/approved.html:7
+#: django_comments/templates/comments/deleted.html:7
+#: django_comments/templates/comments/flagged.html:7
 msgid ""
 msgid ""
 "Thanks for taking the time to improve the quality of discussion on our site"
 "Thanks for taking the time to improve the quality of discussion on our site"
 msgstr ""
 msgstr ""
 "Thanks for taking the time to improve the quality of discussion on our site"
 "Thanks for taking the time to improve the quality of discussion on our site"
 
 
-#: templates/comments/delete.html:4
+#: django_comments/templates/comments/delete.html:4
 msgid "Remove a comment"
 msgid "Remove a comment"
 msgstr "Remove a comment"
 msgstr "Remove a comment"
 
 
-#: templates/comments/delete.html:7
+#: django_comments/templates/comments/delete.html:7
 msgid "Really remove this comment?"
 msgid "Really remove this comment?"
 msgstr "Really remove this comment?"
 msgstr "Really remove this comment?"
 
 
-#: templates/comments/delete.html:12
+#: django_comments/templates/comments/delete.html:13
 msgid "Remove"
 msgid "Remove"
 msgstr "Remove"
 msgstr "Remove"
 
 
-#: templates/comments/deleted.html:4
+#: django_comments/templates/comments/deleted.html:4
 msgid "Thanks for removing"
 msgid "Thanks for removing"
 msgstr "Thanks for removing"
 msgstr "Thanks for removing"
 
 
-#: templates/comments/flag.html:4
+#: django_comments/templates/comments/flag.html:4
 msgid "Flag this comment"
 msgid "Flag this comment"
 msgstr "Flag this comment"
 msgstr "Flag this comment"
 
 
-#: templates/comments/flag.html:7
+#: django_comments/templates/comments/flag.html:7
 msgid "Really flag this comment?"
 msgid "Really flag this comment?"
 msgstr "Really flag this comment?"
 msgstr "Really flag this comment?"
 
 
-#: templates/comments/flag.html:12
+#: django_comments/templates/comments/flag.html:13
 msgid "Flag"
 msgid "Flag"
 msgstr "Flag"
 msgstr "Flag"
 
 
-#: templates/comments/flagged.html:4
+#: django_comments/templates/comments/flagged.html:4
 msgid "Thanks for flagging"
 msgid "Thanks for flagging"
 msgstr "Thanks for flagging"
 msgstr "Thanks for flagging"
 
 
-#: templates/comments/form.html:17 templates/comments/preview.html:32
+#: django_comments/templates/comments/form.html:18
+#: django_comments/templates/comments/preview.html:34
 msgid "Post"
 msgid "Post"
 msgstr "Post"
 msgstr "Post"
 
 
-#: templates/comments/form.html:18 templates/comments/preview.html:33
+#: django_comments/templates/comments/form.html:19
+#: django_comments/templates/comments/preview.html:35
 msgid "Preview"
 msgid "Preview"
 msgstr "Preview"
 msgstr "Preview"
 
 
-#: templates/comments/posted.html:4
+#: django_comments/templates/comments/posted.html:4
 msgid "Thanks for commenting"
 msgid "Thanks for commenting"
 msgstr "Thanks for commenting"
 msgstr "Thanks for commenting"
 
 
-#: templates/comments/posted.html:7
+#: django_comments/templates/comments/posted.html:7
 msgid "Thank you for your comment"
 msgid "Thank you for your comment"
 msgstr "Thank you for your comment"
 msgstr "Thank you for your comment"
 
 
-#: templates/comments/preview.html:4 templates/comments/preview.html.py:13
+#: django_comments/templates/comments/preview.html:4
+#: django_comments/templates/comments/preview.html:14
 msgid "Preview your comment"
 msgid "Preview your comment"
 msgstr "Preview your comment"
 msgstr "Preview your comment"
 
 
-#: templates/comments/preview.html:11
+#: django_comments/templates/comments/preview.html:12
 msgid "Please correct the error below"
 msgid "Please correct the error below"
 msgid_plural "Please correct the errors below"
 msgid_plural "Please correct the errors below"
 msgstr[0] "Please correct the error below"
 msgstr[0] "Please correct the error below"
 msgstr[1] "Please correct the errors below"
 msgstr[1] "Please correct the errors below"
 
 
-#: templates/comments/preview.html:16
+#: django_comments/templates/comments/preview.html:17
 msgid "Post your comment"
 msgid "Post your comment"
 msgstr "Post your comment"
 msgstr "Post your comment"
 
 
-#: templates/comments/preview.html:16
+#: django_comments/templates/comments/preview.html:18
 msgid "or make changes"
 msgid "or make changes"
 msgstr "or make changes"
 msgstr "or make changes"