Merge remote branch 'remotes/aaronw/bug614_verification_crash'
authorElrond <elrond+mediagoblin.org@samba-tng.org>
Sun, 20 Nov 2011 19:00:08 +0000 (20:00 +0100)
committerElrond <elrond+mediagoblin.org@samba-tng.org>
Sun, 20 Nov 2011 19:00:08 +0000 (20:00 +0100)
commite51af0e62000b190d6aa828719080a96886210fb
tree71e83833165abd460c1af9009022e4feb0d29ff4
parent0b3cdd6a25f8aaa74beecb7fed32a20cc13587a8
parent2a8c1b058b43cfcdeb06f711bbf44af9432af410
Merge remote branch 'remotes/aaronw/bug614_verification_crash'

* remotes/aaronw/bug614_verification_crash:
  Update english translation file.
  Reverse order of sanity checks: check email_verified after making sure there's a user in the request.
  Make sure user isn't already verified before resending verification.
  Check request.user to determine if user is logged in.
  Regenerated English .po file to include new string.
  Display and error and redirect to login page if unauthenticated user tries to access resend_verification.

Conflicts:
mediagoblin/i18n/en/LC_MESSAGES/mediagoblin.po
mediagoblin/auth/views.py
mediagoblin/i18n/en/LC_MESSAGES/mediagoblin.po