From 0c3cf0128ae83357070be573fb5f6640a0257c7f Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Tue, 13 Sep 2022 11:59:29 +0200 Subject: [PATCH] "That" -> "This" --- files/mail/__init__.py | 2 +- files/routes/discord.py | 2 +- files/routes/login.py | 6 +++--- files/routes/settings.py | 4 ++-- files/routes/users.py | 12 ++++++------ 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/files/mail/__init__.py b/files/mail/__init__.py index 283e1011b6..a36a38731d 100644 --- a/files/mail/__init__.py +++ b/files/mail/__init__.py @@ -66,7 +66,7 @@ def activate(v): if int(time.time()) - timestamp > 3600: return render_template("message.html", v=v, title="Verification link expired.", - message="That link has expired. Visit your settings to send yourself another verification email."), 410 + message="This link has expired. Visit your settings to send yourself another verification email."), 410 user = get_account(id) diff --git a/files/routes/discord.py b/files/routes/discord.py index d481e23a28..23373758d7 100644 --- a/files/routes/discord.py +++ b/files/routes/discord.py @@ -83,7 +83,7 @@ def discord_redirect(v): requests.delete(url, headers=headers, timeout=5) if g.db.query(User).filter(User.id!=v.id, User.discord_id==x["id"]).one_or_none(): - return render_template("message.html", title="Discord account already linked.", error="That Discord account is already in use by another user.", v=v) + return render_template("message.html", title="Discord account already linked.", error="This Discord account is already in use by another user.", v=v) v.discord_id=x["id"] g.db.add(v) diff --git a/files/routes/login.py b/files/routes/login.py index bd05961cbe..390895c598 100644 --- a/files/routes/login.py +++ b/files/routes/login.py @@ -435,7 +435,7 @@ def get_reset(): if now - timestamp > 600: return render_template("message.html", title="Password reset link expired", - error="That password reset link has expired.") + error="This password reset link has expired.") user = get_account(user_id) @@ -475,7 +475,7 @@ def post_reset(v): if now - timestamp > 600: return render_template("message.html", title="Password reset expired", - error="That password reset form has expired.") + error="This password reset form has expired.") user = get_account(user_id) @@ -558,7 +558,7 @@ def reset_2fa(): if now > t+3600*24: return render_template("message.html", title="Expired Link", - error="That link has expired.") + error="This link has expired.") token=request.values.get("token") uid=request.values.get("id") diff --git a/files/routes/settings.py b/files/routes/settings.py index 5763c93f09..a7833d9b82 100644 --- a/files/routes/settings.py +++ b/files/routes/settings.py @@ -431,7 +431,7 @@ def settings_security_post(v): new_email = request.values.get("new_email","").strip().lower() if new_email == v.email: - return render_template("settings_security.html", v=v, error="That email is already yours!") + return render_template("settings_security.html", v=v, error="This email is already yours!") url = f"{SITE_FULL}/activate" @@ -620,7 +620,7 @@ def settings_profilecss(v): def settings_block_user(v): user = get_user(request.values.get("username"), graceful=True) - if not user: return {"error": "That user doesn't exist."}, 404 + if not user: return {"error": "This user doesn't exist."}, 404 if user.unblockable: if not v.shadowbanned: diff --git a/files/routes/users.py b/files/routes/users.py index 73ee51519f..f863a5310a 100644 --- a/files/routes/users.py +++ b/files/routes/users.py @@ -415,7 +415,7 @@ def get_coins(v, username): def transfer_coins(v, username): receiver = get_user(username) - if receiver is None: return {"error": "That user doesn't exist."}, 404 + if receiver is None: return {"error": "This user doesn't exist."}, 404 if receiver.id != v.id: amount = request.values.get("amount", "").strip() @@ -460,7 +460,7 @@ def transfer_coins(v, username): def transfer_bux(v, username): receiver = get_user(username) - if not receiver: return {"error": "That user doesn't exist."}, 404 + if not receiver: return {"error": "This user doesn't exist."}, 404 if receiver.id != v.id: amount = request.values.get("amount", "").strip() @@ -957,7 +957,7 @@ def u_username(username, v=None): if u.reserved: if request.headers.get("Authorization") or request.headers.get("xhr") or request.path.endswith(".json"): - return {"error": f"That username is reserved for: {u.reserved}"}, 418 + return {"error": f"This username is reserved for: {u.reserved}"}, 418 return render_template("userpage_reserved.html", u=u, v=v) @@ -977,7 +977,7 @@ def u_username(username, v=None): if u.is_private and (not v or (v.id != u.id and v.admin_level < 2 and not v.eye)): if request.headers.get("Authorization") or request.headers.get("xhr") or request.path.endswith(".json"): - return {"error": "That userpage is private"}, 403 + return {"error": "This userpage is private"}, 403 return render_template("userpage_private.html", u=u, v=v) @@ -1065,13 +1065,13 @@ def u_username_comments(username, v=None): if u.reserved: if request.headers.get("Authorization") or request.headers.get("xhr") or request.path.endswith(".json"): - return {"error": f"That username is reserved for: {u.reserved}"}, 418 + return {"error": f"This username is reserved for: {u.reserved}"}, 418 return render_template("userpage_reserved.html", u=u, v=v) if u.is_private and (not v or (v.id != u.id and v.admin_level < 2 and not v.eye)): if request.headers.get("Authorization") or request.headers.get("xhr") or request.path.endswith(".json"): - return {"error": "That userpage is private"}, 403 + return {"error": "This userpage is private"}, 403 return render_template("userpage_private.html", u=u, v=v) if v and hasattr(u, 'is_blocking') and u.is_blocking: