fix i18n

app/controllers/accounts_controller.rb

@@ -33,7 +33,9 @@ class AccountsController < ApplicationController
 
     Docuseal.refresh_default_url_options!
 
-    redirect_to settings_account_path, notice: I18n.t('account_information_has_been_updated')
+    with_locale do
+      redirect_to settings_account_path, notice: I18n.t('account_information_has_been_updated')
+    end
   rescue ActiveRecord::RecordInvalid
     render :show, status: :unprocessable_entity
   end

app/controllers/application_controller.rb

@@ -8,7 +8,7 @@ class ApplicationController < ActionController::Base
 
   check_authorization unless: :devise_controller?
 
-  before_action :set_locale
+  around_action :with_locale
   before_action :sign_in_for_demo, if: -> { Docuseal.demo? }
   before_action :maybe_redirect_to_setup, unless: :signed_in?
   before_action :authenticate_user!, unless: :devise_controller?
@@ -52,18 +52,18 @@ class ApplicationController < ActionController::Base
 
   private
 
-  def set_locale
-    I18n.locale =
-      if Rails.env.development? && params[:locale].present?
-        params[:locale]
-      elsif current_user && current_account.locale.present?
-        current_account.locale.to_sym
-      else
-        I18n.default_locale
-      end
+  def with_locale(&)
+    return yield unless current_account
+
+    locale   = params[:lang].presence if Rails.env.development?
+    locale ||= current_account.locale
+
+    I18n.with_locale(locale, &)
   end
 
   def with_browser_locale(&)
+    return yield if I18n.locale != :'en-US'
+
     locale   = params[:lang].presence
     locale ||= request.env['HTTP_ACCEPT_LANGUAGE'].to_s[BROWSER_LOCALE_REGEXP].to_s
 

app/controllers/setup_controller.rb

@@ -56,7 +56,7 @@ class SetupController < ApplicationController
   def account_params
     return {} unless params[:account]
 
-    params.require(:account).permit(:name, :timezone)
+    params.require(:account).permit(:name, :timezone, :locale)
   end
 
   def encrypted_config_params