FIX: Updating a user profile as admin shouldn't change the user's locale

app/controllers/users_controller.rb

@@ -352,6 +352,8 @@ class UsersController < ApplicationController
       return fail_with("login.reserved_username")
     end
 
+    params[:locale] ||= I18n.locale unless current_user
+
     new_user_params = user_params
     user = User.unstage(new_user_params)
     user = User.new(new_user_params) if user.nil?
@@ -1259,8 +1261,7 @@ class UsersController < ApplicationController
       .permit(permitted, theme_ids: [])
       .reverse_merge(
         ip_address: request.remote_ip,
-        registration_ip_address: request.remote_ip,
-        locale: user_locale
+        registration_ip_address: request.remote_ip
       )
 
     if !UsernameCheckerService.is_developer?(result['email']) &&
@@ -1279,10 +1280,6 @@ class UsersController < ApplicationController
     attrs
   end
 
-  def user_locale
-    I18n.locale
-  end
-
   def fail_with(key)
     render json: { success: false, message: I18n.t(key) }
   end