summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEvgeny Fadeev <evgeny.fadeev@gmail.com>2010-11-29 15:22:16 -0500
committerEvgeny Fadeev <evgeny.fadeev@gmail.com>2010-11-29 15:22:16 -0500
commitda8de309efca5cdb05b9128c28d86ee1ee7ff806 (patch)
treefa51b08e9ddc90f19c20fe8f9851e72883c38b61
parent4a0ffab2f31062881bd768618a23908e225e067f (diff)
downloadaskbot-da8de309efca5cdb05b9128c28d86ee1ee7ff806.tar.gz
askbot-da8de309efca5cdb05b9128c28d86ee1ee7ff806.tar.bz2
askbot-da8de309efca5cdb05b9128c28d86ee1ee7ff806.zip
fixed the answer sort issue that Niles found
-rw-r--r--askbot/locale/de/LC_MESSAGES/django.mobin81277 -> 61271 bytes
-rw-r--r--askbot/locale/en/LC_MESSAGES/django.mobin22572 -> 22438 bytes
-rw-r--r--askbot/locale/en/LC_MESSAGES/django.po488
-rw-r--r--askbot/locale/es/LC_MESSAGES/django.mobin43703 -> 33833 bytes
-rw-r--r--askbot/locale/fi/LC_MESSAGES/django.mobin74404 -> 61333 bytes
-rw-r--r--askbot/locale/fr/LC_MESSAGES/django.mobin114574 -> 98575 bytes
-rw-r--r--askbot/locale/it/LC_MESSAGES/django.mobin111712 -> 98462 bytes
-rw-r--r--askbot/locale/ja/LC_MESSAGES/django.mobin34443 -> 34269 bytes
-rw-r--r--askbot/locale/ru/LC_MESSAGES/django.mobin94209 -> 67420 bytes
-rw-r--r--askbot/locale/sr/LC_MESSAGES/django.mobin56038 -> 42642 bytes
-rw-r--r--askbot/locale/tr/LC_MESSAGES/django.mobin81287 -> 66973 bytes
-rw-r--r--askbot/locale/vi/LC_MESSAGES/django.mobin25606 -> 18986 bytes
-rw-r--r--askbot/locale/zh-cn/LC_MESSAGES/django.mobin24661 -> 19205 bytes
-rw-r--r--askbot/locale/zh-tw/LC_MESSAGES/django.mobin48551 -> 41220 bytes
-rw-r--r--askbot/skins/default/templates/question.html6
-rw-r--r--askbot/views/readers.py19
16 files changed, 268 insertions, 245 deletions
diff --git a/askbot/locale/de/LC_MESSAGES/django.mo b/askbot/locale/de/LC_MESSAGES/django.mo
index 89fda585..35eb5ed9 100644
--- a/askbot/locale/de/LC_MESSAGES/django.mo
+++ b/askbot/locale/de/LC_MESSAGES/django.mo
Binary files differ
diff --git a/askbot/locale/en/LC_MESSAGES/django.mo b/askbot/locale/en/LC_MESSAGES/django.mo
index a660e8c9..2472fb81 100644
--- a/askbot/locale/en/LC_MESSAGES/django.mo
+++ b/askbot/locale/en/LC_MESSAGES/django.mo
Binary files differ
diff --git a/askbot/locale/en/LC_MESSAGES/django.po b/askbot/locale/en/LC_MESSAGES/django.po
index 1e8f88ee..230f6fd4 100644
--- a/askbot/locale/en/LC_MESSAGES/django.po
+++ b/askbot/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-18 17:31-0600\n"
+"POT-Creation-Date: 2010-11-29 14:13-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Evgeny Fadeev <evgeny.fadeev@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,6 +16,10 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+#: exceptions.py:9
+msgid "Sorry, but anonymous visitors cannot access this function"
+msgstr ""
+
#: feed.py:22
msgid " - "
msgstr ""
@@ -104,23 +108,23 @@ msgstr ""
msgid "Enter number of points to add or subtract"
msgstr ""
-#: forms.py:175 const/__init__.py:218
+#: forms.py:175 const/__init__.py:219
msgid "approved"
msgstr ""
-#: forms.py:176 const/__init__.py:219
+#: forms.py:176 const/__init__.py:220
msgid "watched"
msgstr ""
-#: forms.py:177 const/__init__.py:220
+#: forms.py:177 const/__init__.py:221
msgid "suspended"
msgstr ""
-#: forms.py:178 const/__init__.py:221
+#: forms.py:178 const/__init__.py:222
msgid "blocked"
msgstr ""
-#: forms.py:180 const/__init__.py:217
+#: forms.py:180 const/__init__.py:218
msgid "moderator"
msgstr ""
@@ -257,48 +261,44 @@ msgstr ""
msgid "logout/"
msgstr ""
-#: urls.py:47 urls.py:52 urls.py:57 urls.py:127
+#: urls.py:47 urls.py:52
msgid "answers/"
msgstr ""
-#: urls.py:47 urls.py:109 urls.py:120 urls.py:127
-msgid "comments/"
-msgstr ""
-
-#: urls.py:52 urls.py:73 urls.py:168
+#: urls.py:47 urls.py:68 urls.py:164
msgid "edit/"
msgstr ""
-#: urls.py:57 urls.py:103
+#: urls.py:52 urls.py:98
msgid "revisions/"
msgstr ""
-#: urls.py:63 urls.py:68 urls.py:73 urls.py:78 urls.py:83 urls.py:88
-#: urls.py:93 urls.py:98 urls.py:103 urls.py:109 urls.py:120
+#: urls.py:58 urls.py:63 urls.py:68 urls.py:73 urls.py:78 urls.py:83
+#: urls.py:88 urls.py:93 urls.py:98
msgid "questions/"
msgstr ""
-#: urls.py:68
+#: urls.py:63
msgid "ask/"
msgstr ""
-#: urls.py:78
+#: urls.py:73
msgid "retag/"
msgstr ""
-#: urls.py:83
+#: urls.py:78
msgid "close/"
msgstr ""
-#: urls.py:88
+#: urls.py:83
msgid "reopen/"
msgstr ""
-#: urls.py:93
+#: urls.py:88
msgid "answer/"
msgstr ""
-#: urls.py:98
+#: urls.py:93
msgid "vote/"
msgstr ""
@@ -306,64 +306,60 @@ msgstr ""
msgid "command/"
msgstr ""
-#: urls.py:120 urls.py:127
-msgid "delete/"
-msgstr ""
-
-#: urls.py:134
+#: urls.py:130
msgid "question/"
msgstr ""
-#: urls.py:139
+#: urls.py:135
msgid "tags/"
msgstr ""
-#: urls.py:144 urls.py:150
+#: urls.py:140 urls.py:146
msgid "mark-tag/"
msgstr ""
-#: urls.py:144
+#: urls.py:140
msgid "interesting/"
msgstr ""
-#: urls.py:150
+#: urls.py:146
msgid "ignored/"
msgstr ""
-#: urls.py:156
+#: urls.py:152
msgid "unmark-tag/"
msgstr ""
-#: urls.py:162 urls.py:168 urls.py:173
+#: urls.py:158 urls.py:164 urls.py:169
msgid "users/"
msgstr ""
-#: urls.py:178 urls.py:183
+#: urls.py:174 urls.py:179
msgid "badges/"
msgstr ""
-#: urls.py:188
+#: urls.py:184
msgid "messages/"
msgstr ""
-#: urls.py:188
+#: urls.py:184
msgid "markread/"
msgstr ""
-#: urls.py:203
+#: urls.py:199
msgid "upload/"
msgstr ""
-#: urls.py:204
+#: urls.py:200
msgid "search/"
msgstr ""
-#: urls.py:205
+#: urls.py:201
msgid "feedback/"
msgstr ""
-#: urls.py:206 setup_templates/settings.py:182
-#: skins/default/templates/authopenid/signin.html:269
+#: urls.py:202 setup_templates/settings.py:182
+#: skins/default/templates/authopenid/signin.html:249
msgid "account/"
msgstr ""
@@ -1097,135 +1093,135 @@ msgstr ""
msgid "Question has no accepted answers"
msgstr ""
-#: const/__init__.py:110
+#: const/__init__.py:111
msgid "asked a question"
msgstr ""
-#: const/__init__.py:111
+#: const/__init__.py:112
msgid "answered a question"
msgstr ""
-#: const/__init__.py:112
+#: const/__init__.py:113
msgid "commented question"
msgstr ""
-#: const/__init__.py:113
+#: const/__init__.py:114
msgid "commented answer"
msgstr ""
-#: const/__init__.py:114
+#: const/__init__.py:115
msgid "edited question"
msgstr ""
-#: const/__init__.py:115
+#: const/__init__.py:116
msgid "edited answer"
msgstr ""
-#: const/__init__.py:116
+#: const/__init__.py:117
msgid "received award"
msgstr "received badge"
-#: const/__init__.py:117
+#: const/__init__.py:118
msgid "marked best answer"
msgstr ""
-#: const/__init__.py:118
+#: const/__init__.py:119
msgid "upvoted"
msgstr ""
-#: const/__init__.py:119
+#: const/__init__.py:120
msgid "downvoted"
msgstr ""
-#: const/__init__.py:120
+#: const/__init__.py:121
msgid "canceled vote"
msgstr ""
-#: const/__init__.py:121
+#: const/__init__.py:122
msgid "deleted question"
msgstr ""
-#: const/__init__.py:122
+#: const/__init__.py:123
msgid "deleted answer"
msgstr ""
-#: const/__init__.py:123
+#: const/__init__.py:124
msgid "marked offensive"
msgstr ""
-#: const/__init__.py:124
+#: const/__init__.py:125
msgid "updated tags"
msgstr ""
-#: const/__init__.py:125
+#: const/__init__.py:126
msgid "selected favorite"
msgstr ""
-#: const/__init__.py:126
+#: const/__init__.py:127
msgid "completed user profile"
msgstr ""
-#: const/__init__.py:127
+#: const/__init__.py:128
msgid "email update sent to user"
msgstr ""
-#: const/__init__.py:128
+#: const/__init__.py:129
msgid "mentioned in the post"
msgstr ""
-#: const/__init__.py:179
+#: const/__init__.py:180
msgid "question_answered"
msgstr "answered question"
-#: const/__init__.py:180
+#: const/__init__.py:181
msgid "question_commented"
msgstr "commented question"
-#: const/__init__.py:181
+#: const/__init__.py:182
msgid "answer_commented"
msgstr ""
-#: const/__init__.py:182
+#: const/__init__.py:183
msgid "answer_accepted"
msgstr ""
-#: const/__init__.py:186
+#: const/__init__.py:187
msgid "[closed]"
msgstr ""
-#: const/__init__.py:187
+#: const/__init__.py:188
msgid "[deleted]"
msgstr ""
-#: const/__init__.py:188 views/readers.py:546
+#: const/__init__.py:189 views/readers.py:549
msgid "initial version"
msgstr ""
-#: const/__init__.py:189
+#: const/__init__.py:190
msgid "retagged"
msgstr ""
-#: const/__init__.py:194
+#: const/__init__.py:195
msgid "exclude ignored tags"
msgstr ""
-#: const/__init__.py:195
+#: const/__init__.py:196
msgid "allow only selected tags"
msgstr ""
-#: const/__init__.py:199
+#: const/__init__.py:200
msgid "instantly"
msgstr ""
-#: const/__init__.py:200
+#: const/__init__.py:201
msgid "daily"
msgstr ""
-#: const/__init__.py:201
+#: const/__init__.py:202
msgid "weekly"
msgstr ""
-#: const/__init__.py:202
+#: const/__init__.py:203
msgid "no email"
msgstr ""
@@ -1324,89 +1320,94 @@ msgstr ""
msgid "recover/"
msgstr ""
-#: deps/django_authopenid/util.py:200
+#: deps/django_authopenid/util.py:196
+#, python-format
+msgid "%(site)s user name and password"
+msgstr ""
+
+#: deps/django_authopenid/util.py:202
#: skins/default/templates/authopenid/signin.html:124
msgid "Create a password-protected account"
msgstr ""
-#: deps/django_authopenid/util.py:201
+#: deps/django_authopenid/util.py:203
msgid "Change your password"
msgstr ""
-#: deps/django_authopenid/util.py:263
+#: deps/django_authopenid/util.py:265
msgid "Sign in with Yahoo"
msgstr ""
-#: deps/django_authopenid/util.py:270
+#: deps/django_authopenid/util.py:272
msgid "AOL screen name"
msgstr ""
-#: deps/django_authopenid/util.py:278
+#: deps/django_authopenid/util.py:280
msgid "OpenID url"
msgstr ""
-#: deps/django_authopenid/util.py:295
+#: deps/django_authopenid/util.py:297
msgid "MyOpenid user name"
msgstr ""
-#: deps/django_authopenid/util.py:303 deps/django_authopenid/util.py:311
+#: deps/django_authopenid/util.py:305 deps/django_authopenid/util.py:313
msgid "Flickr user name"
msgstr ""
-#: deps/django_authopenid/util.py:319
+#: deps/django_authopenid/util.py:321
msgid "Technorati user name"
msgstr ""
-#: deps/django_authopenid/util.py:327
+#: deps/django_authopenid/util.py:329
msgid "WordPress blog name"
msgstr ""
-#: deps/django_authopenid/util.py:335
+#: deps/django_authopenid/util.py:337
msgid "Blogger blog name"
msgstr ""
-#: deps/django_authopenid/util.py:343
+#: deps/django_authopenid/util.py:345
msgid "LiveJournal blog name"
msgstr ""
-#: deps/django_authopenid/util.py:351
+#: deps/django_authopenid/util.py:353
msgid "ClaimID user name"
msgstr ""
-#: deps/django_authopenid/util.py:359
+#: deps/django_authopenid/util.py:361
msgid "Vidoop user name"
msgstr ""
-#: deps/django_authopenid/util.py:367
+#: deps/django_authopenid/util.py:369
msgid "Verisign user name"
msgstr ""
-#: deps/django_authopenid/util.py:391
+#: deps/django_authopenid/util.py:393
#, python-format
msgid "Change your %(provider)s password"
msgstr ""
-#: deps/django_authopenid/util.py:395
+#: deps/django_authopenid/util.py:397
#, python-format
msgid "Click to see if your %(provider)s signin still works for %(site_name)s"
msgstr ""
-#: deps/django_authopenid/util.py:404
+#: deps/django_authopenid/util.py:406
#, python-format
msgid "Create password for %(provider)s"
msgstr ""
-#: deps/django_authopenid/util.py:408
+#: deps/django_authopenid/util.py:410
#, python-format
msgid "Connect your %(provider)s account to %(site_name)s"
msgstr ""
-#: deps/django_authopenid/util.py:417
+#: deps/django_authopenid/util.py:419
#, python-format
msgid "Signin with %(provider)s user name and password"
msgstr ""
-#: deps/django_authopenid/util.py:424
+#: deps/django_authopenid/util.py:426
#, python-format
msgid "Sign in with your %(provider)s account"
msgstr ""
@@ -1614,23 +1615,23 @@ msgstr ""
msgid "Congratulations, you are now an Administrator"
msgstr ""
-#: management/commands/send_email_alerts.py:104
+#: management/commands/send_email_alerts.py:105
#, python-format
msgid "\" and \"%s\""
msgstr ""
-#: management/commands/send_email_alerts.py:107
+#: management/commands/send_email_alerts.py:108
msgid "\" and more"
msgstr ""
-#: management/commands/send_email_alerts.py:112
+#: management/commands/send_email_alerts.py:113
#, python-format
msgid "%(question_count)d updated question about %(topics)s"
msgid_plural "%(question_count)d updated questions about %(topics)s"
msgstr[0] ""
msgstr[1] ""
-#: management/commands/send_email_alerts.py:466
+#: management/commands/send_email_alerts.py:467
#, python-format
msgid "%(name)s, this is an update message header for %(num)d question"
msgid_plural "%(name)s, this is an update message header for %(num)d questions"
@@ -1641,38 +1642,38 @@ msgstr[1] ""
"<p>Dear %(name)s,</p><p>The following %(num)d questions have been updated on "
"the Q&A forum:</p>"
-#: management/commands/send_email_alerts.py:483
+#: management/commands/send_email_alerts.py:484
msgid "new question"
msgstr ""
-#: management/commands/send_email_alerts.py:500
+#: management/commands/send_email_alerts.py:501
msgid ""
"Please visit the askbot and see what's new! Could you spread the word about "
"it - can somebody you know help answering those questions or benefit from "
"posting one?"
msgstr ""
-#: management/commands/send_email_alerts.py:512
+#: management/commands/send_email_alerts.py:513
msgid ""
"Your most frequent subscription setting is 'daily' on selected questions. If "
"you are receiving more than one email per dayplease tell about this issue to "
"the askbot administrator."
msgstr ""
-#: management/commands/send_email_alerts.py:518
+#: management/commands/send_email_alerts.py:519
msgid ""
"Your most frequent subscription setting is 'weekly' if you are receiving "
"this email more than once a week please report this issue to the askbot "
"administrator."
msgstr ""
-#: management/commands/send_email_alerts.py:524
+#: management/commands/send_email_alerts.py:525
msgid ""
"There is a chance that you may be receiving links seen before - due to a "
"technicality that will eventually go away. "
msgstr ""
-#: management/commands/send_email_alerts.py:529
+#: management/commands/send_email_alerts.py:530
#, python-format
msgid ""
"go to %(email_settings_link)s to change frequency of email updates or %"
@@ -2116,126 +2117,136 @@ msgstr ""
msgid "Created a tag used by 50 questions"
msgstr ""
-#: models/__init__.py:168
+#: models/__init__.py:169
msgid ""
"Sorry, you cannot accept or unaccept best answers because your account is "
"blocked"
msgstr ""
-#: models/__init__.py:173
+#: models/__init__.py:174
msgid ""
"Sorry, you cannot accept or unaccept best answers because your account is "
"suspended"
msgstr ""
-#: models/__init__.py:179
+#: models/__init__.py:180
msgid ""
"Sorry, you cannot accept or unaccept your own answer to your own question"
msgstr ""
-#: models/__init__.py:186
+#: models/__init__.py:187
#, python-format
msgid ""
"Sorry, only original author of the question - %(username)s - can accept the "
"best answer"
msgstr ""
-#: models/__init__.py:209
+#: models/__init__.py:210
msgid "cannot vote for own posts"
msgstr "Sorry, you cannot vote for your own posts"
-#: models/__init__.py:212
+#: models/__init__.py:213
msgid "Sorry your account appears to be blocked "
msgstr ""
-#: models/__init__.py:217
+#: models/__init__.py:218
msgid "Sorry your account appears to be suspended "
msgstr ""
-#: models/__init__.py:227
+#: models/__init__.py:228
#, python-format
msgid ">%(points)s points required to upvote"
msgstr ">%(points)s points required to upvote "
-#: models/__init__.py:233
+#: models/__init__.py:234
#, python-format
msgid ">%(points)s points required to downvote"
msgstr ">%(points)s points required to downvote "
-#: models/__init__.py:248
+#: models/__init__.py:249
msgid "Sorry, blocked users cannot upload files"
msgstr ""
-#: models/__init__.py:249
+#: models/__init__.py:250
msgid "Sorry, suspended users cannot upload files"
msgstr ""
-#: models/__init__.py:251
+#: models/__init__.py:252
#, python-format
msgid ""
"uploading images is limited to users with >%(min_rep)s reputation points"
msgstr "sorry, file uploading requires karma >%(min_rep)s"
-#: models/__init__.py:270 models/__init__.py:303 models/__init__.py:1910
+#: models/__init__.py:271 models/__init__.py:331 models/__init__.py:1950
msgid "blocked users cannot post"
msgstr ""
"Sorry, your account appears to be blocked and you cannot make new posts "
"until this issue is resolved. Please contact the forum administrator to "
"reach a resolution."
-#: models/__init__.py:271 models/__init__.py:1913
+#: models/__init__.py:272 models/__init__.py:1953
msgid "suspended users cannot post"
msgstr ""
"Sorry, your account appears to be suspended and you cannot make new posts "
"until this issue is resolved. You can, however edit your existing posts. "
"Please contact the forum administrator to reach a resolution."
-#: models/__init__.py:289
+#: models/__init__.py:297
+msgid ""
+"Sorry, comments (except the last one) are editable only within 10 minutes "
+"from posting"
+msgstr ""
+
+#: models/__init__.py:303
+msgid "Sorry, but only post owners or moderators can edit comments"
+msgstr ""
+
+#: models/__init__.py:317
msgid ""
"Sorry, since your account is suspended you can comment only your own posts"
msgstr ""
-#: models/__init__.py:293
+#: models/__init__.py:321
#, python-format
msgid ""
"Sorry, to comment any post a minimum reputation of %(min_rep)s points is "
"required. You can still comment your own posts and answers to your questions"
msgstr ""
-#: models/__init__.py:321
+#: models/__init__.py:349
msgid ""
"This post has been deleted and can be seen only by post ownwers, site "
"administrators and moderators"
msgstr ""
-#: models/__init__.py:338
+#: models/__init__.py:366
msgid ""
"Sorry, only moderators, site administrators and post owners can edit deleted "
"posts"
msgstr ""
-#: models/__init__.py:353
+#: models/__init__.py:381
msgid "Sorry, since your account is blocked you cannot edit posts"
msgstr ""
-#: models/__init__.py:357
+#: models/__init__.py:385
msgid "Sorry, since your account is suspended you can edit only your own posts"
msgstr ""
-#: models/__init__.py:362
+#: models/__init__.py:390
#, python-format
msgid ""
"Sorry, to edit wiki posts, a minimum reputation of %(min_rep)s is required"
msgstr ""
-#: models/__init__.py:369
+#: models/__init__.py:397
#, python-format
msgid ""
"Sorry, to edit other people's posts, a minimum reputation of %(min_rep)s is "
"required"
msgstr ""
-#: models/__init__.py:432
+#: models/__init__.py:460
msgid ""
"Sorry, cannot delete your question since it has an upvoted answer posted by "
"someone else"
@@ -2245,228 +2256,228 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: models/__init__.py:447
+#: models/__init__.py:475
msgid "Sorry, since your account is blocked you cannot delete posts"
msgstr ""
-#: models/__init__.py:451
+#: models/__init__.py:479
msgid ""
"Sorry, since your account is suspended you can delete only your own posts"
msgstr ""
-#: models/__init__.py:455
+#: models/__init__.py:483
#, python-format
msgid ""
"Sorry, to deleted other people' posts, a minimum reputation of %(min_rep)s "
"is required"
msgstr ""
-#: models/__init__.py:475
+#: models/__init__.py:503
msgid "Sorry, since your account is blocked you cannot close questions"
msgstr ""
-#: models/__init__.py:479
+#: models/__init__.py:507
msgid "Sorry, since your account is suspended you cannot close questions"
msgstr ""
-#: models/__init__.py:483
+#: models/__init__.py:511
#, python-format
msgid ""
"Sorry, to close other people' posts, a minimum reputation of %(min_rep)s is "
"required"
msgstr ""
-#: models/__init__.py:492
+#: models/__init__.py:520
#, python-format
msgid ""
"Sorry, to close own question a minimum reputation of %(min_rep)s is required"
msgstr ""
-#: models/__init__.py:516
+#: models/__init__.py:544
#, python-format
msgid ""
"Sorry, only administrators, moderators or post owners with reputation > %"
"(min_rep)s can reopen questions."
msgstr ""
-#: models/__init__.py:522
+#: models/__init__.py:550
#, python-format
msgid ""
"Sorry, to reopen own question a minimum reputation of %(min_rep)s is required"
msgstr ""
-#: models/__init__.py:542
+#: models/__init__.py:570
msgid "cannot flag message as offensive twice"
msgstr "You have flagged this question before and cannot do it more than once"
-#: models/__init__.py:547
+#: models/__init__.py:575
msgid "blocked users cannot flag posts"
msgstr ""
"Sorry, since your account is blocked you cannot flag posts as offensive"
-#: models/__init__.py:549
+#: models/__init__.py:577
msgid "suspended users cannot flag posts"
msgstr ""
"Sorry, your account appears to be suspended and you cannot make new posts "
"until this issue is resolved. You can, however edit your existing posts. "
"Please contact the forum administrator to reach a resolution."
-#: models/__init__.py:551
+#: models/__init__.py:579
#, python-format
msgid "need > %(min_rep)s points to flag spam"
msgstr ""
"Sorry, to flag posts as offensive a minimum reputation of %(min_rep)s is "
"required"
-#: models/__init__.py:570
+#: models/__init__.py:598
#, python-format
msgid "%(max_flags_per_day)s exceeded"
msgstr ""
"Sorry, you have exhausted the maximum number of %(max_flags_per_day)s "
"offensive flags per day."
-#: models/__init__.py:585
+#: models/__init__.py:613
msgid ""
"Sorry, only question owners, site administrators and moderators can retag "
"deleted questions"
msgstr ""
-#: models/__init__.py:592
+#: models/__init__.py:620
msgid "Sorry, since your account is blocked you cannot retag questions"
msgstr ""
-#: models/__init__.py:596
+#: models/__init__.py:624
msgid ""
"Sorry, since your account is suspended you can retag only your own questions"
msgstr ""
-#: models/__init__.py:600
+#: models/__init__.py:628
#, python-format
msgid ""
"Sorry, to retag questions a minimum reputation of %(min_rep)s is required"
msgstr ""
-#: models/__init__.py:619
+#: models/__init__.py:647
msgid "Sorry, since your account is blocked you cannot delete comment"
msgstr ""
-#: models/__init__.py:623
+#: models/__init__.py:651
msgid ""
"Sorry, since your account is suspended you can delete only your own comments"
msgstr ""
-#: models/__init__.py:627
+#: models/__init__.py:655
#, python-format
msgid "Sorry, to delete comments reputation of %(min_rep)s is required"
msgstr ""
-#: models/__init__.py:650
+#: models/__init__.py:678
msgid "cannot revoke old vote"
msgstr "sorry, but older votes cannot be revoked"
-#: models/__init__.py:1128 views/users.py:387
+#: models/__init__.py:1166 views/users.py:388
msgid "Site Adminstrator"
msgstr ""
-#: models/__init__.py:1130 views/users.py:389
+#: models/__init__.py:1168 views/users.py:390
msgid "Forum Moderator"
msgstr ""
-#: models/__init__.py:1132 views/users.py:391
+#: models/__init__.py:1170 views/users.py:392
msgid "Suspended User"
msgstr ""
-#: models/__init__.py:1134 views/users.py:393
+#: models/__init__.py:1172 views/users.py:394
msgid "Blocked User"
msgstr ""
-#: models/__init__.py:1136 views/users.py:395
+#: models/__init__.py:1174 views/users.py:396
msgid "Registered User"
msgstr ""
-#: models/__init__.py:1138
+#: models/__init__.py:1176
msgid "Watched User"
msgstr ""
-#: models/__init__.py:1140
+#: models/__init__.py:1178
msgid "Approved User"
msgstr ""
-#: models/__init__.py:1196
+#: models/__init__.py:1234
#, python-format
msgid "%(username)s karma is %(reputation)s"
msgstr ""
-#: models/__init__.py:1206
+#: models/__init__.py:1244
#, python-format
msgid "one gold badge"
msgid_plural "%(count)d gold badges"
msgstr[0] ""
msgstr[1] ""
-#: models/__init__.py:1213
+#: models/__init__.py:1251
#, python-format
msgid "one silver badge"
msgid_plural "%(count)d silver badges"
msgstr[0] ""
msgstr[1] ""
-#: models/__init__.py:1220
+#: models/__init__.py:1258
#, python-format
msgid "one bronze badge"
msgid_plural "%(count)d bronze badges"
msgstr[0] ""
msgstr[1] ""
-#: models/__init__.py:1231
+#: models/__init__.py:1269
#, python-format
msgid "%(item1)s and %(item2)s"
msgstr ""
-#: models/__init__.py:1235
+#: models/__init__.py:1273
#, python-format
msgid "%(user)s has %(badges)s"
msgstr ""
-#: models/__init__.py:1526 models/__init__.py:1532 models/__init__.py:1537
-#: models/__init__.py:1542
+#: models/__init__.py:1566 models/__init__.py:1572 models/__init__.py:1577
+#: models/__init__.py:1582
#, python-format
msgid "Re: \"%(title)s\""
msgstr ""
-#: models/__init__.py:1547 models/__init__.py:1552
+#: models/__init__.py:1587 models/__init__.py:1592
#, python-format
msgid "Question: \"%(title)s\""
msgstr ""
-#: models/__init__.py:1733
+#: models/__init__.py:1773
#, python-format
msgid ""
"Congratulations, you have received a badge '%(badge_name)s'. Check out <a "
"href=\"%(user_profile)s\">your profile</a>."
msgstr ""
-#: models/question.py:667
+#: models/question.py:687
#, python-format
msgid "%(author)s modified the question"
msgstr ""
-#: models/question.py:671
+#: models/question.py:691
#, python-format
msgid "%(people)s posted %(new_answer_count)s new answers"
msgstr ""
-#: models/question.py:676
+#: models/question.py:696
#, python-format
msgid "%(people)s commented the question"
msgstr ""
-#: models/question.py:681
+#: models/question.py:701
#, python-format
msgid "%(people)s commented answers"
msgstr ""
-#: models/question.py:683
+#: models/question.py:703
#, python-format
msgid "%(people)s commented an answer"
msgstr ""
@@ -2502,11 +2513,11 @@ msgid ""
"question %(question_title)s"
msgstr ""
-#: models/tag.py:110
+#: models/tag.py:91
msgid "interesting"
msgstr ""
-#: models/tag.py:110
+#: models/tag.py:91
msgid "ignored"
msgstr ""
@@ -2668,9 +2679,9 @@ msgstr ""
#: skins/default/templates/answer_edit.html:59
#: skins/default/templates/answer_edit.html:62
#: skins/default/templates/ask.html:36 skins/default/templates/ask.html:39
-#: skins/default/templates/macros.html:387
-#: skins/default/templates/question.html:448
-#: skins/default/templates/question.html:451
+#: skins/default/templates/macros.html:398
+#: skins/default/templates/question.html:453
+#: skins/default/templates/question.html:456
#: skins/default/templates/question_edit.html:63
#: skins/default/templates/question_edit.html:66
msgid "hide preview"
@@ -2678,7 +2689,7 @@ msgstr ""
#: skins/default/templates/answer_edit.html:62
#: skins/default/templates/ask.html:39
-#: skins/default/templates/question.html:451
+#: skins/default/templates/question.html:456
#: skins/default/templates/question_edit.html:66
msgid "show preview"
msgstr ""
@@ -3451,21 +3462,21 @@ msgid "updated"
msgstr ""
#: skins/default/templates/macros.html:210
-#: skins/default/templates/unused/questions_ajax.html:23 views/readers.py:235
+#: skins/default/templates/unused/questions_ajax.html:23 views/readers.py:237
msgid "vote"
msgid_plural "votes"
msgstr[0] ""
msgstr[1] ""
#: skins/default/templates/macros.html:227
-#: skins/default/templates/unused/questions_ajax.html:43 views/readers.py:238
+#: skins/default/templates/unused/questions_ajax.html:43 views/readers.py:240
msgid "answer"
msgid_plural "answers"
msgstr[0] ""
msgstr[1] ""
#: skins/default/templates/macros.html:239
-#: skins/default/templates/unused/questions_ajax.html:55 views/readers.py:241
+#: skins/default/templates/unused/questions_ajax.html:55 views/readers.py:243
msgid "view"
msgid_plural "views"
msgstr[0] ""
@@ -3481,22 +3492,31 @@ msgstr[1] ""
msgid "see questions tagged '%(tag)s'"
msgstr ""
-#: skins/default/templates/macros.html:269
+#: skins/default/templates/macros.html:272
+#: skins/default/templates/question.html:94
+#: skins/default/templates/question.html:247
+#: skins/default/templates/revisions.html:37
+msgid "edit"
+msgstr ""
+
+#: skins/default/templates/macros.html:277
msgid "delete this comment"
msgstr ""
-#: skins/default/templates/macros.html:284
+#: skins/default/templates/macros.html:295
+#: skins/default/templates/macros.html:303
+#: skins/default/templates/question.html:420
msgid "add comment"
msgstr "post a comment"
-#: skins/default/templates/macros.html:289
+#: skins/default/templates/macros.html:296
#, python-format
msgid "see <strong>%(counter)s</strong> more"
msgid_plural "see <strong>%(counter)s</strong> more"
msgstr[0] ""
msgstr[1] ""
-#: skins/default/templates/macros.html:291
+#: skins/default/templates/macros.html:298
#, python-format
msgid "see <strong>%(counter)s</strong> more comment"
msgid_plural ""
@@ -3505,11 +3525,11 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: skins/default/templates/macros.html:364
+#: skins/default/templates/macros.html:375
msgid "(required)"
msgstr ""
-#: skins/default/templates/macros.html:385
+#: skins/default/templates/macros.html:396
msgid "Toggle the real time Markdown editor preview"
msgstr ""
@@ -3556,12 +3576,6 @@ msgstr ""
msgid "Share this question on facebook"
msgstr ""
-#: skins/default/templates/question.html:94
-#: skins/default/templates/question.html:247
-#: skins/default/templates/revisions.html:37
-msgid "edit"
-msgstr ""
-
#: skins/default/templates/question.html:97
msgid "retag"
msgstr ""
@@ -3606,18 +3620,18 @@ msgstr ""
#, python-format
msgid ""
"\n"
-" %(counter)s Answer:\n"
-" "
+" %(counter)s Answer:\n"
+" "
msgid_plural ""
"\n"
-" %(counter)s Answers:\n"
-" "
+" %(counter)s Answers:\n"
+" "
msgstr[0] ""
msgstr[1] ""
#: skins/default/templates/question.html:174
msgid "oldest answers will be shown first"
-msgstr " "
+msgstr ""
#: skins/default/templates/question.html:174
msgid "oldest answers"
@@ -3633,7 +3647,7 @@ msgstr "newest"
#: skins/default/templates/question.html:178
msgid "most voted answers will be shown first"
-msgstr " "
+msgstr ""
#: skins/default/templates/question.html:178
msgid "popular answers"
@@ -3863,7 +3877,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: skins/default/templates/questions.html:111 views/readers.py:155
+#: skins/default/templates/questions.html:111 views/readers.py:157
#, python-format
msgid "%(q_num)s question"
msgid_plural "%(q_num)s questions"
@@ -4358,7 +4372,7 @@ msgstr ""
msgid "overview"
msgstr ""
-#: skins/default/templates/user_tabs.html:9 views/users.py:752
+#: skins/default/templates/user_tabs.html:9 views/users.py:753
msgid "comments and answers to others questions"
msgstr ""
@@ -4390,7 +4404,7 @@ msgstr ""
msgid "activity"
msgstr ""
-#: skins/default/templates/user_tabs.html:23 views/users.py:817
+#: skins/default/templates/user_tabs.html:23 views/users.py:818
msgid "user vote record"
msgstr ""
@@ -4398,7 +4412,7 @@ msgstr ""
msgid "casted votes"
msgstr "votes"
-#: skins/default/templates/user_tabs.html:28 views/users.py:927
+#: skins/default/templates/user_tabs.html:28 views/users.py:928
msgid "email subscription settings"
msgstr ""
@@ -4406,7 +4420,7 @@ msgstr ""
msgid "subscriptions"
msgstr ""
-#: skins/default/templates/user_tabs.html:33 views/users.py:215
+#: skins/default/templates/user_tabs.html:33 views/users.py:216
msgid "moderate this user"
msgstr ""
@@ -5025,11 +5039,11 @@ msgstr ""
msgid "views"
msgstr ""
-#: templatetags/extra_filters.py:168 templatetags/extra_filters_jinja.py:229
+#: templatetags/extra_filters.py:168 templatetags/extra_filters_jinja.py:234
msgid "no items in counter"
msgstr "no"
-#: templatetags/extra_tags.py:155 views/readers.py:185
+#: templatetags/extra_tags.py:155 views/readers.py:187
#, python-format
msgid "%(badge_count)d %(badge_level)s badge"
msgid_plural "%(badge_count)d %(badge_level)s badges"
@@ -5050,6 +5064,10 @@ msgstr ""
msgid "badges: "
msgstr ""
+#: utils/decorators.py:82 views/commands.py:132 views/commands.py:149
+msgid "Oops, apologies - there was some error"
+msgstr ""
+
#: utils/forms.py:32
msgid "this field is required"
msgstr ""
@@ -5158,10 +5176,6 @@ msgstr ""
msgid "You have %(votes_left)s votes left for today"
msgstr ""
-#: views/commands.py:132 views/commands.py:149
-msgid "Oops, apologies - there was some error"
-msgstr ""
-
#: views/commands.py:139
msgid "Sorry, but anonymous users cannot access the inbox"
msgstr ""
@@ -5185,110 +5199,118 @@ msgstr ""
msgid "email update frequency has been set to daily"
msgstr ""
-#: views/meta.py:57
-msgid "Q&A forum feedback"
+#: views/commands.py:371
+msgid "Bad request"
msgstr ""
#: views/meta.py:58
+msgid "Q&A forum feedback"
+msgstr ""
+
+#: views/meta.py:59
msgid "Thanks for the feedback!"
msgstr ""
-#: views/meta.py:68
+#: views/meta.py:69
msgid "We look forward to hearing your feedback! Please, give it next time :)"
msgstr ""
-#: views/readers.py:429
+#: views/readers.py:432
msgid "Sorry, this question has been deleted and is no longer accessible"
msgstr ""
-#: views/users.py:216
+#: views/users.py:217
msgid "moderate user"
msgstr ""
-#: views/users.py:400
+#: views/users.py:401
msgid "user profile"
msgstr ""
-#: views/users.py:401
+#: views/users.py:402
msgid "user profile overview"
msgstr ""
-#: views/users.py:684
+#: views/users.py:685
msgid "recent user activity"
msgstr ""
-#: views/users.py:685
+#: views/users.py:686
msgid "profile - recent activity"
msgstr ""
-#: views/users.py:753
+#: views/users.py:754
msgid "profile - responses"
msgstr ""
-#: views/users.py:818
+#: views/users.py:819
msgid "profile - votes"
msgstr ""
-#: views/users.py:856
+#: views/users.py:857
msgid "user reputation in the community"
msgstr "user karma"
-#: views/users.py:857
+#: views/users.py:858
msgid "profile - user reputation"
msgstr "Profile - User's Karma"
-#: views/users.py:885
+#: views/users.py:886
msgid "users favorite questions"
msgstr ""
-#: views/users.py:886
+#: views/users.py:887
msgid "profile - favorite questions"
msgstr ""
-#: views/users.py:906 views/users.py:910
+#: views/users.py:907 views/users.py:911
msgid "changes saved"
msgstr ""
-#: views/users.py:916
+#: views/users.py:917
msgid "email updates canceled"
msgstr ""
-#: views/users.py:928
+#: views/users.py:929
msgid "profile - email subscriptions"
msgstr ""
-#: views/writers.py:53
+#: views/writers.py:56
msgid "Sorry, anonymous users cannot upload files"
msgstr ""
-#: views/writers.py:62
+#: views/writers.py:65
#, python-format
msgid "allowed file types are '%(file_types)s'"
msgstr ""
-#: views/writers.py:85
+#: views/writers.py:88
#, python-format
msgid "maximum upload file size is %(file_size)sK"
msgstr ""
-#: views/writers.py:93
+#: views/writers.py:96
msgid "Error uploading file. Please contact the site administrator. Thank you."
msgstr ""
-#: views/writers.py:454
+#: views/writers.py:452
#, python-format
msgid ""
"Sorry, you appear to be logged out and cannot post comments. Please <a href="
"\"%(sign_in_url)s\">sign in</a>."
msgstr ""
-#: views/writers.py:489
+#: views/writers.py:497
+msgid "Sorry, anonymous users cannot edit comments"
+msgstr ""
+
+#: views/writers.py:505
#, python-format
msgid ""
"Sorry, you appear to be logged out and cannot delete comments. Please <a "
"href=\"%(sign_in_url)s\">sign in</a>."
msgstr ""
-#: views/writers.py:509
+#: views/writers.py:526
msgid "sorry, we seem to have some technical difficulties"
msgstr ""
diff --git a/askbot/locale/es/LC_MESSAGES/django.mo b/askbot/locale/es/LC_MESSAGES/django.mo
index 3e6d4406..44340a12 100644
--- a/askbot/locale/es/LC_MESSAGES/django.mo
+++ b/askbot/locale/es/LC_MESSAGES/django.mo
Binary files differ
diff --git a/askbot/locale/fi/LC_MESSAGES/django.mo b/askbot/locale/fi/LC_MESSAGES/django.mo
index 379c9f26..c658235c 100644
--- a/askbot/locale/fi/LC_MESSAGES/django.mo
+++ b/askbot/locale/fi/LC_MESSAGES/django.mo
Binary files differ
diff --git a/askbot/locale/fr/LC_MESSAGES/django.mo b/askbot/locale/fr/LC_MESSAGES/django.mo
index 0535fcaf..2c614c0c 100644
--- a/askbot/locale/fr/LC_MESSAGES/django.mo
+++ b/askbot/locale/fr/LC_MESSAGES/django.mo
Binary files differ
diff --git a/askbot/locale/it/LC_MESSAGES/django.mo b/askbot/locale/it/LC_MESSAGES/django.mo
index c5268d69..f87454fe 100644
--- a/askbot/locale/it/LC_MESSAGES/django.mo
+++ b/askbot/locale/it/LC_MESSAGES/django.mo
Binary files differ
diff --git a/askbot/locale/ja/LC_MESSAGES/django.mo b/askbot/locale/ja/LC_MESSAGES/django.mo
index 6d5280cf..392ff0f1 100644
--- a/askbot/locale/ja/LC_MESSAGES/django.mo
+++ b/askbot/locale/ja/LC_MESSAGES/django.mo
Binary files differ
diff --git a/askbot/locale/ru/LC_MESSAGES/django.mo b/askbot/locale/ru/LC_MESSAGES/django.mo
index 1b85b6e7..88f22e84 100644
--- a/askbot/locale/ru/LC_MESSAGES/django.mo
+++ b/askbot/locale/ru/LC_MESSAGES/django.mo
Binary files differ
diff --git a/askbot/locale/sr/LC_MESSAGES/django.mo b/askbot/locale/sr/LC_MESSAGES/django.mo
index 4e254449..71d87f05 100644
--- a/askbot/locale/sr/LC_MESSAGES/django.mo
+++ b/askbot/locale/sr/LC_MESSAGES/django.mo
Binary files differ
diff --git a/askbot/locale/tr/LC_MESSAGES/django.mo b/askbot/locale/tr/LC_MESSAGES/django.mo
index dcece75c..8a7f1504 100644
--- a/askbot/locale/tr/LC_MESSAGES/django.mo
+++ b/askbot/locale/tr/LC_MESSAGES/django.mo
Binary files differ
diff --git a/askbot/locale/vi/LC_MESSAGES/django.mo b/askbot/locale/vi/LC_MESSAGES/django.mo
index ec2723ca..7d2ec0b8 100644
--- a/askbot/locale/vi/LC_MESSAGES/django.mo
+++ b/askbot/locale/vi/LC_MESSAGES/django.mo
Binary files differ
diff --git a/askbot/locale/zh-cn/LC_MESSAGES/django.mo b/askbot/locale/zh-cn/LC_MESSAGES/django.mo
index 0d5ba50f..3bd8fb58 100644
--- a/askbot/locale/zh-cn/LC_MESSAGES/django.mo
+++ b/askbot/locale/zh-cn/LC_MESSAGES/django.mo
Binary files differ
diff --git a/askbot/locale/zh-tw/LC_MESSAGES/django.mo b/askbot/locale/zh-tw/LC_MESSAGES/django.mo
index 92e3f56b..221bddf6 100644
--- a/askbot/locale/zh-tw/LC_MESSAGES/django.mo
+++ b/askbot/locale/zh-tw/LC_MESSAGES/django.mo
Binary files differ
diff --git a/askbot/skins/default/templates/question.html b/askbot/skins/default/templates/question.html
index 4613017f..4d3a1111 100644
--- a/askbot/skins/default/templates/question.html
+++ b/askbot/skins/default/templates/question.html
@@ -170,11 +170,11 @@
{% endtrans %}
</div>
<div class="tabsA">
- <a id="oldest" href="{% url question question.id %}?sort=oldest#sort-top"
+ <a id="oldest" href="{{ question.get_absolute_url() }}?sort=oldest#sort-top"
title="{% trans %}oldest answers will be shown first{% endtrans %}">{% trans %}oldest answers{% endtrans %}</a>
- <a id="latest" href="{% url question question.id %}?sort=latest#sort-top"
+ <a id="latest" href="{{ question.get_absolute_url() }}?sort=latest#sort-top"
title="{% trans %}newest answers will be shown first{% endtrans %}">{% trans %}newest answers{% endtrans %}</a>
- <a id="votes" href="{% url question question.id %}?sort=votes#sort-top"
+ <a id="votes" href="{{ question.get_absolute_url() }}?sort=votes#sort-top"
title="{% trans %}most voted answers will be shown first{% endtrans %}">{% trans %}popular answers{% endtrans %}</a>
</div>
</div>
diff --git a/askbot/views/readers.py b/askbot/views/readers.py
index 5411309c..42ddb63a 100644
--- a/askbot/views/readers.py
+++ b/askbot/views/readers.py
@@ -397,32 +397,33 @@ def question(request, id):#refactor - long subroutine. display question body, an
except ValueError:
page = 1
- view_id = request.GET.get('sort', None)
+ answer_sort_method = request.GET.get('sort', None)
view_dic = {"latest":"-added_at", "oldest":"added_at", "votes":"-score" }
try:
- orderby = view_dic[view_id]
+ orderby = view_dic[answer_sort_method]
except KeyError:
qsm = request.session.get('questions_sort_method',None)
if qsm in ('mostvoted','latest'):
logging.debug('loaded from session ' + qsm)
if qsm == 'mostvoted':
- view_id = 'votes'
+ answer_sort_method = 'votes'
orderby = '-score'
else:
- view_id = 'latest'
+ answer_sort_method = 'latest'
orderby = '-added_at'
else:
- view_id = "votes"
+ answer_sort_method = "votes"
orderby = "-score"
- logging.debug('view_id=' + unicode(view_id))
+ logging.debug('answer_sort_method=' + unicode(answer_sort_method))
question = get_object_or_404(Question, id=id)
try:
assert(request.path == question.get_absolute_url())
except AssertionError:
logging.debug('no slug match!')
- return HttpResponseRedirect(question.get_absolute_url())
+ question_url = question.get_absolute_url() + '?sort=%s' % answer_sort_method
+ return HttpResponseRedirect(question_url)
if question.deleted:
try:
@@ -509,7 +510,7 @@ def question(request, id):#refactor - long subroutine. display question body, an
'has_next': page_objects.has_next(),
'previous': page_objects.previous_page_number(),
'next': page_objects.next_page_number(),
- 'base_url' : request.path + '?sort=%s&amp;' % view_id,
+ 'base_url' : request.path + '?sort=%s&amp;' % answer_sort_method,
'extend_url' : "#sort-top"
}
paginator_context = extra_tags.cnprog_paginator(paginator_data)
@@ -524,7 +525,7 @@ def question(request, id):#refactor - long subroutine. display question body, an
'answers' : page_objects.object_list,
'user_answer_votes': user_answer_votes,
'tags' : question.tags.all(),
- 'tab_id' : view_id,
+ 'tab_id' : answer_sort_method,
'favorited' : favorited,
'similar_questions' : question.get_similar_questions(),
'language_code': translation.get_language(),