@@ -59,16 +59,16 @@ def callback(oauth_token):
|
||||
if userByGithub is None:
|
||||
current_user.github_username = username
|
||||
db.session.commit()
|
||||
flash(gettext("Linked github to account"), "success")
|
||||
flash(gettext("Linked GitHub to account"), "success")
|
||||
return redirect(url_for("homepage.home"))
|
||||
else:
|
||||
flash(gettext("Github account is already associated with another user"), "danger")
|
||||
flash(gettext("GitHub account is already associated with another user"), "danger")
|
||||
return redirect(url_for("homepage.home"))
|
||||
|
||||
# If not logged in, log in
|
||||
else:
|
||||
if userByGithub is None:
|
||||
flash(gettext("Unable to find an account for that Github user"), "danger")
|
||||
flash(gettext("Unable to find an account for that GitHub user"), "danger")
|
||||
return redirect(url_for("users.claim_forums"))
|
||||
|
||||
ret = login_user_set_active(userByGithub, remember=True)
|
||||
|
||||
@@ -44,7 +44,7 @@ def checkForumAccount(username, forceNoSave=False):
|
||||
# Get github username
|
||||
github_username = profile.get("github")
|
||||
if github_username is not None and github_username.strip() != "":
|
||||
print("Updated github username for " + user.display_name + " to " + github_username)
|
||||
print("Updated GitHub username for " + user.display_name + " to " + github_username)
|
||||
user.github_username = github_username
|
||||
needsSaving = True
|
||||
|
||||
|
||||
@@ -52,9 +52,8 @@
|
||||
|
||||
<noscript>
|
||||
<div class="alert alert-warning">
|
||||
{{ _("Javascript is needed to improve the user interface, and is needed for features
|
||||
such as finding metadata from git, and autocompletion.") }}<br />
|
||||
{{ _("Whilst disabled Javascript may work, it is not officially supported.") }}
|
||||
{{ _("JavaScript is needed to improve the user interface, and is needed for features
|
||||
such as finding metadata from git, and autocompletion.") }}
|
||||
</div>
|
||||
</noscript>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user