diff options
| author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2011-12-10 11:56:58 -0300 |
|---|---|---|
| committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2011-12-10 11:56:58 -0300 |
| commit | 3d89144ab906b6f2c9ab609a4193a3be0c716512 (patch) | |
| tree | 01382fe7c87dbc29a0e5ef4d4390d13fb8454835 | |
| parent | a0ef331191fa8e1c7a7a9816f1cf35ed6b9bfe59 (diff) | |
| download | askbot-3d89144ab906b6f2c9ab609a4193a3be0c716512.tar.gz askbot-3d89144ab906b6f2c9ab609a4193a3be0c716512.tar.bz2 askbot-3d89144ab906b6f2c9ab609a4193a3be0c716512.zip | |
made facebook login method deletable again and fixed a wrong translation string in English
| -rw-r--r-- | askbot/deps/django_authopenid/views.py | 2 | ||||
| -rw-r--r-- | askbot/locale/en/LC_MESSAGES/django.po | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/askbot/deps/django_authopenid/views.py b/askbot/deps/django_authopenid/views.py index ac406f1d..e9059c61 100644 --- a/askbot/deps/django_authopenid/views.py +++ b/askbot/deps/django_authopenid/views.py @@ -554,8 +554,6 @@ def show_signin_view( #annotate objects with extra data providers = util.get_enabled_login_providers() for login_method in existing_login_methods: - if login_method.provider_name == 'facebook': - continue#it is disabled try: provider_data = providers[login_method.provider_name] if provider_data['type'] == 'password': diff --git a/askbot/locale/en/LC_MESSAGES/django.po b/askbot/locale/en/LC_MESSAGES/django.po index ca813006..9e8c30a2 100644 --- a/askbot/locale/en/LC_MESSAGES/django.po +++ b/askbot/locale/en/LC_MESSAGES/django.po @@ -4026,7 +4026,7 @@ msgid "last used" msgstr "" msgid "cannot be deleted" -msgstr "sorry, but older votes cannot be revoked" +msgstr "" msgid "with openid it is easier" msgstr "With the OpenID you don't need to create new username and password." |