diff options
| author | Bruno Sarlo <bruno@bruno-laptop.(none)> | 2009-08-08 21:44:10 -0300 |
|---|---|---|
| committer | Bruno Sarlo <bruno@bruno-laptop.(none)> | 2009-08-08 21:44:10 -0300 |
| commit | 0161159eb5b84d11908c16c6c86f93e1a8ac3c18 (patch) | |
| tree | 871b0856af5e2dd5b816ee419857a38f80cd6b87 /django_authopenid/urls.py | |
| parent | 0b80e6ba3fa528df2fc64a1a2e3a9f58dec39ec5 (diff) | |
| parent | 46da3fdbe80ea1f6b9278d2671757d5fdb8abcfb (diff) | |
| download | askbot-0161159eb5b84d11908c16c6c86f93e1a8ac3c18.tar.gz askbot-0161159eb5b84d11908c16c6c86f93e1a8ac3c18.tar.bz2 askbot-0161159eb5b84d11908c16c6c86f93e1a8ac3c18.zip | |
Merge branch 'master' of git://github.com/evgenyfadeev/CNPROG
* Merge of Spanish translation, still missing some texts.
* Custom colors for preguntalo project
Conflicts:
locale/es/LC_MESSAGES/django.mo
locale/es/LC_MESSAGES/django.po
templates/content/style/style.css
Diffstat (limited to 'django_authopenid/urls.py')
| -rw-r--r-- | django_authopenid/urls.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/django_authopenid/urls.py b/django_authopenid/urls.py index 1ab65941..6843e5c0 100644 --- a/django_authopenid/urls.py +++ b/django_authopenid/urls.py @@ -7,6 +7,8 @@ urlpatterns = patterns('django_authopenid.views', url(r'^yadis.xrdf$', 'xrdf', name='yadis_xrdf'), # manage account registration url(r'^%s$' % _('signin/'), 'signin', name='user_signin'), + url(r'^%s%s$' % (_('signin/'),_('newquestion/')), 'signin', kwargs = {'newquestion':True}), + url(r'^%s%s$' % (_('signin/'),_('newanswer/')), 'signin', kwargs = {'newanswer':True}), url(r'^%s$' % _('signout/'), 'signout', name='user_signout'), url(r'^%s%s$' % (_('signin/'), _('complete/')), 'complete_signin', name='user_complete_signin'), @@ -21,7 +23,8 @@ urlpatterns = patterns('django_authopenid.views', # manage account settings #url(r'^$', 'account_settings', name='user_account_settings'), #url(r'^%s$' % _('password/'), 'changepw', name='user_changepw'), - #url(r'^%s$' % _('email/'), 'changeemail', name='user_changeemail'), + 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'), url(r'^%s$' % _('delete/'), 'delete', name='user_delete'), ) |