Change the method to enable/disable message customization

ishikawa999 · ishikawa999 · commit fc890cf1c191 · 2019-06-03T13:13:42.000+09:00
Fixed an issue where an exception would occur if init.rb works before running migration.
diff --git a/app/models/custom_message_setting.rb b/app/models/custom_message_setting.rb
@@ -7,16 +7,20 @@ def self.find_or_default
   end
 
   def enabled?
-    !(self.value[:enabled] == 'false')
+    self.value[:enabled] != 'false'
   end
 
-  def custom_messages(lang=nil)
+  def custom_messages(lang=nil, check_enabled=false)
     messages = self.value[:custom_messages] || self.value['custom_messages']
     if lang.present?
       messages = messages[self.class.find_language(lang)]
     end
 
-    messages.present? ? messages : {}
+    if messages.blank? || (check_enabled && !self.enabled?)
+      {}
+    else
+      messages
+    end
   end
 
   def custom_messages_to_flatten_hash(lang=nil)
@@ -62,15 +66,9 @@ def update_with_custom_messages_yaml(yaml)
   end
 
   def toggle_enabled!
-    customize_files = Dir.glob(Rails.root.join('plugins', 'redmine_message_customize', 'config', 'locales', 'custom_messages', '*.rb'))
     self.value = self.value.deep_merge({enabled: (!self.enabled?).to_s})
 
     if result = self.save
-      if self.enabled?
-        I18n.load_path += customize_files
-      else
-        I18n.load_path -= customize_files
-      end
       self.class.reload_translations!(self.using_languages)
     end
     result
diff --git a/config/locales/custom_messages/ar.rb b/config/locales/custom_messages/ar.rb
@@ -1 +1 @@
-{ ar: CustomMessageSetting.find_or_default.custom_messages('ar') }
+{ ar: CustomMessageSetting.find_or_default.custom_messages('ar', true) }
diff --git a/config/locales/custom_messages/az.rb b/config/locales/custom_messages/az.rb
@@ -1 +1 @@
-{ az: CustomMessageSetting.find_or_default.custom_messages('az') }
+{ az: CustomMessageSetting.find_or_default.custom_messages('az', true) }
diff --git a/config/locales/custom_messages/bg.rb b/config/locales/custom_messages/bg.rb
@@ -1 +1 @@
-{ bg: CustomMessageSetting.find_or_default.custom_messages('bg') }
+{ bg: CustomMessageSetting.find_or_default.custom_messages('bg', true) }
diff --git a/config/locales/custom_messages/bs.rb b/config/locales/custom_messages/bs.rb
@@ -1 +1 @@
-{ bs: CustomMessageSetting.find_or_default.custom_messages('bs') }
+{ bs: CustomMessageSetting.find_or_default.custom_messages('bs', true) }
diff --git a/config/locales/custom_messages/ca.rb b/config/locales/custom_messages/ca.rb
@@ -1 +1 @@
-{ ca: CustomMessageSetting.find_or_default.custom_messages('ca') }
+{ ca: CustomMessageSetting.find_or_default.custom_messages('ca', true) }
diff --git a/config/locales/custom_messages/cs.rb b/config/locales/custom_messages/cs.rb
@@ -1 +1 @@
-{ cs: CustomMessageSetting.find_or_default.custom_messages('cs') }
+{ cs: CustomMessageSetting.find_or_default.custom_messages('cs', true) }
diff --git a/config/locales/custom_messages/da.rb b/config/locales/custom_messages/da.rb
@@ -1 +1 @@
-{ da: CustomMessageSetting.find_or_default.custom_messages('da') }
+{ da: CustomMessageSetting.find_or_default.custom_messages('da', true) }
diff --git a/config/locales/custom_messages/de.rb b/config/locales/custom_messages/de.rb
@@ -1 +1 @@
-{ de: CustomMessageSetting.find_or_default.custom_messages('de') }
+{ de: CustomMessageSetting.find_or_default.custom_messages('de', true) }
diff --git a/config/locales/custom_messages/el.rb b/config/locales/custom_messages/el.rb
@@ -1 +1 @@
-{ el: CustomMessageSetting.find_or_default.custom_messages('el') }
+{ el: CustomMessageSetting.find_or_default.custom_messages('el', true) }
diff --git a/config/locales/custom_messages/en-GB.rb b/config/locales/custom_messages/en-GB.rb
@@ -1 +1 @@
-{ "en-GB": CustomMessageSetting.find_or_default.custom_messages('en-GB') }
+{ "en-GB": CustomMessageSetting.find_or_default.custom_messages('en-GB', true) }
diff --git a/config/locales/custom_messages/en.rb b/config/locales/custom_messages/en.rb
@@ -1 +1 @@
-{ en: CustomMessageSetting.find_or_default.custom_messages('en') }
+{ en: CustomMessageSetting.find_or_default.custom_messages('en', true) }
diff --git a/config/locales/custom_messages/es-PA.rb b/config/locales/custom_messages/es-PA.rb
@@ -1 +1 @@
-{ "es-PA": CustomMessageSetting.find_or_default.custom_messages('es-PA') }
+{ "es-PA": CustomMessageSetting.find_or_default.custom_messages('es-PA', true) }
diff --git a/config/locales/custom_messages/es.rb b/config/locales/custom_messages/es.rb
@@ -1 +1 @@
-{ es: CustomMessageSetting.find_or_default.custom_messages('es') }
+{ es: CustomMessageSetting.find_or_default.custom_messages('es', true) }
diff --git a/config/locales/custom_messages/et.rb b/config/locales/custom_messages/et.rb
@@ -1 +1 @@
-{ et: CustomMessageSetting.find_or_default.custom_messages('et') }
+{ et: CustomMessageSetting.find_or_default.custom_messages('et', true) }
diff --git a/config/locales/custom_messages/eu.rb b/config/locales/custom_messages/eu.rb
@@ -1 +1 @@
-{ eu: CustomMessageSetting.find_or_default.custom_messages('eu') }
+{ eu: CustomMessageSetting.find_or_default.custom_messages('eu', true) }
diff --git a/config/locales/custom_messages/fa.rb b/config/locales/custom_messages/fa.rb
@@ -1 +1 @@
-{ fa: CustomMessageSetting.find_or_default.custom_messages('fa') }
+{ fa: CustomMessageSetting.find_or_default.custom_messages('fa', true) }
diff --git a/config/locales/custom_messages/fi.rb b/config/locales/custom_messages/fi.rb
@@ -1 +1 @@
-{ fi: CustomMessageSetting.find_or_default.custom_messages('fi') }
+{ fi: CustomMessageSetting.find_or_default.custom_messages('fi', true) }
diff --git a/config/locales/custom_messages/fr.rb b/config/locales/custom_messages/fr.rb
@@ -1 +1 @@
-{ fr: CustomMessageSetting.find_or_default.custom_messages('fr') }
+{ fr: CustomMessageSetting.find_or_default.custom_messages('fr', true) }
diff --git a/config/locales/custom_messages/gl.rb b/config/locales/custom_messages/gl.rb
@@ -1 +1 @@
-{ gl: CustomMessageSetting.find_or_default.custom_messages('gl') }
+{ gl: CustomMessageSetting.find_or_default.custom_messages('gl', true) }
diff --git a/config/locales/custom_messages/he.rb b/config/locales/custom_messages/he.rb
@@ -1 +1 @@
-{ he: CustomMessageSetting.find_or_default.custom_messages('he') }
+{ he: CustomMessageSetting.find_or_default.custom_messages('he', true) }
diff --git a/config/locales/custom_messages/hr.rb b/config/locales/custom_messages/hr.rb
@@ -1 +1 @@
-{ hr: CustomMessageSetting.find_or_default.custom_messages('hr') }
+{ hr: CustomMessageSetting.find_or_default.custom_messages('hr', true) }
diff --git a/config/locales/custom_messages/hu.rb b/config/locales/custom_messages/hu.rb
@@ -1 +1 @@
-{ hu: CustomMessageSetting.find_or_default.custom_messages('hu') }
+{ hu: CustomMessageSetting.find_or_default.custom_messages('hu', true) }
diff --git a/config/locales/custom_messages/id.rb b/config/locales/custom_messages/id.rb
@@ -1 +1 @@
-{ id: CustomMessageSetting.find_or_default.custom_messages('id') }
+{ id: CustomMessageSetting.find_or_default.custom_messages('id', true) }
diff --git a/config/locales/custom_messages/it.rb b/config/locales/custom_messages/it.rb
@@ -1 +1 @@
-{ it: CustomMessageSetting.find_or_default.custom_messages('it') }
+{ it: CustomMessageSetting.find_or_default.custom_messages('it', true) }
diff --git a/config/locales/custom_messages/ja.rb b/config/locales/custom_messages/ja.rb
@@ -1 +1 @@
-{ ja: CustomMessageSetting.find_or_default.custom_messages('ja') }
+{ ja: CustomMessageSetting.find_or_default.custom_messages('ja', true) }
diff --git a/config/locales/custom_messages/ko.rb b/config/locales/custom_messages/ko.rb
@@ -1 +1 @@
-{ ko: CustomMessageSetting.find_or_default.custom_messages('ko') }
+{ ko: CustomMessageSetting.find_or_default.custom_messages('ko', true) }
diff --git a/config/locales/custom_messages/lt.rb b/config/locales/custom_messages/lt.rb
@@ -1 +1 @@
-{ lt: CustomMessageSetting.find_or_default.custom_messages('lt') }
+{ lt: CustomMessageSetting.find_or_default.custom_messages('lt', true) }
diff --git a/config/locales/custom_messages/lv.rb b/config/locales/custom_messages/lv.rb
@@ -1 +1 @@
-{ lv: CustomMessageSetting.find_or_default.custom_messages('lv') }
+{ lv: CustomMessageSetting.find_or_default.custom_messages('lv', true) }
diff --git a/config/locales/custom_messages/mk.rb b/config/locales/custom_messages/mk.rb
@@ -1 +1 @@
-{ mk: CustomMessageSetting.find_or_default.custom_messages('mk') }
+{ mk: CustomMessageSetting.find_or_default.custom_messages('mk', true) }
diff --git a/config/locales/custom_messages/mn.rb b/config/locales/custom_messages/mn.rb
@@ -1 +1 @@
-{ mn: CustomMessageSetting.find_or_default.custom_messages('mn') }
+{ mn: CustomMessageSetting.find_or_default.custom_messages('mn', true) }
diff --git a/config/locales/custom_messages/nl.rb b/config/locales/custom_messages/nl.rb
@@ -1 +1 @@
-{ nl: CustomMessageSetting.find_or_default.custom_messages('nl') }
+{ nl: CustomMessageSetting.find_or_default.custom_messages('nl', true) }
diff --git a/config/locales/custom_messages/no.rb b/config/locales/custom_messages/no.rb
@@ -1 +1 @@
-{ no: CustomMessageSetting.find_or_default.custom_messages('no') }
+{ no: CustomMessageSetting.find_or_default.custom_messages('no', true) }
diff --git a/config/locales/custom_messages/pl.rb b/config/locales/custom_messages/pl.rb
@@ -1 +1 @@
-{ pl: CustomMessageSetting.find_or_default.custom_messages('pl') }
+{ pl: CustomMessageSetting.find_or_default.custom_messages('pl', true) }
diff --git a/config/locales/custom_messages/pt-BR.rb b/config/locales/custom_messages/pt-BR.rb
@@ -1 +1 @@
-{ "pt-BR": CustomMessageSetting.find_or_default.custom_messages('pt-BR') }
+{ "pt-BR": CustomMessageSetting.find_or_default.custom_messages('pt-BR', true) }
diff --git a/config/locales/custom_messages/pt.rb b/config/locales/custom_messages/pt.rb
@@ -1 +1 @@
-{ pt: CustomMessageSetting.find_or_default.custom_messages('pt') }
+{ pt: CustomMessageSetting.find_or_default.custom_messages('pt', true) }
diff --git a/config/locales/custom_messages/ro.rb b/config/locales/custom_messages/ro.rb
@@ -1 +1 @@
-{ ro: CustomMessageSetting.find_or_default.custom_messages('ro') }
+{ ro: CustomMessageSetting.find_or_default.custom_messages('ro', true) }
diff --git a/config/locales/custom_messages/ru.rb b/config/locales/custom_messages/ru.rb
@@ -1 +1 @@
-{ ru: CustomMessageSetting.find_or_default.custom_messages('ru') }
+{ ru: CustomMessageSetting.find_or_default.custom_messages('ru', true) }
diff --git a/config/locales/custom_messages/sk.rb b/config/locales/custom_messages/sk.rb
@@ -1 +1 @@
-{ sk: CustomMessageSetting.find_or_default.custom_messages('sk') }
+{ sk: CustomMessageSetting.find_or_default.custom_messages('sk', true) }
diff --git a/config/locales/custom_messages/sl.rb b/config/locales/custom_messages/sl.rb
@@ -1 +1 @@
-{ sl: CustomMessageSetting.find_or_default.custom_messages('sl') }
+{ sl: CustomMessageSetting.find_or_default.custom_messages('sl', true) }
diff --git a/config/locales/custom_messages/sq.rb b/config/locales/custom_messages/sq.rb
@@ -1 +1 @@
-{ sq: CustomMessageSetting.find_or_default.custom_messages('sq') }
+{ sq: CustomMessageSetting.find_or_default.custom_messages('sq', true) }
diff --git a/config/locales/custom_messages/sr-YU.rb b/config/locales/custom_messages/sr-YU.rb
@@ -1 +1 @@
-{ "sr-YU": CustomMessageSetting.find_or_default.custom_messages('sr-YU') }
+{ "sr-YU": CustomMessageSetting.find_or_default.custom_messages('sr-YU', true) }
diff --git a/config/locales/custom_messages/sr.rb b/config/locales/custom_messages/sr.rb
@@ -1 +1 @@
-{ sr: CustomMessageSetting.find_or_default.custom_messages('sr') }
+{ sr: CustomMessageSetting.find_or_default.custom_messages('sr', true) }
diff --git a/config/locales/custom_messages/sv.rb b/config/locales/custom_messages/sv.rb
@@ -1 +1 @@
-{ sv: CustomMessageSetting.find_or_default.custom_messages('sv') }
+{ sv: CustomMessageSetting.find_or_default.custom_messages('sv', true) }
diff --git a/config/locales/custom_messages/th.rb b/config/locales/custom_messages/th.rb
@@ -1 +1 @@
-{ th: CustomMessageSetting.find_or_default.custom_messages('th') }
+{ th: CustomMessageSetting.find_or_default.custom_messages('th', true) }
diff --git a/config/locales/custom_messages/tr.rb b/config/locales/custom_messages/tr.rb
@@ -1 +1 @@
-{ tr: CustomMessageSetting.find_or_default.custom_messages('tr') }
+{ tr: CustomMessageSetting.find_or_default.custom_messages('tr', true) }
diff --git a/config/locales/custom_messages/uk.rb b/config/locales/custom_messages/uk.rb
@@ -1 +1 @@
-{ uk: CustomMessageSetting.find_or_default.custom_messages('uk') }
+{ uk: CustomMessageSetting.find_or_default.custom_messages('uk', true) }
diff --git a/config/locales/custom_messages/vi.rb b/config/locales/custom_messages/vi.rb
@@ -1 +1 @@
-{ vi: CustomMessageSetting.find_or_default.custom_messages('vi') }
+{ vi: CustomMessageSetting.find_or_default.custom_messages('vi', true) }
diff --git a/config/locales/custom_messages/zh-TW.rb b/config/locales/custom_messages/zh-TW.rb
@@ -1 +1 @@
-{ "zh-TW": CustomMessageSetting.find_or_default.custom_messages('zh-TW') }
+{ "zh-TW": CustomMessageSetting.find_or_default.custom_messages('zh-TW', true) }
diff --git a/config/locales/custom_messages/zh.rb b/config/locales/custom_messages/zh.rb
@@ -1 +1 @@
-{ zh: CustomMessageSetting.find_or_default.custom_messages('zh') }
+{ zh: CustomMessageSetting.find_or_default.custom_messages('zh', true) }
diff --git a/init.rb b/init.rb
@@ -7,6 +7,4 @@
   requires_redmine version_or_higher: '3.2'
 end
 
-if CustomMessageSetting.find_or_default.enabled?
-  Rails.application.config.i18n.load_path += Dir.glob(File.join(p.directory, 'config', 'locales', 'custom_messages', '*.rb'))
-end
+Rails.application.config.i18n.load_path += Dir.glob(File.join(p.directory, 'config', 'locales', 'custom_messages', '*.rb'))
diff --git a/test/unit/custom_message_setting_test.rb b/test/unit/custom_message_setting_test.rb
@@ -43,6 +43,17 @@ def test_custom_messages
     assert_equal ({}), @custom_message_setting.custom_messages('foo')
   end
 
+  def test_custom_messages_with_check_enabled
+    assert @custom_message_setting.enabled?
+    assert_equal ({'label_home' => 'Home1'}), @custom_message_setting.custom_messages('en', true)
+    assert_equal ({'label_home' => 'Home1'}), @custom_message_setting.custom_messages('en', false)
+
+    @custom_message_setting.toggle_enabled!
+    assert_not @custom_message_setting.enabled?
+    assert_equal ({}), @custom_message_setting.custom_messages('en', true)
+    assert_equal ({'label_home' => 'Home1'}), @custom_message_setting.custom_messages('en', false)
+  end
+
   def test_custom_messages_to_yaml
     assert_equal "---\nen:\n  label_home: Home1\nja:\n  label_home: Home2\n", @custom_message_setting.custom_messages_to_yaml
 

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-{ ar: CustomMessageSetting.find_or_default.custom_messages('ar') }`
	`1`	`+{ ar: CustomMessageSetting.find_or_default.custom_messages('ar', true) }`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-{ az: CustomMessageSetting.find_or_default.custom_messages('az') }`
	`1`	`+{ az: CustomMessageSetting.find_or_default.custom_messages('az', true) }`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-{ bg: CustomMessageSetting.find_or_default.custom_messages('bg') }`
	`1`	`+{ bg: CustomMessageSetting.find_or_default.custom_messages('bg', true) }`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-{ bs: CustomMessageSetting.find_or_default.custom_messages('bs') }`
	`1`	`+{ bs: CustomMessageSetting.find_or_default.custom_messages('bs', true) }`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-{ ca: CustomMessageSetting.find_or_default.custom_messages('ca') }`
	`1`	`+{ ca: CustomMessageSetting.find_or_default.custom_messages('ca', true) }`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-{ cs: CustomMessageSetting.find_or_default.custom_messages('cs') }`
	`1`	`+{ cs: CustomMessageSetting.find_or_default.custom_messages('cs', true) }`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-{ da: CustomMessageSetting.find_or_default.custom_messages('da') }`
	`1`	`+{ da: CustomMessageSetting.find_or_default.custom_messages('da', true) }`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-{ de: CustomMessageSetting.find_or_default.custom_messages('de') }`
	`1`	`+{ de: CustomMessageSetting.find_or_default.custom_messages('de', true) }`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-{ el: CustomMessageSetting.find_or_default.custom_messages('el') }`
	`1`	`+{ el: CustomMessageSetting.find_or_default.custom_messages('el', true) }`