diff options
| -rw-r--r-- | askbot/conf/login_providers.py | 22 | ||||
| -rw-r--r-- | askbot/deps/django_authopenid/util.py | 8 | ||||
| -rw-r--r-- | setup.py | 2 |
3 files changed, 12 insertions, 20 deletions
diff --git a/askbot/conf/login_providers.py b/askbot/conf/login_providers.py index ea63ae7b..a7357fe8 100644 --- a/askbot/conf/login_providers.py +++ b/askbot/conf/login_providers.py @@ -16,7 +16,7 @@ settings.register( LOGIN_PROVIDERS, 'PASSWORD_REGISTER_SHOW_PROVIDER_BUTTONS', default = True, - description=_('Show alternative logn provider buttons on the password Sign Up page'), + description=_('Show alternative login provider buttons on the password "Sign Up" page'), ) ) @@ -25,27 +25,27 @@ settings.register( LOGIN_PROVIDERS, 'SIGNIN_ALWAYS_SHOW_LOCAL_LOGIN', default = False, - description=_('Always display local login and hide Askbot button.'), + description=_('Always display local login form and hide "Askbot" button.'), ) ) providers = ( - 'Twitter', - 'Google', - 'LinkedIn', - 'Yahoo', + 'Local', 'AOL', - 'OpenID', + 'Blogger', + 'ClaimID', 'Facebook', - 'Local', 'Flickr', + 'Google', + 'Twitter', + 'LinkedIn', + 'LiveJournal', + 'OpenID', 'Technorati', 'Wordpress', - 'Blogger', - 'LiveJournal', - 'ClaimID', 'Vidoop', 'Verisign' + 'Yahoo', ) need_extra_setup = ('Twitter', 'Facebook', 'LinkedIn') diff --git a/askbot/deps/django_authopenid/util.py b/askbot/deps/django_authopenid/util.py index 3a2fd122..355854bb 100644 --- a/askbot/deps/django_authopenid/util.py +++ b/askbot/deps/django_authopenid/util.py @@ -303,14 +303,6 @@ def get_minor_login_providers(): 'icon_media_path': '/jquery-openid/images/flickr.png', 'openid_endpoint': 'http://flickr.com/%(username)s/' } - data['flickr'] = { - 'name': 'flickr', - 'display_name': 'Flickr', - 'type': 'openid-username', - 'extra_token_name': _('Flickr user name'), - 'icon_media_path': '/jquery-openid/images/flickr.png', - 'openid_endpoint': 'http://flickr.com/%(username)s/' - } data['technorati'] = { 'name': 'technorati', 'display_name': 'Technorati', @@ -21,7 +21,7 @@ install_requires = [ 'unidecode', 'django-countries==1.0.5', 'django-celery==2.2.3', - 'djkombu==0.9.2', + 'django-kombu==0.9.2', ] import askbot |