From c93193cfbcea2788b3c16b849fa8f8d421620526 Mon Sep 17 00:00:00 2001
From: "sentry[bot]" <39604003+sentry[bot]@users.noreply.github.com>
Date: Sun, 24 May 2026 15:13:49 +0200
Subject: [PATCH] fix(locale): Handle blank locale submission gracefully
 (#1876)

Co-authored-by: sentry[bot] <39604003+sentry[bot]@users.noreply.github.com>
---
 app/controllers/users_controller.rb | 32 +++++++++++++++++------------
 app/models/user.rb                  |  1 +
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index d265734c6..ab88dcc15 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -27,21 +27,27 @@ class UsersController < ApplicationController
       end
     else
       was_ai_enabled = @user.ai_enabled
-      @user.update!(user_params.except(:redirect_to, :delete_profile_image))
-      @user.profile_image.purge if should_purge_profile_image?
+      if @user.update(user_params.except(:redirect_to, :delete_profile_image))
+        @user.profile_image.purge if should_purge_profile_image?
 
-      # Add a special notice if AI was just enabled or disabled
-      notice = if !was_ai_enabled && @user.ai_enabled
-        "AI Assistant has been enabled successfully."
-      elsif was_ai_enabled && !@user.ai_enabled
-        "AI Assistant has been disabled."
+        # Add a special notice if AI was just enabled or disabled
+        notice = if !was_ai_enabled && @user.ai_enabled
+          "AI Assistant has been enabled successfully."
+        elsif was_ai_enabled && !@user.ai_enabled
+          "AI Assistant has been disabled."
+        else
+          t(".success")
+        end
+
+        respond_to do |format|
+          format.html { handle_redirect(notice) }
+          format.json { head :ok }
+        end
       else
-        t(".success")
-      end
-
-      respond_to do |format|
-        format.html { handle_redirect(notice) }
-        format.json { head :ok }
+        respond_to do |format|
+          format.html { redirect_to settings_profile_path, alert: @user.errors.full_messages.to_sentence }
+          format.json { render json: { errors: @user.errors.full_messages }, status: :unprocessable_entity }
+        end
       end
     end
   end
diff --git a/app/models/user.rb b/app/models/user.rb
index b1c40bb76..74016d755 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -51,6 +51,7 @@ class User < ApplicationRecord
   validates :password, length: { minimum: 8 }, allow_nil: true
   normalizes :email, with: ->(email) { email.strip.downcase }
   normalizes :unconfirmed_email, with: ->(email) { email&.strip&.downcase }
+  normalizes :locale, with: ->(locale) { locale.presence }
 
   normalizes :first_name, :last_name, with: ->(value) { value.strip.presence }