diff options
author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2009-08-19 21:29:51 -0400 |
---|---|---|
committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2009-08-19 21:29:51 -0400 |
commit | 2022b772a01f36fa74de002b5370dd70b6c051ba (patch) | |
tree | 2ce70a5d5fb0eab245126fab7fac628fab0cffbe | |
parent | 1bc0d490820c4587a8902747e8516aa6ae98a515 (diff) | |
download | askbot-2022b772a01f36fa74de002b5370dd70b6c051ba.tar.gz askbot-2022b772a01f36fa74de002b5370dd70b6c051ba.tar.bz2 askbot-2022b772a01f36fa74de002b5370dd70b6c051ba.zip |
added Adolfos mods, django_authopeid bug, unified traditional and OpenID login
-rw-r--r-- | django_authopenid/urls.py | 12 | ||||
-rw-r--r-- | django_authopenid/views.py | 23 | ||||
-rw-r--r-- | forum/managers.py | 2 | ||||
-rw-r--r-- | forum/views.py | 8 | ||||
-rw-r--r-- | locale/en/LC_MESSAGES/django.mo | bin | 14334 -> 15146 bytes | |||
-rw-r--r-- | locale/en/LC_MESSAGES/django.po | 229 | ||||
-rw-r--r-- | locale/es/LC_MESSAGES/django.mo | bin | 49490 -> 49819 bytes | |||
-rw-r--r-- | locale/es/LC_MESSAGES/django.po | 346 | ||||
-rw-r--r-- | templates/authopenid/sendpw.html | 2 | ||||
-rw-r--r-- | templates/authopenid/settings.html | 2 | ||||
-rw-r--r-- | templates/authopenid/signin.html | 79 | ||||
-rw-r--r-- | templates/content/jquery-openid/images/local-login.png | bin | 0 -> 2522 bytes | |||
-rw-r--r-- | templates/content/jquery-openid/images/openidico16.png | bin | 0 -> 554 bytes | |||
-rw-r--r-- | templates/content/jquery-openid/jquery.openid.js | 19 | ||||
-rw-r--r-- | templates/content/jquery-openid/openid.css | 16 | ||||
-rw-r--r-- | templates/content/style/style.css | 4 | ||||
-rw-r--r-- | templates/footer.html | 2 | ||||
-rw-r--r-- | templates/question.html | 4 |
18 files changed, 427 insertions, 321 deletions
diff --git a/django_authopenid/urls.py b/django_authopenid/urls.py index 9c0887d8..f5d7a72f 100644 --- a/django_authopenid/urls.py +++ b/django_authopenid/urls.py @@ -12,17 +12,15 @@ urlpatterns = patterns('django_authopenid.views', url(r'^%s$' % _('signout/'), 'signout', name='user_signout'), url(r'^%s%s$' % (_('signin/'), _('complete/')), 'complete_signin', name='user_complete_signin'), - url(r'^%s$' % _('register/'), 'register', name='user_register'), + #url(r'^%s$' % _('register/'), 'register', name='user_register'), url(r'^%s$' % _('signup/'), 'signup', name='user_signup'), #disable current sendpw function - url(r'^%s$' % _('sendpw/'), 'signin', name='user_sendpw'), - #url(r'^%s$' % _('sendpw/'), 'sendpw', name='user_sendpw'), - #url(r'^%s%s$' % (_('password/'), _('confirm/')), 'confirmchangepw', - # name='user_confirmchangepw'), + url(r'^%s$' % _('sendpw/'), 'sendpw', name='user_sendpw'), + url(r'^%s%s$' % (_('password/'), _('confirm/')), 'confirmchangepw', name='user_confirmchangepw'), # manage account settings - #url(r'^$', _('account_settings'), name='user_account_settings'), - #url(r'^%s$' % _('password/'), 'changepw', name='user_changepw'), + url(r'^$', _('account_settings'), name='user_account_settings'), + url(r'^%s$' % _('password/'), 'changepw', name='user_changepw'), url(r'^%s$' % _('email/'), 'changeemail', name='user_changeemail',kwargs = {'action':'change'}), url(r'^%s%s$' % (_('email/'),_('validate/')), 'changeemail', name='user_changeemail',kwargs = {'action':'validate'}), #url(r'^%s$' % _('openid/'), 'changeopenid', name='user_changeopenid'), diff --git a/django_authopenid/views.py b/django_authopenid/views.py index 218a31a2..65d579f4 100644 --- a/django_authopenid/views.py +++ b/django_authopenid/views.py @@ -175,9 +175,18 @@ def signin(request,newquestion=False,newanswer=False): form_auth = OpenidAuthForm(initial={'next':next}) if request.POST: - - if 'bsignin' in request.POST.keys() or 'openid_username' in request.POST.keys(): + if 'blogin' in request.POST.keys(): + # perform normal django authentification + form_auth = OpenidAuthForm(request.POST) + if form_auth.is_valid(): + user_ = form_auth.get_user() + login(request, user_) + next = clean_next(form_auth.cleaned_data.get('next')) + print 'next stop is "%s"' % next + return HttpResponseRedirect(next) + + elif 'bsignin' in request.POST.keys() or 'openid_username' in request.POST.keys(): form_signin = OpenidSigninForm(request.POST) if form_signin.is_valid(): next = clean_next(form_signin.cleaned_data.get('next')) @@ -193,14 +202,6 @@ def signin(request,newquestion=False,newanswer=False): on_failure=signin_failure, sreg_request=sreg_req) - elif 'blogin' in request.POST.keys(): - # perform normal django authentification - form_auth = OpenidAuthForm(request.POST) - if form_auth.is_valid(): - user_ = form_auth.get_user() - login(request, user_) - next = clean_next(form_auth.cleaned_data.get('next')) - return HttpResponseRedirect(next) question = None if newquestion == True: @@ -368,7 +369,7 @@ def register(request): return render('authopenid/complete.html', { 'form1': form1, 'form2': form2, - 'provider':providers[provider_name], + 'provider':provider_logo, 'nickname': nickname, 'email': email }, context_instance=RequestContext(request)) diff --git a/forum/managers.py b/forum/managers.py index 2e3e4186..6ae0ed99 100644 --- a/forum/managers.py +++ b/forum/managers.py @@ -20,7 +20,7 @@ class QuestionManager(models.Manager): return questions def get_unanswered_questions(self, orderby): - questions = self.filter(deleted=False, answer_count=0).order_by(orderby) + questions = self.filter(deleted=False, answer_accepted=False).order_by(orderby) return questions def get_questions(self, orderby): diff --git a/forum/views.py b/forum/views.py index ce722118..d663a4cb 100644 --- a/forum/views.py +++ b/forum/views.py @@ -1149,12 +1149,8 @@ def user_stats(request, user_id, user_view): params=[user.id] ).values('id', 'name', 'description', 'type') total_awards = awards.count() - #fixed to work with Django version < 1.1 - try: - from django.db.models import Count - awards = awards.annotate(count = Count('badge__id')) - except: - pass + from django.db.models import Count + awards = awards.annotate(count = Count('badge__id')) return render_to_response(user_view.template_file,{ "tab_name" : user_view.id, diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo Binary files differindex 447afac4..cd8de560 100644 --- a/locale/en/LC_MESSAGES/django.mo +++ b/locale/en/LC_MESSAGES/django.mo diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po index ff280947..b5e5c549 100644 --- a/locale/en/LC_MESSAGES/django.po +++ b/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: 2009-08-12 15:41+0000\n" +"POT-Creation-Date: 2009-08-19 00:41+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -16,13 +16,13 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: settings.py:12 urls.py:25 forum/views.py:304 forum/views.py:698 +#: settings.py:12 urls.py:25 forum/views.py:305 forum/views.py:699 msgid "account/" msgstr "" #: settings.py:12 urls.py:26 django_authopenid/urls.py:9 #: django_authopenid/urls.py:10 django_authopenid/urls.py:11 -#: django_authopenid/urls.py:13 forum/views.py:304 forum/views.py:699 +#: django_authopenid/urls.py:13 forum/views.py:305 forum/views.py:700 #: templates/authopenid/confirm_email.txt:10 msgid "signin/" msgstr "" @@ -82,7 +82,8 @@ msgstr "" #: urls.py:37 urls.py:38 urls.py:39 urls.py:40 urls.py:41 urls.py:42 #: urls.py:43 urls.py:44 urls.py:45 urls.py:46 urls.py:47 forum/feed.py:19 -#: forum/models.py:306 forum/views.py:1416 +#: forum/models.py:306 forum/views.py:1188 forum/views.py:1190 +#: forum/views.py:1430 msgid "questions/" msgstr "" @@ -118,12 +119,12 @@ msgstr "" msgid "question/" msgstr "" -#: urls.py:51 urls.py:52 forum/views.py:740 forum/views.py:2013 +#: urls.py:51 urls.py:52 forum/views.py:741 forum/views.py:2027 msgid "tags/" msgstr "" -#: urls.py:53 urls.py:54 urls.py:55 forum/views.py:993 forum/views.py:997 -#: forum/views.py:1418 forum/views.py:1751 forum/views.py:2015 +#: urls.py:53 urls.py:54 urls.py:55 forum/views.py:994 forum/views.py:998 +#: forum/views.py:1432 forum/views.py:1765 forum/views.py:2029 msgid "users/" msgstr "" @@ -238,7 +239,7 @@ msgstr "" msgid "Incorrect username." msgstr "" -#: django_authopenid/urls.py:10 forum/views.py:304 forum/views.py:699 +#: django_authopenid/urls.py:10 forum/views.py:305 forum/views.py:700 msgid "newquestion/" msgstr "" @@ -695,27 +696,27 @@ msgstr "" msgid "profile - user preferences" msgstr "" -#: forum/views.py:947 +#: forum/views.py:948 #, python-format msgid "subscription saved, %(email)s needs validation" msgstr "" "Your subscription is saved, but email address %(email)s needs to be " "validated, please see <a href='/faq#validate'>more details here</a>" -#: forum/views.py:1860 +#: forum/views.py:1874 msgid "uploading images is limited to users with >60 reputation points" msgstr "" -#: forum/views.py:1862 +#: forum/views.py:1876 msgid "allowed file types are 'jpg', 'jpeg', 'gif', 'bmp', 'png', 'tiff'" msgstr "" -#: forum/views.py:1864 +#: forum/views.py:1878 #, python-format msgid "maximum upload file size is %sK" msgstr "" -#: forum/views.py:1866 +#: forum/views.py:1880 #, python-format msgid "" "Error uploading file. Please contact the site administrator. Thank you. %s" @@ -723,7 +724,7 @@ msgstr "" #: forum/management/commands/send_email_alerts.py:35 msgid "updates from website" -msgstr "" +msgstr "Q&A forum update" #: forum/templatetags/extra_tags.py:143 forum/templatetags/extra_tags.py:172 #: templates/header.html:35 @@ -937,7 +938,7 @@ msgid "must have valid %(email)s to post" msgstr "" "<span class='strong big'>Looks like your email address, %(email)s has not " "yet been validated.</span> To post messages you must verify your email, " -"please see <a href='/faq#validate'>more details here</a>.<br/>You can submit " +"please see <a href='/faq#validate'>more details here</a>.<br>You can submit " "your question now and validate email after that. Your question will saved as " "pending meanwhile. " @@ -965,7 +966,7 @@ msgstr "" msgid "Badges summary" msgstr "" -#: templates/badges.html:17 templates/user_stats.html:115 +#: templates/badges.html:17 templates/user_stats.html:73 msgid "Badges" msgstr "" @@ -1070,17 +1071,17 @@ msgid "ask the author" msgstr "" #: templates/book.html:88 templates/book.html.py:93 -#: templates/users_questions.html:17 +#: templates/users_questions.html:18 msgid "this question was selected as favorite" msgstr "" #: templates/book.html:88 templates/book.html.py:93 -#: templates/users_questions.html:11 templates/users_questions.html.py:17 +#: templates/users_questions.html:11 templates/users_questions.html.py:18 msgid "number of times" msgstr "" #: templates/book.html:105 templates/index.html:48 templates/questions.html:46 -#: templates/unanswered.html:37 templates/users_questions.html:30 +#: templates/unanswered.html:37 templates/users_questions.html:32 msgid "votes" msgstr "" @@ -1089,14 +1090,14 @@ msgid "the answer has been accepted to be correct" msgstr "" #: templates/book.html:115 templates/index.html:49 templates/questions.html:47 -#: templates/unanswered.html:38 templates/users_questions.html:40 +#: templates/unanswered.html:38 templates/users_questions.html:42 msgid "views" msgstr "" #: templates/book.html:125 templates/index.html:69 templates/question.html:499 #: templates/questions.html:84 templates/questions.html.py:156 #: templates/tags.html:49 templates/unanswered.html:75 -#: templates/unanswered.html.py:106 templates/users_questions.html:52 +#: templates/unanswered.html.py:106 templates/users_questions.html:54 msgid "using tags" msgstr "" @@ -1265,13 +1266,13 @@ msgid "how to validate email info" msgstr "" "<form style='margin:0;padding:0;' action='/email/sendkey/'><p><span class=" "\"bigger strong\">How?</span> If you have just set or changed your email " -"address - <strong>check your email and click the included link</strong>.<br/" -">The link contains a key generated specifically for you. You can also " +"address - <strong>check your email and click the included link</strong>." +"<br>The link contains a key generated specifically for you. You can also " "<button style='display:inline' type='submit'><strong>get a new key</strong></" "button> and check your email again.</p></form><span class=\"bigger strong" "\">Why?</span> Email validation is required to make sure that <strong>only " "you can post messages</strong> on your behalf and to <strong>minimize spam</" -"strong> posts.<br/>With email you can <strong>subscribe for updates</strong> " +"strong> posts.<br>With email you can <strong>subscribe for updates</strong> " "on the most interesting questions. Also, when you sign up for the first time " "- create a unique <a href='/faq#gravatar'><strong>gravatar</strong></a> " "personal image.</p>" @@ -1342,35 +1343,35 @@ msgstr "" msgid "." msgstr "" -#: templates/footer.html:7 templates/header.html:14 templates/index.html:83 +#: templates/footer.html:8 templates/header.html:14 templates/index.html:83 msgid "about" msgstr "" -#: templates/footer.html:8 templates/header.html:15 templates/index.html:84 +#: templates/footer.html:9 templates/header.html:15 templates/index.html:84 #: templates/question_edit_tips.html:16 msgid "faq" msgstr "" -#: templates/footer.html:9 +#: templates/footer.html:10 +msgid "wiki" +msgstr "" + +#: templates/footer.html:11 msgid "blog" msgstr "" -#: templates/footer.html:10 +#: templates/footer.html:12 msgid "contact us" msgstr "" -#: templates/footer.html:11 +#: templates/footer.html:13 msgid "privacy policy" msgstr "" -#: templates/footer.html:12 +#: templates/footer.html:14 msgid "give feedback" msgstr "" -#: templates/footer.html:18 -msgid "current revision" -msgstr "" - #: templates/header.html:10 msgid "logout" msgstr "" @@ -1518,6 +1519,9 @@ msgid "" "As a registered user you can login with your OpenID, log out of the site or " "permanently remove your account." msgstr "" +"Clicking <strong>Logout</strong> will log you out from the Q&A forum.</" +"p><p>If you wish to sign off completely - please make sure to log out from " +"your OpenID provider." #: templates/logout.html:21 msgid "Logout now" @@ -1670,7 +1674,7 @@ msgstr "" msgid "close date %(question.closed_at)s" msgstr "" -#: templates/question.html:269 templates/user_stats.html:28 +#: templates/question.html:269 templates/user_stats.html:13 msgid "Answers" msgstr " Answers" @@ -1849,12 +1853,12 @@ msgid_plural "" "\t\t\t" msgstr[0] "" "\n" -"<span class=\"questions-count\">%(q_num)s</span><br/>question tagged <span " -"class=\"tag\">%(tagname)s</span>" +"<div class=\"questions-count\">%(q_num)s</div><p>question tagged</p><p><span " +"class=\"tag\">%(tagname)s</span></p>" msgstr[1] "" "\n" -"<span class=\"questions-count\">%(q_num)s</span><br/>questions tagged <span " -"class=\"tag\">%(tagname)s</span>" +"<div class=\"questions-count\">%(q_num)s</div><p>questions tagged</p><div " +"class=\"tags\"><span class=\"tag\">%(tagname)s</span></div>" #: templates/questions.html:116 #, python-format @@ -1868,12 +1872,14 @@ msgid_plural "" "\t\t\t\t" msgstr[0] "" "\n" -"<span class=\"questions-count\">%(q_num)s</span><br/>question with title " -"containing <span class=\"darkred strong\">%(searchtitle)s</span>" +"<div class=\"questions-count\">%(q_num)s</div><p>question with title " +"containing <strong><span class=\"darkred\">%(searchtitle)s</span></strong></" +"p>" msgstr[1] "" "\n" -"<span class=\"questions-count\">%(q_num)s</span><br/>questions with title " -"containing <span class=\"darkred strong\">%(searchtitle)s</span></strong>" +"<div class=\"questions-count\">%(q_num)s</div><p>questions with title " +"containing <strong><span class=\"darkred\">%(searchtitle)s</span></strong></" +"p>" #: templates/questions.html:122 #, python-format @@ -1887,10 +1893,10 @@ msgid_plural "" "\t\t\t\t" msgstr[0] "" "\n" -"<span class=\"questions-count\">%(q_num)s</span><br/>question" +"<div class=\"questions-count\">%(q_num)s</div><p>question</p>" msgstr[1] "" "\n" -"<span class=\"questions-count\">%(q_num)s</span><br/>questions" +"<div class=\"questions-count\">%(q_num)s</div><p>questions</p>" #: templates/questions.html:131 msgid "latest questions info" @@ -1997,8 +2003,8 @@ msgstr "" #, python-format msgid "have %(num_q)s unanswered questions" msgstr "" -"<span class=\"questions-count\">%(num_q)s</span><br/> questions with " -"<strong>no accepted answers</strong>" +"<div class=\"questions-count\">%(num_q)s</div><strong>unanswered</strong> " +"questions" #: templates/user_edit.html:6 msgid "Edit user profile" @@ -2088,41 +2094,49 @@ msgstr "" msgid "Save" msgstr "" -#: templates/user_stats.html:16 +#: templates/user_stats.html:10 msgid "User questions" msgstr "" -#: templates/user_stats.html:38 +#: templates/user_stats.html:20 #, python-format msgid "the answer has been voted for %(vote_count)s times" msgstr "" -#: templates/user_stats.html:38 +#: templates/user_stats.html:20 msgid "this answer has been selected as correct" msgstr "" -#: templates/user_stats.html:46 +#: templates/user_stats.html:28 #, python-format msgid "the answer has been commented %(comment_count)s times" -msgstr "(%(comment_count)s comment(s))" +msgstr "" -#: templates/user_stats.html:60 -msgid "votes total" -msgstr "Votes" +#: templates/user_stats.html:36 +msgid "Votes" +msgstr "" + +#: templates/user_stats.html:41 +msgid "thumb up" +msgstr "" -#: templates/user_stats.html:69 +#: templates/user_stats.html:42 msgid "user has voted up this many times" msgstr "" -#: templates/user_stats.html:74 +#: templates/user_stats.html:46 +msgid "thumb down" +msgstr "" + +#: templates/user_stats.html:47 msgid "user voted down this many times" msgstr "" -#: templates/user_stats.html:87 +#: templates/user_stats.html:54 msgid "Tags" msgstr "" -#: templates/user_stats.html:97 +#: templates/user_stats.html:61 #, python-format msgid "see other questions tagged '%(tag)s' " msgstr "" @@ -2139,6 +2153,10 @@ msgstr "" msgid "reputation history" msgstr "" +#: templates/user_tabs.html:23 +msgid "questions that user selected as his/her favorite" +msgstr "" + #: templates/user_tabs.html:24 msgid "favorites" msgstr "" @@ -2176,7 +2194,15 @@ msgstr "" msgid "this questions was selected as favorite" msgstr "" -#: templates/users_questions.html:33 +#: templates/users_questions.html:12 +msgid "thumb-up on" +msgstr "" + +#: templates/users_questions.html:19 +msgid "thumb-up off" +msgstr "" + +#: templates/users_questions.html:35 msgid "this answer has been accepted to be correct" msgstr "" @@ -2207,7 +2233,7 @@ msgstr "" "anyone, must be valid)" #: templates/authopenid/changeemail.html:31 -#: templates/authopenid/signin.html:136 +#: templates/authopenid/signin.html:154 msgid "Password" msgstr "" @@ -2219,6 +2245,12 @@ msgstr "" #, python-format msgid "validate %(email)s info" msgstr "" +"<span class=\"strong big\">An email with a validation link has been sent to %" +"(email)s.</span> Please <strong>follow the emailed link</strong> with your " +"web browser. Email validation is necessary to help insure the proper use of " +"email on <span class=\"orange\">Q&A</span> forum. If you would like " +"to use <strong>another email</strong>, please <a href=\"/email/change/" +"\"><strong>change it again</strong></a>." #: templates/authopenid/changeemail.html:50 msgid "Email not changed" @@ -2324,7 +2356,7 @@ msgstr "New user signup" #, python-format msgid "register new %(provider)s account info" msgstr "" -"<span class=\"big strong\">You are here for the first time with your %" +"<p><span class=\"big strong\">You are here for the first time with your %" "(provider)s login.</span> Please create your <strong>screen name</strong> " "and save your <strong>email</strong> address. Saved email address will let " "you <strong>subscribe for the updates</strong> on the most interesting " @@ -2336,7 +2368,7 @@ msgid "This account already exists, please use another." msgstr "" #: templates/authopenid/complete.html:19 templates/authopenid/complete.html:32 -#: templates/authopenid/signin.html:120 +#: templates/authopenid/signin.html:138 msgid "Sorry, looks like we have some errors:" msgstr "" @@ -2362,7 +2394,7 @@ msgstr "" msgid "user name" msgstr "" -#: templates/authopenid/complete.html:58 +#: templates/authopenid/complete.html:58 templates/authopenid/signin.html:128 msgid "password" msgstr "" @@ -2370,13 +2402,13 @@ msgstr "" msgid "Register" msgstr "" -#: templates/authopenid/complete.html:62 templates/authopenid/signin.html:138 +#: templates/authopenid/complete.html:62 templates/authopenid/signin.html:156 msgid "Forgot your password?" msgstr "" #: templates/authopenid/confirm_email.txt:2 msgid "Thank you for registering at our Q&A forum!" -msgstr "Thank you for registering at our Q&A forum!" +msgstr "" #: templates/authopenid/confirm_email.txt:4 msgid "Your account details are:" @@ -2559,77 +2591,87 @@ msgstr "" #: templates/authopenid/signin.html:40 msgid "Click to sign in through any of these services." msgstr "" -"<p><span class=\"big strong\">We accept <a href=\"http://openid.net" -"\">OpenID</a> login.</span> <font color=\"gray\">Instead of creating a new " -"password - log in through any of the services below.</font></p><p><span " -"class=\"big strong\">1. Select the login service by clicking one of the " -"icons</span></p>" +"<p><span class=\"big strong\">Please select your favorite login method below.</span>" +"</p><p><font color=\"gray\">External login services use <a " +"href=\"http://openid.net\"><b>OpenID</b></a> technology that increases " +"security of your online identity and makes login process simpler. First option " +"requires login name and password.</font></p>" -#: templates/authopenid/signin.html:103 +#: templates/authopenid/signin.html:113 msgid "Enter your <span id=\"enter_your_what\">Provider user name</span>" msgstr "" -"<span class=\"big strong\">2. Enter your <span id=\"enter_your_what" -"\">Provider user name</span></span><br/>(or select another OpenID provider " -"above)" +"<span class=\"big strong\">Enter your <span id=\"enter_your_what\">Provider " +"user name</span></span><br><span class='grey'>(or select another login method above)</span>" -#: templates/authopenid/signin.html:110 +#: templates/authopenid/signin.html:120 msgid "" "Enter your <a class=\"openid_logo\" href=\"http://openid.net\">OpenID</a> " "web address" msgstr "" -"<span class=\"big strong\">2. Enter your <a class=\"openid_logo\" href=" -"\"http://openid.net\">OpenID</a> web address</span><br/>(or choose specific " -"provider by clicking on one of the icons above)" +"<span class=\"big strong\">Enter your <a class=\"openid_logo\" href=\"http://" +"openid.net\">OpenID</a> web address</span><br><span class='grey'>(or choose another login " +"method above)</span>" -#: templates/authopenid/signin.html:112 templates/authopenid/signin.html:137 +#: templates/authopenid/signin.html:122 templates/authopenid/signin.html:130 +#: templates/authopenid/signin.html:155 msgid "Login" msgstr "" -#: templates/authopenid/signin.html:116 +#: templates/authopenid/signin.html:125 +msgid "Enter your login name and password" +msgstr "" +"<span class='big strong'>Enter your forum login and password</span><br/>" +"<span class='grey'>(or select your OpenID provider above)</span>" + +#: templates/authopenid/signin.html:126 +msgid "login name" +msgstr "" + +#: templates/authopenid/signin.html:134 msgid "we support two login modes" msgstr "" "You can log in either through one of these services or traditionally - using " "local username/password." -#: templates/authopenid/signin.html:134 +#: templates/authopenid/signin.html:152 msgid "Use login name and password" msgstr "" -#: templates/authopenid/signin.html:135 +#: templates/authopenid/signin.html:153 msgid "Login name" msgstr "" -#: templates/authopenid/signin.html:139 +#: templates/authopenid/signin.html:157 msgid "Create new account" msgstr "" -#: templates/authopenid/signin.html:148 +#: templates/authopenid/signin.html:166 msgid "Why use OpenID?" msgstr "" -#: templates/authopenid/signin.html:151 +#: templates/authopenid/signin.html:169 msgid "with openid it is easier" msgstr "With the OpenID you don't need to create new username and password." -#: templates/authopenid/signin.html:154 +#: templates/authopenid/signin.html:172 msgid "reuse openid" msgstr "You can safely re-use the same login for all OpenID-enabled websites." -#: templates/authopenid/signin.html:157 +#: templates/authopenid/signin.html:175 msgid "openid is widely adopted" msgstr "" "There are > 160,000,000 OpenID account in use. Over 10,000 sites are OpenID-" "enabled." -#: templates/authopenid/signin.html:160 +#: templates/authopenid/signin.html:178 msgid "openid is supported open standard" msgstr "OpenID is based on an open standard, supported by many organizations." -#: templates/authopenid/signin.html:165 +#: templates/authopenid/signin.html:183 msgid "Find out more" msgstr "" -#: templates/authopenid/signin.html:166 +#: templates/authopenid/signin.html:184 msgid "Get OpenID" msgstr "" @@ -2671,11 +2713,6 @@ msgstr "" msgid "Login with your OpenID" msgstr "" -#~ msgid "what is this website" -#~ msgstr "" -#~ "This is a collaboratively edited question and answer site for the " -#~ "Magnetic Resonance specialists." - # #~ msgid "editing tips" #~ msgstr "Tips" diff --git a/locale/es/LC_MESSAGES/django.mo b/locale/es/LC_MESSAGES/django.mo Binary files differindex 5f7daea0..91639ba1 100644 --- a/locale/es/LC_MESSAGES/django.mo +++ b/locale/es/LC_MESSAGES/django.mo diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po index e9e607fe..d7655dd7 100644 --- a/locale/es/LC_MESSAGES/django.po +++ b/locale/es/LC_MESSAGES/django.po @@ -2,21 +2,21 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-17 15:55+0000\n" -"PO-Revision-Date: 2009-08-17 09:55-0600\n" +"POT-Creation-Date: 2009-08-17 16:44+0000\n" +"PO-Revision-Date: 2009-08-17 10:04-0600\n" "Last-Translator: Bruno Sarlo <bsarlo@gmail.com>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: settings.py:12 urls.py:25 forum/views.py:305 forum/views.py:699 +#: settings.py:12 urls.py:25 forum/views.py:310 forum/views.py:705 msgid "account/" msgstr "cuenta/" #: settings.py:12 urls.py:26 django_authopenid/urls.py:9 #: django_authopenid/urls.py:10 django_authopenid/urls.py:11 -#: django_authopenid/urls.py:13 forum/views.py:305 forum/views.py:700 +#: django_authopenid/urls.py:13 forum/views.py:310 forum/views.py:706 msgid "signin/" msgstr "ingresar/" @@ -24,128 +24,132 @@ msgstr "ingresar/" msgid "upfiles/" msgstr "archivossubidos/" -#: urls.py:27 urls.py:28 urls.py:29 django_authopenid/urls.py:26 +#: urls.py:27 django_authopenid/urls.py:16 +msgid "signup/" +msgstr "registrarse/" + +#: urls.py:28 urls.py:29 urls.py:30 django_authopenid/urls.py:26 #: django_authopenid/urls.py:27 msgid "email/" msgstr "email/" -#: urls.py:27 +#: urls.py:28 msgid "change/" msgstr "cambiar/" -#: urls.py:28 +#: urls.py:29 msgid "sendkey/" msgstr "enviarclave/" -#: urls.py:29 +#: urls.py:30 msgid "verify/" msgstr "verificar/" -#: urls.py:30 +#: urls.py:31 msgid "about/" msgstr "acercadenosotros/" -#: urls.py:31 +#: urls.py:32 msgid "faq/" msgstr "preguntasfrecuentes/" -#: urls.py:32 +#: urls.py:33 msgid "privacy/" msgstr "códigodeprivacidad/" -#: urls.py:33 +#: urls.py:34 msgid "logout/" msgstr "cerrarsesion/" -#: urls.py:34 urls.py:35 urls.py:36 urls.py:48 forum/models.py:418 +#: urls.py:35 urls.py:36 urls.py:37 urls.py:49 forum/models.py:425 msgid "answers/" msgstr "respuestas/" -#: urls.py:34 urls.py:46 +#: urls.py:35 urls.py:47 msgid "comments/" msgstr "comentarios/" -#: urls.py:35 urls.py:40 urls.py:54 templates/user_info.html:34 +#: urls.py:36 urls.py:41 urls.py:55 templates/user_info.html:34 msgid "edit/" msgstr "editar/" -#: urls.py:36 urls.py:45 +#: urls.py:37 urls.py:46 msgid "revisions/" msgstr "revisiones/" -#: urls.py:37 urls.py:38 urls.py:39 urls.py:40 urls.py:41 urls.py:42 -#: urls.py:43 urls.py:44 urls.py:45 urls.py:46 urls.py:47 forum/feed.py:19 -#: forum/models.py:306 forum/views.py:1192 forum/views.py:1194 -#: forum/views.py:1434 +#: urls.py:38 urls.py:39 urls.py:40 urls.py:41 urls.py:42 urls.py:43 +#: urls.py:44 urls.py:45 urls.py:46 urls.py:47 urls.py:48 forum/feed.py:19 +#: forum/models.py:313 forum/views.py:1232 forum/views.py:1234 +#: forum/views.py:1474 msgid "questions/" msgstr "preguntas/" -#: urls.py:38 urls.py:64 +#: urls.py:39 urls.py:65 msgid "ask/" msgstr "preguntar/" -#: urls.py:39 +#: urls.py:40 msgid "unanswered/" msgstr "sinrespuesta/" -#: urls.py:41 +#: urls.py:42 msgid "close/" msgstr "cerrar/" -#: urls.py:42 +#: urls.py:43 msgid "reopen/" msgstr "reabrir/" -#: urls.py:43 +#: urls.py:44 msgid "answer/" msgstr "respuesta/" -#: urls.py:44 +#: urls.py:45 msgid "vote/" msgstr "votar/" -#: urls.py:47 urls.py:48 django_authopenid/urls.py:29 +#: urls.py:48 urls.py:49 django_authopenid/urls.py:29 msgid "delete/" msgstr "borrar/" -#: urls.py:50 +#: urls.py:51 msgid "question/" msgstr "pregunta/" -#: urls.py:51 urls.py:52 forum/views.py:741 forum/views.py:2031 +#: urls.py:52 urls.py:53 forum/views.py:747 forum/views.py:2071 msgid "tags/" msgstr "etiquetas/" -#: urls.py:53 urls.py:54 urls.py:55 forum/views.py:994 forum/views.py:998 -#: forum/views.py:1436 forum/views.py:1769 forum/views.py:2033 +#: urls.py:54 urls.py:55 urls.py:56 forum/views.py:1034 forum/views.py:1038 +#: forum/views.py:1476 forum/views.py:1809 forum/views.py:2073 msgid "users/" msgstr "usuarios/" -#: urls.py:56 urls.py:57 +#: urls.py:57 urls.py:58 msgid "badges/" msgstr "distinciones/" -#: urls.py:58 +#: urls.py:59 msgid "messages/" msgstr "mensajes/" -#: urls.py:58 +#: urls.py:59 msgid "markread/" msgstr "marcarleido/" -#: urls.py:60 +#: urls.py:61 msgid "nimda/" msgstr "administrador/" -#: urls.py:62 +#: urls.py:63 msgid "upload/" msgstr "subir/" -#: urls.py:63 urls.py:64 urls.py:65 +#: urls.py:64 urls.py:65 urls.py:66 msgid "books/" msgstr "libros/" -#: urls.py:66 +#: urls.py:67 msgid "search/" msgstr "buscar/" @@ -240,7 +244,7 @@ msgstr "la nueva contraseña no coincide" msgid "Incorrect username." msgstr "Nombre de usuario incorrecto" -#: django_authopenid/urls.py:10 forum/views.py:305 forum/views.py:700 +#: django_authopenid/urls.py:10 forum/views.py:310 forum/views.py:706 msgid "newquestion/" msgstr "nuevapregunta/" @@ -260,14 +264,19 @@ msgstr "completado/" msgid "register/" msgstr "registrarse/" -#: django_authopenid/urls.py:16 -msgid "signup/" -msgstr "registrarse/" - -#: django_authopenid/urls.py:18 +#: django_authopenid/urls.py:19 msgid "sendpw/" msgstr "enviarcontrasena/" +#: django_authopenid/urls.py:20 +#, fuzzy +msgid "password/" +msgstr "contraseña" + +#: django_authopenid/urls.py:20 +msgid "confirm/" +msgstr "" + #: django_authopenid/urls.py:27 msgid "validate/" msgstr "" @@ -523,8 +532,8 @@ msgstr "" "por favor use solo los siguientes caracteres en los nombres de etiquetas: " "letras 'a-z', números y caracteres '.-_#'" -#: forum/forms.py:75 templates/index.html:57 templates/question.html:209 -#: templates/question.html.py:395 templates/questions.html:58 +#: forum/forms.py:75 templates/index.html:57 templates/question.html:210 +#: templates/question.html.py:396 templates/questions.html:58 #: templates/questions.html.py:70 templates/unanswered.html:48 #: templates/unanswered.html.py:60 msgid "community wiki" @@ -550,76 +559,84 @@ msgstr "" "ingresa un breve resumen de tu revisión (ej. error ortográfico, gramática, " "mejoras de estilo. Este campo es opcional." -#: forum/forms.py:175 +#: forum/forms.py:98 forum/forms.py:159 +msgid "please choice a category" +msgstr "por favor escoja una categoría" + +#: forum/forms.py:99 forum/forms.py:160 +msgid "Category" +msgstr "Categoría" + +#: forum/forms.py:180 msgid "this email does not have to be linked to gravatar" msgstr "este email no tiene porque estar asociado a un Gravatar" -#: forum/forms.py:176 +#: forum/forms.py:181 msgid "Real name" msgstr "Nombre real" -#: forum/forms.py:177 +#: forum/forms.py:182 msgid "Website" msgstr "Sitio Web" -#: forum/forms.py:178 +#: forum/forms.py:183 msgid "Location" msgstr "Ubicación" -#: forum/forms.py:179 +#: forum/forms.py:184 msgid "Date of birth" msgstr "Fecha de nacimiento" -#: forum/forms.py:179 +#: forum/forms.py:184 msgid "will not be shown, used to calculate age, format: YYYY-MM-DD" msgstr "no será mostrado, usado para calcular la edad. Formato: YYY-MM-DD" -#: forum/forms.py:180 templates/authopenid/settings.html:21 +#: forum/forms.py:185 templates/authopenid/settings.html:21 msgid "Profile" msgstr "Perfil" -#: forum/forms.py:207 forum/forms.py:208 +#: forum/forms.py:212 forum/forms.py:213 msgid "this email has already been registered, please use another one" msgstr "este email ya ha sido registrado, por favor use otro" -#: forum/models.py:246 +#: forum/models.py:253 #, python-format msgid "%(author)s modified the question" msgstr "%(author)s modificó la pregunta" -#: forum/models.py:250 +#: forum/models.py:257 #, python-format msgid "%(people)s posted %(new_answer_count)s new answers" msgstr "%(people)s publicaron %(new_answer_count)s nuevas respuestas" -#: forum/models.py:255 +#: forum/models.py:262 #, python-format msgid "%(people)s commented the question" msgstr "%(people)s comentarion la pregunta" -#: forum/models.py:260 +#: forum/models.py:267 #, python-format msgid "%(people)s commented answers" msgstr "%(people)s comentaron la respuesta" -#: forum/models.py:262 +#: forum/models.py:269 #, python-format msgid "%(people)s commented an answer" msgstr "%(people)s comentaron la respuesta" -#: forum/models.py:306 forum/models.py:418 +#: forum/models.py:313 forum/models.py:425 msgid "revisions" msgstr "revisiones/" -#: forum/models.py:441 templates/badges.html:51 +#: forum/models.py:448 templates/badges.html:51 msgid "gold" msgstr "oro" -#: forum/models.py:442 templates/badges.html:59 +#: forum/models.py:449 templates/badges.html:59 msgid "silver" msgstr "plata" -#: forum/models.py:443 templates/badges.html:66 +#: forum/models.py:450 templates/badges.html:66 msgid "bronze" msgstr "bronce" @@ -707,27 +724,27 @@ msgstr "preferencias del usuario" msgid "profile - user preferences" msgstr "perfil - preferencia de " -#: forum/views.py:948 +#: forum/views.py:988 #, python-format msgid "subscription saved, %(email)s needs validation" msgstr "subscripción guardada, %(email)s necesita validación" -#: forum/views.py:1878 +#: forum/views.py:1918 msgid "uploading images is limited to users with >60 reputation points" msgstr "para subir imagenes debes tener más de 60 puntos de reputación" -#: forum/views.py:1880 +#: forum/views.py:1920 msgid "allowed file types are 'jpg', 'jpeg', 'gif', 'bmp', 'png', 'tiff'" msgstr "" "los tipos de archivos permitidos son 'jpg', 'jpeg', 'gif', 'bmp', 'png', " "'tiff'" -#: forum/views.py:1882 +#: forum/views.py:1922 #, python-format msgid "maximum upload file size is %sK" msgstr "tamaño máximo permitido es archivo %sK" -#: forum/views.py:1884 +#: forum/views.py:1924 #, python-format msgid "" "Error uploading file. Please contact the site administrator. Thank you. %s" @@ -851,22 +868,22 @@ msgid "select revision" msgstr "seleccionar revisión" #: templates/answer_edit.html:62 templates/ask.html:94 -#: templates/question.html:467 templates/question_edit.html:91 +#: templates/question.html:468 templates/question_edit.html:91 msgid "Toggle the real time Markdown editor preview" msgstr "Activar la visualización en tiempo real de Markdown" #: templates/answer_edit.html:62 templates/ask.html:94 -#: templates/question.html:467 templates/question_edit.html:91 +#: templates/question.html:468 templates/question_edit.html:91 msgid "toggle preview" msgstr "Activar previsualización" -#: templates/answer_edit.html:71 templates/question_edit.html:115 +#: templates/answer_edit.html:71 templates/question_edit.html:121 #: templates/question_retag.html:73 msgid "Save edit" msgstr "Guardar la edición" #: templates/answer_edit.html:72 templates/close.html:29 -#: templates/question_edit.html:116 templates/question_retag.html:74 +#: templates/question_edit.html:122 templates/question_retag.html:74 #: templates/reopen.html:30 templates/user_edit.html:83 #: templates/authopenid/changeemail.html:34 msgid "Cancel" @@ -957,15 +974,16 @@ msgstr "" "a>. <br/> Puedes enviar tu pregunta ahora y validar tu email luego. Tu " "pregunta será guardada mientras tanto y publicada cuando valides tu email." -#: templates/ask.html:107 +#: templates/ask.html:107 templates/ask.html.py:114 +#: templates/question_edit.html:117 msgid "(required)" msgstr "(requerido)" -#: templates/ask.html:114 +#: templates/ask.html:121 msgid "Login/signup to post your question" msgstr "Iniciar sesión/registrarse para publicar su pregunta" -#: templates/ask.html:116 +#: templates/ask.html:123 msgid "Ask your question" msgstr "Haz tu pregunta" @@ -1105,8 +1123,8 @@ msgstr "la respuesta ha sido aceptada como correcta" msgid "views" msgstr "vistas" -#: templates/book.html:125 templates/index.html:69 templates/question.html:499 -#: templates/questions.html:84 templates/questions.html.py:156 +#: templates/book.html:125 templates/index.html:69 templates/question.html:500 +#: templates/questions.html:84 templates/questions.html.py:157 #: templates/tags.html:49 templates/unanswered.html:75 #: templates/unanswered.html.py:106 templates/users_questions.html:54 msgid "using tags" @@ -1120,6 +1138,23 @@ msgstr "suscribirse al RSS del libro" msgid "subscribe to the questions feed" msgstr "suscribirse al agregado de noticias" +#: templates/categories.html:6 templates/categories.html.py:29 +msgid "Category list" +msgstr "Lista de Categorías" + +#: templates/categories.html:34 templates/tags.html:42 +msgid "Nothing found" +msgstr "Nada encontrado" + +#: templates/categories.html:40 +#, fuzzy +msgid "see questions that matches" +msgstr "ver preguntas etiquetadas" + +#: templates/categories.html:40 +msgid "category " +msgstr "categoría" + #: templates/close.html:6 templates/close.html.py:16 msgid "Close question" msgstr "Cerrar pregunta" @@ -1483,8 +1518,8 @@ msgstr "todas las preguntas" msgid "answers" msgstr "respuestas" -#: templates/index.html:69 templates/question.html:499 -#: templates/questions.html:84 templates/questions.html.py:156 +#: templates/index.html:69 templates/question.html:500 +#: templates/questions.html:84 templates/questions.html.py:157 #: templates/tags.html:49 templates/unanswered.html:75 #: templates/unanswered.html.py:106 templates/users_questions.html:54 msgid "see questions tagged" @@ -1633,7 +1668,7 @@ msgid "i like this post (click again to cancel)" msgstr "Me gusta esta entrada (clickear devuelta para cancelar)" #: templates/question.html:75 templates/question.html.py:89 -#: templates/question.html:289 +#: templates/question.html:290 msgid "current number of votes" msgstr "número actual de votos" @@ -1652,168 +1687,171 @@ msgstr "" "remover marca de favorito a esta pregunta (clickear devuelta para volver a " "marcar)" -#: templates/question.html:134 templates/question.html.py:322 +#: templates/question.html:128 templates/questions.html:87 +msgid "Category: " +msgstr "Categoría: " + +#: templates/question.html:135 templates/question.html.py:323 #: templates/revisions_answer.html:53 templates/revisions_question.html:53 msgid "edit" msgstr "editar" -#: templates/question.html:138 templates/question.html.py:332 +#: templates/question.html:139 templates/question.html.py:333 msgid "delete" msgstr "borrar" -#: templates/question.html:143 +#: templates/question.html:144 msgid "reopen" msgstr "re-abrir" -#: templates/question.html:148 +#: templates/question.html:149 msgid "close" msgstr "cerrar" -#: templates/question.html:154 templates/question.html.py:345 +#: templates/question.html:155 templates/question.html.py:346 msgid "" "report as offensive (i.e containing spam, advertising, malicious text, etc.)" msgstr "" "reportar como ofensivo (ej. contiene spam, publicidad, texto malicioso, etc.)" -#: templates/question.html:155 templates/question.html.py:346 +#: templates/question.html:156 templates/question.html.py:347 msgid "flag offensive" msgstr "marcar como ofensivo" -#: templates/question.html:167 templates/question.html.py:355 +#: templates/question.html:168 templates/question.html.py:356 #: templates/revisions_answer.html:65 templates/revisions_question.html:65 msgid "updated" msgstr "actualizado" -#: templates/question.html:216 templates/question.html.py:402 +#: templates/question.html:217 templates/question.html.py:403 #: templates/revisions_answer.html:63 templates/revisions_question.html:63 msgid "asked" msgstr "preguntado" -#: templates/question.html:246 templates/question.html.py:429 +#: templates/question.html:247 templates/question.html.py:430 msgid "comments" msgstr "comentarios" -#: templates/question.html:247 templates/question.html.py:430 +#: templates/question.html:248 templates/question.html.py:431 msgid "add comment" msgstr "agregar comentario" -#: templates/question.html:260 +#: templates/question.html:261 msgid "The question has been closed for the following reason" msgstr "La pregunta fue cerrada por el siguiente motivo " -#: templates/question.html:260 +#: templates/question.html:261 msgid "by" msgstr "por" -#: templates/question.html:262 -#, fuzzy +#: templates/question.html:263 msgid "close date " -msgstr "[cerrada]" +msgstr "fecha de cierre" -#: templates/question.html:269 templates/user_stats.html:13 +#: templates/question.html:270 templates/user_stats.html:13 msgid "Answers" msgstr "Respuestas" -#: templates/question.html:271 +#: templates/question.html:272 msgid "oldest answers will be shown first" msgstr "la respuesta mas vieja será mostrada primero" -#: templates/question.html:271 +#: templates/question.html:272 msgid "oldest answers" msgstr "pregunta más vieja" -#: templates/question.html:272 +#: templates/question.html:273 msgid "newest answers will be shown first" msgstr "preguntas más nuevas serán mostradas primero" -#: templates/question.html:272 +#: templates/question.html:273 msgid "newest answers" msgstr "más nuevas" -#: templates/question.html:273 +#: templates/question.html:274 msgid "most voted answers will be shown first" msgstr "las preguntas más votadas serán mostradas primero" -#: templates/question.html:273 +#: templates/question.html:274 msgid "popular answers" msgstr "respuestas populares" -#: templates/question.html:287 templates/question.html.py:288 +#: templates/question.html:288 templates/question.html.py:289 msgid "i like this answer (click again to cancel)" msgstr "me gusta esta respuesta (clickear devuelta para cancelar)" -#: templates/question.html:294 templates/question.html.py:295 +#: templates/question.html:295 templates/question.html.py:296 msgid "i dont like this answer (click again to cancel)" msgstr "no me gusta esta respuesta (clickear devuelta para cancelar)" -#: templates/question.html:300 templates/question.html.py:301 +#: templates/question.html:301 templates/question.html.py:302 msgid "mark this answer as favorite (click again to undo)" msgstr "marcar esta respuesta como favorita (clickear devuelta para deshacer)" -#: templates/question.html:306 templates/question.html.py:307 +#: templates/question.html:307 templates/question.html.py:308 msgid "the author of the question has selected this answer as correct" msgstr "el autor de esta pregunta ha seleccionado esta respuesta como correcta" -#: templates/question.html:329 +#: templates/question.html:330 msgid "undelete" msgstr "deshacer eliminar" -#: templates/question.html:339 +#: templates/question.html:340 msgid "answer permanent link" msgstr "enlace permanente a respuesta" -#: templates/question.html:340 +#: templates/question.html:341 msgid "permanent link" msgstr "enlace permanente" -#: templates/question.html:453 +#: templates/question.html:454 msgid "Your answer" msgstr "Tu respuesta" -#: templates/question.html:456 +#: templates/question.html:457 msgid "you can answer anonymously and then login" msgstr "puedes responder de forma anónima y luego ingresar" -#: templates/question.html:479 +#: templates/question.html:480 msgid "Answer the question" msgstr "Responde la pregunta" -#: templates/question.html:481 +#: templates/question.html:482 msgid "Notify me daily if there are any new answers." msgstr "Notificarme diariamente si hay nuevas respuestas." -#: templates/question.html:483 +#: templates/question.html:484 msgid "once you sign in you will be able to subscribe for any updates here" msgstr "" "una vez que hayas ingresado podrás suscribirte a cualquiera de las " "actualizaciones aquí." -#: templates/question.html:494 +#: templates/question.html:495 msgid "Question tags" msgstr "Tags de la pregunta" -#: templates/question.html:504 +#: templates/question.html:505 msgid "question asked" msgstr "pregunta preguntada" -#: templates/question.html:504 templates/question.html.py:510 +#: templates/question.html:505 templates/question.html.py:511 #: templates/user_info.html:51 msgid "ago" msgstr " atras" -#: templates/question.html:507 +#: templates/question.html:508 msgid "question was seen" msgstr "la pregunta fue vista" -#: templates/question.html:507 +#: templates/question.html:508 msgid "times" msgstr "veces" -#: templates/question.html:510 +#: templates/question.html:511 msgid "last updated" msgstr "última vez actualizada" -#: templates/question.html:515 +#: templates/question.html:516 msgid "Related questions" msgstr "Preguntas relacionadas" @@ -1878,7 +1916,7 @@ msgstr "preguntas actualizadas más recientemente" msgid "active" msgstr "actividad" -#: templates/questions.html:109 +#: templates/questions.html:110 #, python-format msgid "" "\n" @@ -1897,7 +1935,7 @@ msgstr[1] "" "\t\t\ttiene un total de %(q_num)s preguntas etiquetadas con %(tagname)s\n" "\t\t\t" -#: templates/questions.html:116 +#: templates/questions.html:117 #, python-format msgid "" "\n" @@ -1916,7 +1954,7 @@ msgstr[1] "" "\t\t\thay un total de %(q_num)s pregunta que contiene %(searchtitle)s\n" "\t\t\t" -#: templates/questions.html:122 +#: templates/questions.html:123 #, fuzzy, python-format msgid "" "\n" @@ -1929,36 +1967,36 @@ msgid_plural "" msgstr[0] "ver preguntas etiquetadas '%(tagname)s'" msgstr[1] "ver pregunta etiquetada '%(tagname)s'" -#: templates/questions.html:131 +#: templates/questions.html:132 msgid "latest questions info" msgstr "<strong>Más recientes</strong> preguntas son mostradas primero." -#: templates/questions.html:135 +#: templates/questions.html:136 msgid "Questions are sorted by the <strong>time of last update</strong>." msgstr "" "Las preguntas estan ordenadas por <strong>fecha de último update</strong>." -#: templates/questions.html:136 +#: templates/questions.html:137 msgid "Most recently answered ones are shown first." msgstr "Las más recientemente respondidas son mostradas primero." -#: templates/questions.html:140 +#: templates/questions.html:141 msgid "Questions sorted by <strong>number of responses</strong>." msgstr "Preguntas ordenadas por <strong>número de respuestas</strong>." -#: templates/questions.html:141 +#: templates/questions.html:142 msgid "Most answered questions are shown first." msgstr "Preguntas más respondidas aparecen primero." -#: templates/questions.html:145 +#: templates/questions.html:146 msgid "Questions are sorted by the <strong>number of votes</strong>." msgstr "Las preguntas son ordenadas por el <strong>número de votos</strong>." -#: templates/questions.html:146 +#: templates/questions.html:147 msgid "Most voted questions are shown first." msgstr "Las preguntas más votadas son mostradas primero." -#: templates/questions.html:153 templates/unanswered.html:102 +#: templates/questions.html:154 templates/unanswered.html:102 msgid "Related tags" msgstr "Etiquetas relacionadas" @@ -2023,10 +2061,6 @@ msgstr "Todas las etiquetas que coincidan con la busqueda" msgid "all tags - make this empty in english" msgstr "todas las tags" -#: templates/tags.html:42 -msgid "Nothing found" -msgstr "Nada encontrado" - #: templates/unanswered.html:7 templates/unanswered.html.py:18 msgid "Unanswered questions" msgstr "Preguntas sin respuesta" @@ -2262,7 +2296,7 @@ msgid "Your new Email" msgstr "Tu nuevo Email" #: templates/authopenid/changeemail.html:31 -#: templates/authopenid/signin.html:136 +#: templates/authopenid/signin.html:137 msgid "Password" msgstr "Contraseña" @@ -2370,7 +2404,7 @@ msgid "This account already exists, please use another." msgstr "Esta cuenta ya existe, por favor usar otra." #: templates/authopenid/complete.html:19 templates/authopenid/complete.html:32 -#: templates/authopenid/signin.html:120 +#: templates/authopenid/sendpw.html:16 templates/authopenid/signin.html:121 msgid "Sorry, looks like we have some errors:" msgstr "Ups, parece que hay errores:" @@ -2402,7 +2436,7 @@ msgstr "contraseña" msgid "Register" msgstr "Registrarse" -#: templates/authopenid/complete.html:62 templates/authopenid/signin.html:138 +#: templates/authopenid/complete.html:62 templates/authopenid/signin.html:139 msgid "Forgot your password?" msgstr "¿Olvidaste tu contraseña?" @@ -2546,7 +2580,7 @@ msgstr "" "Ingresa tu dirección (URL) de <a class=\"openid_logo\" href=\"http://openid." "net\">OpenID</a>" -#: templates/authopenid/signin.html:112 templates/authopenid/signin.html:137 +#: templates/authopenid/signin.html:112 templates/authopenid/signin.html:138 msgid "Login" msgstr "Ingresar" @@ -2554,48 +2588,48 @@ msgstr "Ingresar" msgid "we support two login modes" msgstr "soportamos dos tipos de ingreso" -#: templates/authopenid/signin.html:134 +#: templates/authopenid/signin.html:135 msgid "Use login name and password" msgstr "Nombre de usuario y contraseña" -#: templates/authopenid/signin.html:135 +#: templates/authopenid/signin.html:136 msgid "Login name" msgstr "Nombre de usuario" -#: templates/authopenid/signin.html:139 +#: templates/authopenid/signin.html:140 msgid "Create new account" msgstr "Crear cuenta nueva" -#: templates/authopenid/signin.html:148 +#: templates/authopenid/signin.html:149 msgid "Why use OpenID?" msgstr "¿Porqué usar OpenID?" -#: templates/authopenid/signin.html:151 +#: templates/authopenid/signin.html:152 msgid "with openid it is easier" msgstr "Con OpenID no necesitas crear un nuevo nombre de usuario y contraseña." -#: templates/authopenid/signin.html:154 +#: templates/authopenid/signin.html:155 msgid "reuse openid" msgstr "" "Puedes de forma segura re-usar el mismo nombre de usuario para todos los " "sitios que acepten OpenID." -#: templates/authopenid/signin.html:157 +#: templates/authopenid/signin.html:158 msgid "openid is widely adopted" msgstr "" "OpenID es extensamente usado. Hay más de 160,000,000 cuentas de OpenID en " "uso en el mundo. Mas de 10,000 sitios aceptan OpenID." -#: templates/authopenid/signin.html:160 +#: templates/authopenid/signin.html:161 msgid "openid is supported open standard" msgstr "" "OpenID es basado en un standard abierto, apoyado por muchas organizaciones." -#: templates/authopenid/signin.html:165 +#: templates/authopenid/signin.html:166 msgid "Find out more" msgstr "Averigua más" -#: templates/authopenid/signin.html:166 +#: templates/authopenid/signin.html:167 msgid "Get OpenID" msgstr "Adquiere una OpenID" @@ -2639,15 +2673,9 @@ msgstr "Registrate con tu OpenID" msgid "Login with your OpenID" msgstr "Ingresar con tu OpenID" -#~ msgid "" -#~ "The question has been closed for the following reason \"%(question." -#~ "get_close_reason_display)s\" by" -#~ msgstr "" -#~ "La pregunta ha sido cerrada por el siguiente motivo \"%(question." -#~ "get_close_reason_display)s\" por" - -#~ msgid "close date %(question.closed_at)s" -#~ msgstr "fecha de cerrada %(question.closed_at)s" +#, fuzzy +#~ msgid "complete list of quesionts" +#~ msgstr "lista completa de preguntas" #~ msgid "votes total" #~ msgstr "votos totales" diff --git a/templates/authopenid/sendpw.html b/templates/authopenid/sendpw.html index 383723ca..37091261 100644 --- a/templates/authopenid/sendpw.html +++ b/templates/authopenid/sendpw.html @@ -13,7 +13,7 @@ {% trans "Please enter your username below and new password will be sent to your registered e-mail" %} </div> {% if form.errors %} -<p class="errors"><span class="big">{% "Sorry, looks like we have some errors:" %}</span><br/> +<p class="errors"><span class="big">{% trans "Sorry, looks like we have some errors:" %}</span><br/> {% if form.username.errors %} <span class="error">{{ form.username.errors|join:", " }}</span> {% endif %} diff --git a/templates/authopenid/settings.html b/templates/authopenid/settings.html index a373324e..ecc16c72 100644 --- a/templates/authopenid/settings.html +++ b/templates/authopenid/settings.html @@ -31,7 +31,7 @@ <dt>» <a href="{% url user_changeemail %}">{% trans "Change email " %}</a></dt> <dd>{% trans "Add or update the email address associated with your account." %}</dd> {% if is_openid %} - <dt>» <a href="{% url user_changeopenid %}">{% trans "Change OpenID %}</a></dt> + <dt>» <a href="{% url user_changeopenid %}">{% trans "Change OpenID" %}</a></dt> <dd>{% trans "Change openid associated to your account" %}</dd> {% endif %} diff --git a/templates/authopenid/signin.html b/templates/authopenid/signin.html index 8601f6ee..60aa5e5d 100644 --- a/templates/authopenid/signin.html +++ b/templates/authopenid/signin.html @@ -37,14 +37,16 @@ {% endblocktrans %} </div> {% endif %} - <div style="width:600px;float:left;margin-bottom:5px;">{% trans "Click to sign in through any of these services." %}</div> <form id="openid_form" name="openid_form" class="openid" method="post" action="{% url user_signin %}"> + <div style="width:600px;float:left;margin-bottom:5px;"> + {% trans "Click to sign in through any of these services." %} + </div> <ul class="providers"> - <li class="openid" title="OpenID"> - <div class="logo_box openid_box"> - <img src="/content/jquery-openid/images/openid.gif" alt="icon" /> + <li class="local" title="Local login"> + <div class="logo_box local_login_box"> + <img src="/content/jquery-openid/images/local-login.png" alt="icon" /> </div> - <span><strong>http://{your-openid-url}</strong></span> + <span></span> </li> <li class="direct" title="Google"> <div class="logo_box google_box"> @@ -61,7 +63,17 @@ <img src="/content/jquery-openid/images/aol.gif" alt="icon" /><span>http://openid.aol.com/<strong>username</strong></span> </div> </li> - <li class="username first_tiny_li" title="MyOpenID user name"> + <!--<li class="openid" title="OpenID"> + <div class="logo_box openid_box"> + <img src="/content/jquery-openid/images/openid.gif" alt="icon" /> + </div> + <span><strong>http://{your-openid-url}</strong></span> + </li>--> + <li class="openid first_tiny_li" title="OpenID URL"> + <img src="/content/jquery-openid/images/openidico16.png" alt="icon" /> + <span>http://{your-openid-url}</span> + </li> + <li class="username" title="MyOpenID user name"> <img src="/content/jquery-openid/images/myopenid-2.png" alt="icon" /> <span>http://<strong>username</strong>.myopenid.com/</span> </li> @@ -111,36 +123,33 @@ <div><p><input id="openid_url" type="text" value="http://" name="openid_url" /> <input id="bsignin" name="bsignin" type="submit" value="{% trans "Login" %}" /></p></div> </fieldset> + <fieldset id='local_login_fs'> + <p>{% trans 'Enter your login name and password' %}</p> + {% if form1.errors %} + <p class="errors"> + <span class="big">{% trans "Sorry, looks like we have some errors:" %}</span><br/> + <ul class="error-list"> + {% if form1.username.errors %} + <li><span class="error">{{ form1.username.errors|join:", " }}</span></li> + {% endif %} + {% if form1.password.errors %} + <li><span class="error">{{ form1.password.errors|join:", " }}</span></li> + {% endif %} + </ul> + </p> + {% endif %} + <div><label for="username">{% trans "Login name" %}</label> + {{form1.username}}<br/> + <label for="password">{% trans "Password" %}</label> + {{form1.password}}<br/> + <p id="local_login_buttons"> + <input id="blogin" name="blogin" type="submit" value="{% trans "Login" %}" /> + <a href="{% url user_signup %}">{% trans "Create account" %}</a><br/> + <a href="{% url user_sendpw %}">{% trans "I forgot my password" %}</a> + </p> + </div> + </fieldset> </form> -<div class="login"> - <p style="display:none">{% trans "we support two login modes" %}</p> - <div style="display:none"> - {% if form1.errors %} - <p class="errors"> - <span class="big">{% trans "Sorry, looks like we have some errors:" %}</span><br/> - <ul class="error-list"> - {% if form1.username.errors %} - <li><span class="error">{{ form1.username.errors|join:", " }}</span></li> - {% endif %} - {% if form1.password.errors %} - <li><span class="error">{{ form1.password.errors|join:", " }}</span></li> - {% endif %} - </ul> - </p> - {% endif %} - <form name="fauth" action="{% url user_signin %}" method="post"> - {{ form1.next }} - <fieldset class="fieldset" > - <legend class="big">{% trans "Use login name and password" %}</legend> - <div class="form-row"><label for="id_username">{% trans "Login name" %}:</label><br />{{ form1.username }}</div> - <div class="form-row"><label for="id_password">{% trans "Password" %}:</label><br />{{ form1.password }}</div> - <div class="submit-row"><input type="submit" class="submit" name="blogin" value="{% trans "Login" %}"/> - <a href="">{% trans "Forgot your password?" %}</a> - <a href="">{% trans "Create new account" %}</a></div> - </fieldset> - </form> - </div> -</div> {% endblock %} {% block sidebar %} diff --git a/templates/content/jquery-openid/images/local-login.png b/templates/content/jquery-openid/images/local-login.png Binary files differnew file mode 100644 index 00000000..258cedac --- /dev/null +++ b/templates/content/jquery-openid/images/local-login.png diff --git a/templates/content/jquery-openid/images/openidico16.png b/templates/content/jquery-openid/images/openidico16.png Binary files differnew file mode 100644 index 00000000..ad718ac5 --- /dev/null +++ b/templates/content/jquery-openid/images/openidico16.png diff --git a/templates/content/jquery-openid/jquery.openid.js b/templates/content/jquery-openid/jquery.openid.js index eec29ab2..6486fd39 100644 --- a/templates/content/jquery-openid/jquery.openid.js +++ b/templates/content/jquery-openid/jquery.openid.js @@ -13,6 +13,7 @@ $.fn.openid = function() { var $end = $this.find('p:has(input[name=openid_username])>span:eq(1)'); //needed for special effects only + var $localfs = $this.find('fieldset:has(input[name=username])'); var $usrfs = $this.find('fieldset:has(input[name=openid_username])'); var $idfs = $this.find('fieldset:has(input[name=openid_url])'); @@ -33,11 +34,23 @@ $.fn.openid = function() { return true; }; + var local = function() { + var $li = $(this); + $li.parent().find('li').removeClass('highlight'); + $li.addClass('highlight'); + $usrfs.hide(); + $idfs.hide(); + $localfs.show(); + $this.unbind('submit').submit(submitid); + return false; + }; + var direct = function() { var $li = $(this); $li.parent().find('li').removeClass('highlight'); $li.addClass('highlight'); $usrfs.fadeOut('slow'); + $localfs.fadeOut('slow'); $idfs.fadeOut('slow'); $id.val($this.find("li.highlight span").text()); setTimeout(function(){$('#bsignin').click()},1000); @@ -49,6 +62,7 @@ $.fn.openid = function() { $li.parent().find('li').removeClass('highlight'); $li.addClass('highlight'); $usrfs.hide(); + $localfs.hide(); $idfs.show(); $id.focus(); $this.unbind('submit').submit(submitid); @@ -60,6 +74,7 @@ $.fn.openid = function() { $li.parent().find('li').removeClass('highlight'); $li.addClass('highlight'); $idfs.hide(); + $localfs.hide(); $usrfs.show(); $this.find('#enter_your_what').text($li.attr("title")); $front.text($li.find("span").text().split("username")[0]); @@ -69,6 +84,7 @@ $.fn.openid = function() { return false; }; + $this.find('li.local').click(local); $this.find('li.direct').click(direct); $this.find('li.openid').click(openid); $this.find('li.username').click(username); @@ -84,6 +100,9 @@ $.fn.openid = function() { }); $this.find('li span').hide(); $this.find('li').css('line-height', 0).css('cursor', 'pointer'); + $usrfs.hide(); + $idfs.hide(); + $localfs.hide(); $this.find('li:eq(0)').click(); return this; diff --git a/templates/content/jquery-openid/openid.css b/templates/content/jquery-openid/openid.css index 6c59192f..2ec8adf4 100644 --- a/templates/content/jquery-openid/openid.css +++ b/templates/content/jquery-openid/openid.css @@ -6,6 +6,7 @@ img {border-style:none;} .aol_box img {margin-top:6px;} .yahoo_box img {margin-top:13px;} .google_box img {margin-top:6px;} +.local_login_box img {margin-top:9px;} form.openid ul{ margin:0;padding:0;text-align:center; list-style-type:none; display:block;} form.openid ul li {float:left; padding:4px;} @@ -20,7 +21,22 @@ form.openid ul li.highlight { -moz-border-radius:4px; -webkit-border-radius:4px; form.openid fieldset div {-moz-border-radius:4px; -webkit-border-radius:4px; background: #DCDCDC; padding:10px;display:inline-block} +form.openid p {margin-bottom:4px;} form.openid fieldset div p {padding:0px;margin:0px;} +form.openid label { + display:inline-block; + font-weight:normal; + width:6em; + text-align:right; +} +#local_login_fs div { + padding-bottom:4px; +} +#local_login_buttons { + text-align:center; + line-height:1.8em; + margin-top:3px; +} /*form.openid input[type='submit'] {margin-left:1em;}*/ #openid_username {background:#ffffa0;} #openid_url {background:#ffffa0;} diff --git a/templates/content/style/style.css b/templates/content/style/style.css index 6d48198b..0fb96c7f 100644 --- a/templates/content/style/style.css +++ b/templates/content/style/style.css @@ -1093,7 +1093,9 @@ ul.bulleta li {background:url(/content/images/bullet_green.gif) no-repeat 0px 2p color:#d64000; font-weight:bold; } - +.grey { + color:#808080; +} .about div { padding:10px 5px 10px 5px; border-top:1px dashed #aaaaaa; diff --git a/templates/footer.html b/templates/footer.html index 9e877b42..7eb0205e 100644 --- a/templates/footer.html +++ b/templates/footer.html @@ -3,7 +3,7 @@ {% load i18n %} <!-- 页面底部开始: --> <div id="ground"> - <div class="footerLinks" > + <div class="footerLinks" > <a href="{% url about %}">{% trans "about" %}</a><span class="link-separator"> |</span> <a href="{% url faq %}">{% trans "faq" %}</a><span class="link-separator"> |</span> <a href="{{ blog_url }}">{% trans "blog" %}</a><span class="link-separator"> |</span> diff --git a/templates/question.html b/templates/question.html index 7f1ab3a5..c9446076 100644 --- a/templates/question.html +++ b/templates/question.html @@ -9,7 +9,7 @@ <meta name="description" content="{{question.summary}}" /> <meta name="keywords" content="{{question.tagname_meta_generator}}" /> <link rel="canonical" href="{{settings.APP_URL}}{{question.get_absolute_url}}"/> - {% if not question.closed and request.user.is_authenticated %} + {% if not question.closed %} <script type='text/javascript' src='/content/js/com.cnprog.editor.js'></script> <script type='text/javascript' src='/content/js/wmd/showdown.js'></script> <script type='text/javascript' src='/content/js/wmd/wmd.js'></script> @@ -259,7 +259,7 @@ <div class="question-status" style="margin-bottom:15px"> <h3>{% trans "The question has been closed for the following reason" %} "{{ question.get_close_reason_display }}" {% trans "by"%} <a href="{{ question.closed_by.get_profile_url }}">{{ question.closed_by.username }}</a> - {% blocktrans %}close date {% endblocktrans %}{{question.closed_at|date:"d-m-Y H:i"}}</h3> + {% blocktrans %}close date {% endblocktrans %} {{question.closed_at|date:"d-m-Y H:i"}}</h3> </div> {% endif %} |