diff --git a/app/routes/change_password.py b/app/routes/change_password.py index cf255ed8b..c1112a95a 100755 --- a/app/routes/change_password.py +++ b/app/routes/change_password.py @@ -49,7 +49,7 @@ def change_password(): page="change_password", message="login", category="error", - language=session["language"], + language=session.get("language", "en"), ) return redirect("/login/redirect=change-password") @@ -59,7 +59,7 @@ def change_password(): page="change_password", message="same", category="error", - language=session["language"], + language=session.get("language", "en"), ) if password != password_confirm: @@ -67,7 +67,7 @@ def change_password(): page="change_password", message="match", category="error", - language=session["language"], + language=session.get("language", "en"), ) if old_password != password and password == password_confirm: @@ -93,7 +93,7 @@ def change_password(): page="change_password", message="old", category="error", - language=session["language"], + language=session.get("language", "en"), ) return render_template( diff --git a/app/routes/change_profile_picture.py b/app/routes/change_profile_picture.py index 477334d51..01d6760ff 100755 --- a/app/routes/change_profile_picture.py +++ b/app/routes/change_profile_picture.py @@ -56,7 +56,7 @@ def change_profile_picture(): page="change_profile_picture", message="success", category="success", - language=session["language"], + language=session.get("language", "en"), ) return redirect("/account-settings") diff --git a/app/routes/change_username.py b/app/routes/change_username.py index b5c2c1f2a..ad62b2cca 100755 --- a/app/routes/change_username.py +++ b/app/routes/change_username.py @@ -73,7 +73,7 @@ def change_username(): page="change_username", message="success", category="success", - language=session["language"], + language=session.get("language", "en"), ) return redirect("/account-settings") @@ -83,7 +83,7 @@ def change_username(): page="change_username", message="taken", category="error", - language=session["language"], + language=session.get("language", "en"), ) return render_template( diff --git a/app/routes/create_post.py b/app/routes/create_post.py index 978eb76bd..34a137e5b 100755 --- a/app/routes/create_post.py +++ b/app/routes/create_post.py @@ -49,7 +49,7 @@ def create_post(): page="create_post", message="empty", category="error", - language=session["language"], + language=session.get("language", "en"), ) Log.error( f'User: "{session["username"]}" tried to create a post with ' @@ -87,7 +87,7 @@ def create_post(): page="create_post", message="success", category="success", - language=session["language"], + language=session.get("language", "en"), ) return redirect("/") diff --git a/app/routes/edit_post.py b/app/routes/edit_post.py index 9cd682812..ba0bcf1fe 100755 --- a/app/routes/edit_post.py +++ b/app/routes/edit_post.py @@ -64,7 +64,7 @@ def edit_post(url_id): page="edit_post", message="empty", category="error", - language=session["language"], + language=session.get("language", "en"), ) Log.error( f'User: "{session["username"]}" tried to edit a post with empty content', @@ -88,7 +88,7 @@ def edit_post(url_id): page="edit_post", message="success", category="success", - language=session["language"], + language=session.get("language", "en"), ) return redirect(f"/post/{post.url_id}") @@ -105,7 +105,7 @@ def edit_post(url_id): page="edit_post", message="author", category="error", - language=session["language"], + language=session.get("language", "en"), ) Log.error( f'User: "{session["username"]}" tried to edit another authors post', diff --git a/app/routes/login.py b/app/routes/login.py index 92eaa60c3..9a69fb42e 100755 --- a/app/routes/login.py +++ b/app/routes/login.py @@ -64,7 +64,7 @@ def login(direct): page="login", message="not_found", category="error", - language=session["language"], + language=session.get("language", "en"), ) else: if encryption.verify(password, user.password): @@ -76,7 +76,7 @@ def login(direct): page="login", message="success", category="success", - language=session["language"], + language=session.get("language", "en"), ) return ( @@ -90,7 +90,7 @@ def login(direct): page="login", message="password", category="error", - language=session["language"], + language=session.get("language", "en"), ) return render_template( diff --git a/app/routes/password_reset.py b/app/routes/password_reset.py index 26f48d7de..a61cf53de 100755 --- a/app/routes/password_reset.py +++ b/app/routes/password_reset.py @@ -62,7 +62,7 @@ def password_reset(code_sent): page="password_reset", message="not_found", category="error", - language=session["language"], + language=session.get("language", "en"), ) else: if password == password_confirm: @@ -71,7 +71,7 @@ def password_reset(code_sent): page="password_reset", message="same", category="error", - language=session["language"], + language=session.get("language", "en"), ) else: password_reset_codes_storage.pop(username) @@ -84,7 +84,7 @@ def password_reset(code_sent): page="password_reset", message="success", category="success", - language=session["language"], + language=session.get("language", "en"), ) return redirect("/login/redirect=&") else: @@ -92,14 +92,14 @@ def password_reset(code_sent): page="password_reset", message="match", category="error", - language=session["language"], + language=session.get("language", "en"), ) else: flash_message( page="password_reset", message="wrong", category="error", - language=session["language"], + language=session.get("language", "en"), ) return render_template( @@ -163,7 +163,7 @@ def password_reset(code_sent): page="password_reset", message="code", category="success", - language=session["language"], + language=session.get("language", "en"), ) return redirect("/password-reset/codesent=true") else: @@ -172,7 +172,7 @@ def password_reset(code_sent): page="password_reset", message="not_found", category="error", - language=session["language"], + language=session.get("language", "en"), ) return render_template( diff --git a/app/routes/post.py b/app/routes/post.py index 72f8d27e2..f32486cc7 100755 --- a/app/routes/post.py +++ b/app/routes/post.py @@ -80,7 +80,7 @@ def post(url_id=None, slug=None): page="post", message="success", category="success", - language=session["language"], + language=session.get("language", "en"), ) return redirect(url_for("post.post", url_id=url_id)), 301 diff --git a/app/routes/set_language.py b/app/routes/set_language.py index c4324ff8d..4367cea63 100644 --- a/app/routes/set_language.py +++ b/app/routes/set_language.py @@ -24,7 +24,7 @@ def set_language(language): page="set_language", message="success", category="success", - language=session["language"], + language=session.get("language", "en"), ) else: Log.warning(f"Language not supported: {language}") diff --git a/app/routes/signup.py b/app/routes/signup.py index 0c66d51ff..00d66d88f 100755 --- a/app/routes/signup.py +++ b/app/routes/signup.py @@ -92,7 +92,7 @@ def signup(): page="signup", message="success", category="success", - language=session["language"], + language=session.get("language", "en"), ) # Send welcome email (with error handling) @@ -157,7 +157,7 @@ def signup(): page="signup", message="ascii", category="error", - language=session["language"], + language=session.get("language", "en"), ) else: Log.error("Passwords do not match") @@ -166,7 +166,7 @@ def signup(): page="signup", message="password", category="error", - language=session["language"], + language=session.get("language", "en"), ) if username_taken and email_taken: @@ -175,7 +175,7 @@ def signup(): page="signup", message="taken", category="error", - language=session["language"], + language=session.get("language", "en"), ) if not username_taken and email_taken: Log.error(f'This email "{email}" is unavailable') @@ -184,7 +184,7 @@ def signup(): page="signup", message="email", category="error", - language=session["language"], + language=session.get("language", "en"), ) if username_taken and not email_taken: @@ -194,7 +194,7 @@ def signup(): page="signup", message="username", category="error", - language=session["language"], + language=session.get("language", "en"), ) return render_template( diff --git a/app/routes/verify_user.py b/app/routes/verify_user.py index 904c32e1d..c6ff6708e 100755 --- a/app/routes/verify_user.py +++ b/app/routes/verify_user.py @@ -64,7 +64,7 @@ def verify_user(code_sent): page="verify_user", message="success", category="success", - language=session["language"], + language=session.get("language", "en"), ) return redirect("/") else: @@ -72,7 +72,7 @@ def verify_user(code_sent): page="verify_user", message="wrong", category="error", - language=session["language"], + language=session.get("language", "en"), ) return render_template( diff --git a/app/utils/delete.py b/app/utils/delete.py index 0766f79a7..4b45da5de 100644 --- a/app/utils/delete.py +++ b/app/utils/delete.py @@ -55,7 +55,7 @@ def delete_post(post_id, username=None): page="delete", message="post", category="error", - language=session["language"], + language=session.get("language", "en"), ) Log.success(f'Post: "{post_id}" deleted by "{username}"') return True @@ -89,7 +89,7 @@ def delete_user(username): page="delete", message="user", category="error", - language=session["language"], + language=session.get("language", "en"), ) Log.success(f'User: "{username}" deleted') @@ -134,7 +134,7 @@ def delete_comment(comment_id, username=None): page="delete", message="comment", category="error", - language=session["language"], + language=session.get("language", "en"), ) Log.success(f'Comment: "{comment_id}" deleted by "{username}"') return True