Commit 9e653bfaa5573e78a200a5bd02d3c85598a6eca1
1 parent
69197974
Fixed #103 -- Fixed translatable plural string
Showing
2 changed files
with
143 additions
and
135 deletions
| ... | ... | @@ -82,7 +82,7 @@ class CommentsAdmin(admin.ModelAdmin): |
| 82 | 82 | action(request, comment) |
| 83 | 83 | n_comments += 1 |
| 84 | 84 | |
| 85 | - msg = ungettext('1 comment was successfully %(action)s.', | |
| 85 | + msg = ungettext('%(count)s comment was successfully %(action)s.', | |
| 86 | 86 | '%(count)s comments were successfully %(action)s.', |
| 87 | 87 | n_comments) |
| 88 | 88 | self.message_user(request, msg % {'count': n_comments, 'action': done_message(n_comments)}) | ... | ... |
| ... | ... | @@ -6,7 +6,7 @@ msgid "" |
| 6 | 6 | msgstr "" |
| 7 | 7 | "Project-Id-Version: Django\n" |
| 8 | 8 | "Report-Msgid-Bugs-To: \n" |
| 9 | -"POT-Creation-Date: 2016-02-10 09:06+0100\n" | |
| 9 | +"POT-Creation-Date: 2016-09-29 16:05+0200\n" | |
| 10 | 10 | "PO-Revision-Date: 2012-02-14 13:24+0000\n" |
| 11 | 11 | "Last-Translator: Jannis Leidel <jannis@leidel.info>\n" |
| 12 | 12 | "Language-Team: English <en@li.org>\n" |
| ... | ... | @@ -16,146 +16,58 @@ msgstr "" |
| 16 | 16 | "Content-Transfer-Encoding: 8bit\n" |
| 17 | 17 | "Plural-Forms: nplurals=2; plural=(n != 1);\n" |
| 18 | 18 | |
| 19 | -#: admin.py:25 | |
| 20 | -msgid "Content" | |
| 21 | -msgstr "Content" | |
| 22 | - | |
| 23 | -#: admin.py:28 | |
| 24 | -msgid "Metadata" | |
| 25 | -msgstr "Metadata" | |
| 26 | - | |
| 27 | -#: admin.py:55 | |
| 28 | -msgid "flagged" | |
| 29 | -msgid_plural "flagged" | |
| 30 | -msgstr[0] "flagged" | |
| 31 | -msgstr[1] "flagged" | |
| 32 | - | |
| 33 | -#: admin.py:56 | |
| 34 | -msgid "Flag selected comments" | |
| 35 | -msgstr "Flag selected comments" | |
| 36 | - | |
| 37 | -#: admin.py:60 | |
| 38 | -msgid "approved" | |
| 39 | -msgid_plural "approved" | |
| 40 | -msgstr[0] "approved" | |
| 41 | -msgstr[1] "approved" | |
| 42 | - | |
| 43 | -#: admin.py:61 | |
| 44 | -msgid "Approve selected comments" | |
| 45 | -msgstr "Approve selected comments" | |
| 46 | - | |
| 47 | -#: admin.py:65 | |
| 48 | -msgid "removed" | |
| 49 | -msgid_plural "removed" | |
| 50 | -msgstr[0] "removed" | |
| 51 | -msgstr[1] "removed" | |
| 52 | - | |
| 53 | -#: admin.py:66 | |
| 54 | -msgid "Remove selected comments" | |
| 55 | -msgstr "Remove selected comments" | |
| 56 | - | |
| 57 | -#: admin.py:78 | |
| 58 | -#, python-format | |
| 59 | -msgid "1 comment was successfully %(action)s." | |
| 60 | -msgid_plural "%(count)s comments were successfully %(action)s." | |
| 61 | -msgstr[0] "1 comment was successfully %(action)s." | |
| 62 | -msgstr[1] "%(count)s comments were successfully %(action)s." | |
| 63 | - | |
| 64 | -#: feeds.py:14 | |
| 65 | -#, python-format | |
| 66 | -msgid "%(site_name)s comments" | |
| 67 | -msgstr "%(site_name)s comments" | |
| 68 | - | |
| 69 | -#: feeds.py:20 | |
| 70 | -#, python-format | |
| 71 | -msgid "Latest comments on %(site_name)s" | |
| 72 | -msgstr "Latest comments on %(site_name)s" | |
| 73 | - | |
| 74 | -#: forms.py:105 | |
| 75 | -msgctxt "Person name" | |
| 76 | -msgid "Name" | |
| 77 | -msgstr "Name" | |
| 78 | - | |
| 79 | -#: forms.py:97 | |
| 80 | -msgid "Email address" | |
| 81 | -msgstr "Email address" | |
| 82 | - | |
| 83 | -#: forms.py:98 | |
| 84 | -msgid "URL" | |
| 85 | -msgstr "URL" | |
| 86 | - | |
| 87 | -#: forms.py:99 | |
| 88 | -msgid "Comment" | |
| 89 | -msgstr "Comment" | |
| 90 | - | |
| 91 | -#: forms.py:177 | |
| 92 | -#, python-format | |
| 93 | -msgid "Watch your mouth! The word %s is not allowed here." | |
| 94 | -msgid_plural "Watch your mouth! The words %s are not allowed here." | |
| 95 | -msgstr[0] "Watch your mouth! The word %s is not allowed here." | |
| 96 | -msgstr[1] "Watch your mouth! The words %s are not allowed here." | |
| 97 | - | |
| 98 | -#: forms.py:181 templates/comments/preview.html:16 | |
| 99 | -msgid "and" | |
| 100 | -msgstr "and" | |
| 101 | - | |
| 102 | -#: forms.py:186 | |
| 103 | -msgid "" | |
| 104 | -"If you enter anything in this field your comment will be treated as spam" | |
| 105 | -msgstr "" | |
| 106 | -"If you enter anything in this field your comment will be treated as spam" | |
| 107 | - | |
| 108 | -#: models.py:23 | |
| 19 | +#: django_comments/abstracts.py:26 | |
| 109 | 20 | msgid "content type" |
| 110 | 21 | msgstr "content type" |
| 111 | 22 | |
| 112 | -#: models.py:25 | |
| 23 | +#: django_comments/abstracts.py:29 | |
| 113 | 24 | msgid "object ID" |
| 114 | 25 | msgstr "object ID" |
| 115 | 26 | |
| 116 | -#: models.py:53 models.py:177 | |
| 27 | +#: django_comments/abstracts.py:57 django_comments/models.py:32 | |
| 117 | 28 | msgid "user" |
| 118 | 29 | msgstr "user" |
| 119 | 30 | |
| 120 | -#: models.py:55 | |
| 31 | +#: django_comments/abstracts.py:60 | |
| 121 | 32 | msgid "user's name" |
| 122 | 33 | msgstr "user's name" |
| 123 | 34 | |
| 124 | -#: models.py:56 | |
| 35 | +#: django_comments/abstracts.py:62 | |
| 125 | 36 | msgid "user's email address" |
| 126 | 37 | msgstr "user's email address" |
| 127 | 38 | |
| 128 | -#: models.py:57 | |
| 39 | +#: django_comments/abstracts.py:64 | |
| 129 | 40 | msgid "user's URL" |
| 130 | 41 | msgstr "user's URL" |
| 131 | 42 | |
| 132 | -#: models.py:59 models.py:79 models.py:178 | |
| 43 | +#: django_comments/abstracts.py:66 django_comments/abstracts.py:86 | |
| 44 | +#: django_comments/models.py:36 | |
| 133 | 45 | msgid "comment" |
| 134 | 46 | msgstr "comment" |
| 135 | 47 | |
| 136 | -#: models.py:62 | |
| 48 | +#: django_comments/abstracts.py:69 | |
| 137 | 49 | msgid "date/time submitted" |
| 138 | 50 | msgstr "date/time submitted" |
| 139 | 51 | |
| 140 | -#: models.py:63 | |
| 52 | +#: django_comments/abstracts.py:70 | |
| 141 | 53 | msgid "IP address" |
| 142 | 54 | msgstr "IP address" |
| 143 | 55 | |
| 144 | -#: models.py:64 | |
| 56 | +#: django_comments/abstracts.py:71 | |
| 145 | 57 | msgid "is public" |
| 146 | 58 | msgstr "is public" |
| 147 | 59 | |
| 148 | -#: models.py:65 | |
| 60 | +#: django_comments/abstracts.py:72 | |
| 149 | 61 | msgid "" |
| 150 | 62 | "Uncheck this box to make the comment effectively disappear from the site." |
| 151 | 63 | msgstr "" |
| 152 | 64 | "Uncheck this box to make the comment effectively disappear from the site." |
| 153 | 65 | |
| 154 | -#: models.py:67 | |
| 66 | +#: django_comments/abstracts.py:74 | |
| 155 | 67 | msgid "is removed" |
| 156 | 68 | msgstr "is removed" |
| 157 | 69 | |
| 158 | -#: models.py:68 | |
| 70 | +#: django_comments/abstracts.py:75 | |
| 159 | 71 | msgid "" |
| 160 | 72 | "Check this box if the comment is inappropriate. A \"This comment has been " |
| 161 | 73 | "removed\" message will be displayed instead." |
| ... | ... | @@ -163,11 +75,11 @@ msgstr "" |
| 163 | 75 | "Check this box if the comment is inappropriate. A \"This comment has been " |
| 164 | 76 | "removed\" message will be displayed instead." |
| 165 | 77 | |
| 166 | -#: models.py:80 | |
| 78 | +#: django_comments/abstracts.py:87 | |
| 167 | 79 | msgid "comments" |
| 168 | 80 | msgstr "comments" |
| 169 | 81 | |
| 170 | -#: models.py:124 | |
| 82 | +#: django_comments/abstracts.py:132 | |
| 171 | 83 | msgid "" |
| 172 | 84 | "This comment was posted by an authenticated user and thus the name is read-" |
| 173 | 85 | "only." |
| ... | ... | @@ -175,7 +87,7 @@ msgstr "" |
| 175 | 87 | "This comment was posted by an authenticated user and thus the name is read-" |
| 176 | 88 | "only." |
| 177 | 89 | |
| 178 | -#: models.py:134 | |
| 90 | +#: django_comments/abstracts.py:143 | |
| 179 | 91 | msgid "" |
| 180 | 92 | "This comment was posted by an authenticated user and thus the email is read-" |
| 181 | 93 | "only." |
| ... | ... | @@ -183,7 +95,7 @@ msgstr "" |
| 183 | 95 | "This comment was posted by an authenticated user and thus the email is read-" |
| 184 | 96 | "only." |
| 185 | 97 | |
| 186 | -#: models.py:160 | |
| 98 | +#: django_comments/abstracts.py:171 | |
| 187 | 99 | #, python-format |
| 188 | 100 | msgid "" |
| 189 | 101 | "Posted by %(user)s at %(date)s\n" |
| ... | ... | @@ -198,112 +110,208 @@ msgstr "" |
| 198 | 110 | "\n" |
| 199 | 111 | "http://%(domain)s%(url)s" |
| 200 | 112 | |
| 201 | -#: models.py:179 | |
| 113 | +#: django_comments/admin.py:28 | |
| 114 | +msgid "Content" | |
| 115 | +msgstr "Content" | |
| 116 | + | |
| 117 | +#: django_comments/admin.py:32 | |
| 118 | +msgid "Metadata" | |
| 119 | +msgstr "Metadata" | |
| 120 | + | |
| 121 | +#: django_comments/admin.py:59 | |
| 122 | +msgid "flagged" | |
| 123 | +msgid_plural "flagged" | |
| 124 | +msgstr[0] "flagged" | |
| 125 | +msgstr[1] "flagged" | |
| 126 | + | |
| 127 | +#: django_comments/admin.py:61 | |
| 128 | +msgid "Flag selected comments" | |
| 129 | +msgstr "Flag selected comments" | |
| 130 | + | |
| 131 | +#: django_comments/admin.py:65 | |
| 132 | +msgid "approved" | |
| 133 | +msgid_plural "approved" | |
| 134 | +msgstr[0] "approved" | |
| 135 | +msgstr[1] "approved" | |
| 136 | + | |
| 137 | +#: django_comments/admin.py:67 | |
| 138 | +msgid "Approve selected comments" | |
| 139 | +msgstr "Approve selected comments" | |
| 140 | + | |
| 141 | +#: django_comments/admin.py:71 | |
| 142 | +msgid "removed" | |
| 143 | +msgid_plural "removed" | |
| 144 | +msgstr[0] "removed" | |
| 145 | +msgstr[1] "removed" | |
| 146 | + | |
| 147 | +#: django_comments/admin.py:73 | |
| 148 | +msgid "Remove selected comments" | |
| 149 | +msgstr "Remove selected comments" | |
| 150 | + | |
| 151 | +#: django_comments/admin.py:85 | |
| 152 | +#, fuzzy, python-format | |
| 153 | +#| msgid "1 comment was successfully %(action)s." | |
| 154 | +#| msgid_plural "%(count)s comments were successfully %(action)s." | |
| 155 | +msgid "%(count)s comment was successfully %(action)s." | |
| 156 | +msgid_plural "%(count)s comments were successfully %(action)s." | |
| 157 | +msgstr[0] "1 comment was successfully %(action)s." | |
| 158 | +msgstr[1] "%(count)s comments were successfully %(action)s." | |
| 159 | + | |
| 160 | +#: django_comments/feeds.py:16 | |
| 161 | +#, python-format | |
| 162 | +msgid "%(site_name)s comments" | |
| 163 | +msgstr "%(site_name)s comments" | |
| 164 | + | |
| 165 | +#: django_comments/feeds.py:22 | |
| 166 | +#, python-format | |
| 167 | +msgid "Latest comments on %(site_name)s" | |
| 168 | +msgstr "Latest comments on %(site_name)s" | |
| 169 | + | |
| 170 | +#: django_comments/forms.py:101 | |
| 171 | +msgctxt "Person name" | |
| 172 | +msgid "Name" | |
| 173 | +msgstr "Name" | |
| 174 | + | |
| 175 | +#: django_comments/forms.py:102 | |
| 176 | +msgid "Email address" | |
| 177 | +msgstr "Email address" | |
| 178 | + | |
| 179 | +#: django_comments/forms.py:103 | |
| 180 | +msgid "URL" | |
| 181 | +msgstr "URL" | |
| 182 | + | |
| 183 | +#: django_comments/forms.py:104 | |
| 184 | +msgid "Comment" | |
| 185 | +msgstr "Comment" | |
| 186 | + | |
| 187 | +#: django_comments/forms.py:183 | |
| 188 | +#, python-format | |
| 189 | +msgid "Watch your mouth! The word %s is not allowed here." | |
| 190 | +msgid_plural "Watch your mouth! The words %s are not allowed here." | |
| 191 | +msgstr[0] "Watch your mouth! The word %s is not allowed here." | |
| 192 | +msgstr[1] "Watch your mouth! The words %s are not allowed here." | |
| 193 | + | |
| 194 | +#: django_comments/forms.py:187 | |
| 195 | +#: django_comments/templates/comments/preview.html:17 | |
| 196 | +msgid "and" | |
| 197 | +msgstr "and" | |
| 198 | + | |
| 199 | +#: django_comments/forms.py:193 | |
| 200 | +msgid "" | |
| 201 | +"If you enter anything in this field your comment will be treated as spam" | |
| 202 | +msgstr "" | |
| 203 | +"If you enter anything in this field your comment will be treated as spam" | |
| 204 | + | |
| 205 | +#: django_comments/models.py:38 | |
| 202 | 206 | msgid "flag" |
| 203 | 207 | msgstr "flag" |
| 204 | 208 | |
| 205 | -#: models.py:180 | |
| 209 | +#: django_comments/models.py:39 | |
| 206 | 210 | msgid "date" |
| 207 | 211 | msgstr "date" |
| 208 | 212 | |
| 209 | -#: models.py:190 | |
| 213 | +#: django_comments/models.py:49 | |
| 210 | 214 | msgid "comment flag" |
| 211 | 215 | msgstr "comment flag" |
| 212 | 216 | |
| 213 | -#: models.py:191 | |
| 217 | +#: django_comments/models.py:50 | |
| 214 | 218 | msgid "comment flags" |
| 215 | 219 | msgstr "comment flags" |
| 216 | 220 | |
| 217 | -#: moderation.py:253 | |
| 221 | +#: django_comments/moderation.py:253 | |
| 218 | 222 | #, python-format |
| 219 | 223 | msgid "[%(site)s] New comment posted on \"%(object)s\"" |
| 220 | 224 | msgstr "" |
| 221 | 225 | |
| 222 | -#: templates/comments/approve.html:4 | |
| 226 | +#: django_comments/templates/comments/approve.html:4 | |
| 223 | 227 | msgid "Approve a comment" |
| 224 | 228 | msgstr "Approve a comment" |
| 225 | 229 | |
| 226 | -#: templates/comments/approve.html:7 | |
| 230 | +#: django_comments/templates/comments/approve.html:7 | |
| 227 | 231 | msgid "Really make this comment public?" |
| 228 | 232 | msgstr "Really make this comment public?" |
| 229 | 233 | |
| 230 | -#: templates/comments/approve.html:12 | |
| 234 | +#: django_comments/templates/comments/approve.html:13 | |
| 231 | 235 | msgid "Approve" |
| 232 | 236 | msgstr "Approve" |
| 233 | 237 | |
| 234 | -#: templates/comments/approved.html:4 | |
| 238 | +#: django_comments/templates/comments/approved.html:4 | |
| 235 | 239 | msgid "Thanks for approving" |
| 236 | 240 | msgstr "Thanks for approving" |
| 237 | 241 | |
| 238 | -#: templates/comments/approved.html:7 templates/comments/deleted.html:7 | |
| 239 | -#: templates/comments/flagged.html:7 | |
| 242 | +#: django_comments/templates/comments/approved.html:7 | |
| 243 | +#: django_comments/templates/comments/deleted.html:7 | |
| 244 | +#: django_comments/templates/comments/flagged.html:7 | |
| 240 | 245 | msgid "" |
| 241 | 246 | "Thanks for taking the time to improve the quality of discussion on our site" |
| 242 | 247 | msgstr "" |
| 243 | 248 | "Thanks for taking the time to improve the quality of discussion on our site" |
| 244 | 249 | |
| 245 | -#: templates/comments/delete.html:4 | |
| 250 | +#: django_comments/templates/comments/delete.html:4 | |
| 246 | 251 | msgid "Remove a comment" |
| 247 | 252 | msgstr "Remove a comment" |
| 248 | 253 | |
| 249 | -#: templates/comments/delete.html:7 | |
| 254 | +#: django_comments/templates/comments/delete.html:7 | |
| 250 | 255 | msgid "Really remove this comment?" |
| 251 | 256 | msgstr "Really remove this comment?" |
| 252 | 257 | |
| 253 | -#: templates/comments/delete.html:12 | |
| 258 | +#: django_comments/templates/comments/delete.html:13 | |
| 254 | 259 | msgid "Remove" |
| 255 | 260 | msgstr "Remove" |
| 256 | 261 | |
| 257 | -#: templates/comments/deleted.html:4 | |
| 262 | +#: django_comments/templates/comments/deleted.html:4 | |
| 258 | 263 | msgid "Thanks for removing" |
| 259 | 264 | msgstr "Thanks for removing" |
| 260 | 265 | |
| 261 | -#: templates/comments/flag.html:4 | |
| 266 | +#: django_comments/templates/comments/flag.html:4 | |
| 262 | 267 | msgid "Flag this comment" |
| 263 | 268 | msgstr "Flag this comment" |
| 264 | 269 | |
| 265 | -#: templates/comments/flag.html:7 | |
| 270 | +#: django_comments/templates/comments/flag.html:7 | |
| 266 | 271 | msgid "Really flag this comment?" |
| 267 | 272 | msgstr "Really flag this comment?" |
| 268 | 273 | |
| 269 | -#: templates/comments/flag.html:12 | |
| 274 | +#: django_comments/templates/comments/flag.html:13 | |
| 270 | 275 | msgid "Flag" |
| 271 | 276 | msgstr "Flag" |
| 272 | 277 | |
| 273 | -#: templates/comments/flagged.html:4 | |
| 278 | +#: django_comments/templates/comments/flagged.html:4 | |
| 274 | 279 | msgid "Thanks for flagging" |
| 275 | 280 | msgstr "Thanks for flagging" |
| 276 | 281 | |
| 277 | -#: templates/comments/form.html:17 templates/comments/preview.html:32 | |
| 282 | +#: django_comments/templates/comments/form.html:18 | |
| 283 | +#: django_comments/templates/comments/preview.html:34 | |
| 278 | 284 | msgid "Post" |
| 279 | 285 | msgstr "Post" |
| 280 | 286 | |
| 281 | -#: templates/comments/form.html:18 templates/comments/preview.html:33 | |
| 287 | +#: django_comments/templates/comments/form.html:19 | |
| 288 | +#: django_comments/templates/comments/preview.html:35 | |
| 282 | 289 | msgid "Preview" |
| 283 | 290 | msgstr "Preview" |
| 284 | 291 | |
| 285 | -#: templates/comments/posted.html:4 | |
| 292 | +#: django_comments/templates/comments/posted.html:4 | |
| 286 | 293 | msgid "Thanks for commenting" |
| 287 | 294 | msgstr "Thanks for commenting" |
| 288 | 295 | |
| 289 | -#: templates/comments/posted.html:7 | |
| 296 | +#: django_comments/templates/comments/posted.html:7 | |
| 290 | 297 | msgid "Thank you for your comment" |
| 291 | 298 | msgstr "Thank you for your comment" |
| 292 | 299 | |
| 293 | -#: templates/comments/preview.html:4 templates/comments/preview.html.py:13 | |
| 300 | +#: django_comments/templates/comments/preview.html:4 | |
| 301 | +#: django_comments/templates/comments/preview.html:14 | |
| 294 | 302 | msgid "Preview your comment" |
| 295 | 303 | msgstr "Preview your comment" |
| 296 | 304 | |
| 297 | -#: templates/comments/preview.html:11 | |
| 305 | +#: django_comments/templates/comments/preview.html:12 | |
| 298 | 306 | msgid "Please correct the error below" |
| 299 | 307 | msgid_plural "Please correct the errors below" |
| 300 | 308 | msgstr[0] "Please correct the error below" |
| 301 | 309 | msgstr[1] "Please correct the errors below" |
| 302 | 310 | |
| 303 | -#: templates/comments/preview.html:16 | |
| 311 | +#: django_comments/templates/comments/preview.html:17 | |
| 304 | 312 | msgid "Post your comment" |
| 305 | 313 | msgstr "Post your comment" |
| 306 | 314 | |
| 307 | -#: templates/comments/preview.html:16 | |
| 315 | +#: django_comments/templates/comments/preview.html:18 | |
| 308 | 316 | msgid "or make changes" |
| 309 | 317 | msgstr "or make changes" | ... | ... |
Please
register
or
login
to post a comment