Add current_user_language method

Author: ishikawa999

app/controllers/custom_message_settings_controller.rb

@@ -53,7 +53,7 @@ def setting_params
   def set_lang
     @lang =
       MessageCustomize::Locale.find_language(
-        params[:lang].presence || @setting.custom_messages.keys.first || User.current.language.presence || Setting.default_language
+        params[:lang].presence || @setting.custom_messages.keys.first || current_user_language
       )
   end
 end

lib/message_customize/application_controller_patch.rb

@@ -13,11 +13,16 @@ def self.included(base)
 
     module InstanceMethod
       def reload_customize_messages
-        language = User.current.language.presence || Setting.default_language
         custom_message_setting = CustomMessageSetting.find_or_default
-        return if custom_message_setting.latest_messages_applied?(language)
+        return if custom_message_setting.latest_messages_applied?(current_user_language)
 
-        MessageCustomize::Locale.reload!([language])
+        MessageCustomize::Locale.reload!([current_user_language])
+      end
+
+      private
+
+      def current_user_language
+        User.current.language.presence || Setting.default_language
       end
     end
   end