Merge remote-tracking branch 'upstream/pull/2999'

[rails.git] / app / controllers / application_controller.rb

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 052858932c26ff11233a75fb8b81d329d2e81631..9f2d79eaa7bf5845b4c1cb78332e11b9798170b9 100644 (file)
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -84,7 +84,7 @@ class ApplicationController < ActionController::Base
     end
   end
 
     end
   end
 

-  def check_database_readable(need_api = false)
+  def check_database_readable(need_api: false)

     if Settings.status == "database_offline" || (need_api && Settings.status == "api_offline")
       if request.xhr?
         report_error "Database offline for maintenance", :service_unavailable
     if Settings.status == "database_offline" || (need_api && Settings.status == "api_offline")
       if request.xhr?
         report_error "Database offline for maintenance", :service_unavailable


@@ -94,7 +94,7 @@ class ApplicationController < ActionController::Base
     end
   end
 
     end
   end
 

-  def check_database_writable(need_api = false)
+  def check_database_writable(need_api: false)

     if Settings.status == "database_offline" || Settings.status == "database_readonly" ||
        (need_api && (Settings.status == "api_offline" || Settings.status == "api_readonly"))
       if request.xhr?
     if Settings.status == "database_offline" || Settings.status == "database_readonly" ||
        (need_api && (Settings.status == "api_offline" || Settings.status == "api_readonly"))
       if request.xhr?


@@ -171,7 +171,7 @@ class ApplicationController < ActionController::Base
     end
   end
 
     end
   end
 

-  def preferred_languages(reset = false)
+  def preferred_languages(reset: false)

     @preferred_languages = nil if reset
     @preferred_languages ||= if params[:locale]
                                Locale.list(params[:locale])
     @preferred_languages = nil if reset
     @preferred_languages ||= if params[:locale]
                                Locale.list(params[:locale])


@@ -184,13 +184,13 @@ class ApplicationController < ActionController::Base
 
   helper_method :preferred_languages
 
 
   helper_method :preferred_languages
 

-  def set_locale(reset = false)
+  def set_locale(reset: false)

     if current_user&.languages&.empty? && !http_accept_language.user_preferred_languages.empty?
       current_user.languages = http_accept_language.user_preferred_languages
       current_user.save
     end
 
     if current_user&.languages&.empty? && !http_accept_language.user_preferred_languages.empty?
       current_user.languages = http_accept_language.user_preferred_languages
       current_user.save
     end
 

-    I18n.locale = Locale.available.preferred(preferred_languages(reset))
+    I18n.locale = Locale.available.preferred(preferred_languages(:reset => reset))

 
     response.headers["Vary"] = "Accept-Language"
     response.headers["Content-Language"] = I18n.locale.to_s
 
     response.headers["Vary"] = "Accept-Language"
     response.headers["Content-Language"] = I18n.locale.to_s