Stop reload! after message changes and unify reload! with before_action :reload_customize_messages

Author: ishikawa999

app/controllers/custom_message_settings_controller.rb

@@ -12,8 +12,6 @@ def default_messages
   end
 
   def update
-    languages = @setting.using_languages
-
     if setting_params.key?(:custom_messages) || params[:tab] == 'normal'
       @setting.update_with_custom_messages(setting_params[:custom_messages].try(:to_unsafe_h).try(:to_hash) || {}, @lang)
     elsif setting_params.key?(:custom_messages_yaml)
@@ -22,9 +20,6 @@ def update
 
     if @setting.errors.blank?
       flash[:notice] = l(:notice_successful_update)
-      languages += @setting.using_languages
-      MessageCustomize::Locale.reload!(languages)
-
       redirect_to edit_custom_message_settings_path(tab: params[:tab], lang: @lang)
     else
       render :edit

app/models/custom_message_setting.rb

@@ -65,11 +65,7 @@ def update_with_custom_messages_yaml(yaml)
 
   def toggle_enabled!
     self.value = self.value.merge({enabled: (!self.enabled?).to_s})
-
-    if result = self.save
-      MessageCustomize::Locale.reload!(self.using_languages)
-    end
-    result
+    self.save
   end
 
   def using_languages

test/functional/custom_message_settings_controller_test.rb

@@ -50,6 +50,7 @@ def test_update_with_custom_messages
 
     get :update, params: { settings: {'custom_messages'=>{'label_home' => 'Home3'}}, lang: 'en', tab: 'normal' }
 
+    MessageCustomize::Locale.reload!('en')
     assert_equal 'Home3', l(:label_home)
     assert_redirected_to edit_custom_message_settings_path(lang: 'en', tab: 'normal')
     assert_equal l(:notice_successful_update), flash[:notice]
@@ -59,6 +60,7 @@ def test_update_with_custom_messages_yaml
 
     get :update, params: { settings: {'custom_messages_yaml'=>"---\nen:\n  label_home: Home3"}, tab: 'yaml' }
 
+    MessageCustomize::Locale.reload!('en')
     assert_equal 'Home3', l(:label_home)
     assert_redirected_to edit_custom_message_settings_path(lang: 'en', tab: 'yaml')
     assert_equal l(:notice_successful_update), flash[:notice]

test/unit/custom_message_setting_test.rb

@@ -124,10 +124,12 @@ def test_toggle_enabled!
 
     @custom_message_setting.toggle_enabled!
     assert_not @custom_message_setting.enabled?
+    MessageCustomize::Locale.reload!('en')
     assert_equal 'Home', l(:label_home)
 
     @custom_message_setting.toggle_enabled!
     assert @custom_message_setting.enabled?
+    MessageCustomize::Locale.reload!('en')
     assert_equal 'Home1', l(:label_home)
   end