Clean up

Author: ishikawa999

app/models/custom_message_setting.rb

@@ -68,15 +68,6 @@ def toggle_enabled!
     self.save
   end
 
-  def using_languages
-    messages = self.custom_messages
-    if messages.is_a?(Hash)
-      messages.keys.map(&:to_s)
-    else
-      [User.current.language]
-    end
-  end
-
   # { date: { formats: { defaults: '%m/%d/%Y'}}} to {'date.formats.defaults' => '%m/%d/%Y'}
   def self.flatten_hash(hash=nil)
     return hash unless hash.is_a?(Hash)

lib/message_customize/application_controller_patch.rb

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

test/unit/custom_message_setting_test.rb

@@ -134,10 +134,6 @@ def test_toggle_enabled!
     assert_equal 'Home1', l(:label_home)
   end
 
-  def test_using_languages
-    assert_equal ['en', 'ja'], @custom_message_setting.using_languages
-  end
-
   def test_flatten_hash_should_return_hash_with_flat_keys
     flatten_hash = CustomMessageSetting.flatten_hash({time: {am: 'foo'}})
     assert_equal ({:'time.am' => 'foo'}), flatten_hash