FIX: 🈂️ Allow closing polls in multi-locale sites

2025-05-22 22:43:33 +08:00 · 2015-02-05 19:38:51 -08:00
parent 1ec46e3efd
commit 06f02ce9fc
7 changed files with 25 additions and 24 deletions
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@ -147,8 +147,8 @@ class ApplicationController < ActionController::Base
  end

  def set_locale
-    I18n.locale = if SiteSetting.allow_user_locale && current_user && current_user.locale.present?
-                    current_user.locale
+    I18n.locale = if current_user
+                    current_user.effective_locale
                  else
                    SiteSetting.default_locale
                  end