Clean up custom_messages_with_timestamp

ishikawa999 · ishikawa999 · commit 95955c6df4c2 · 2022-10-06T04:38:52.000Z
diff --git a/app/models/custom_message_setting.rb b/app/models/custom_message_setting.rb
@@ -18,8 +18,8 @@ def custom_messages(lang=nil, check_enabled=false)
     messages || {}
   end
 
-  def custom_messages_with_timestamp(lang=nil, check_enabled=false)
-    messages = self.custom_messages(lang, check_enabled)
+  def custom_messages_with_timestamp(lang)
+    messages = self.custom_messages(lang, true)
     messages.merge({'redmine_message_customize_timestamp' => self.try(:updated_on).to_i.to_s})
   end
 
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_with_timestamp('ar', true) }
+{ ar: CustomMessageSetting.find_or_default.custom_messages_with_timestamp('ar') }
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_with_timestamp('az', true) }
+{ az: CustomMessageSetting.find_or_default.custom_messages_with_timestamp('az') }
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_with_timestamp('bg', true) }
+{ bg: CustomMessageSetting.find_or_default.custom_messages_with_timestamp('bg') }
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_with_timestamp('bs', true) }
+{ bs: CustomMessageSetting.find_or_default.custom_messages_with_timestamp('bs') }
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_with_timestamp('ca', true) }
+{ ca: CustomMessageSetting.find_or_default.custom_messages_with_timestamp('ca') }
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_with_timestamp('cs', true) }
+{ cs: CustomMessageSetting.find_or_default.custom_messages_with_timestamp('cs') }
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_with_timestamp('da', true) }
+{ da: CustomMessageSetting.find_or_default.custom_messages_with_timestamp('da') }
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_with_timestamp('de', true) }
+{ de: CustomMessageSetting.find_or_default.custom_messages_with_timestamp('de') }
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_with_timestamp('el', true) }
+{ el: CustomMessageSetting.find_or_default.custom_messages_with_timestamp('el') }
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_with_timestamp('en-GB', true) }
+{ "en-GB": CustomMessageSetting.find_or_default.custom_messages_with_timestamp('en-GB') }
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_with_timestamp('en', true) }
+{ en: CustomMessageSetting.find_or_default.custom_messages_with_timestamp('en') }
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_with_timestamp('es-PA', true) }
+{ "es-PA": CustomMessageSetting.find_or_default.custom_messages_with_timestamp('es-PA') }
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_with_timestamp('es', true) }
+{ es: CustomMessageSetting.find_or_default.custom_messages_with_timestamp('es') }
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_with_timestamp('et', true) }
+{ et: CustomMessageSetting.find_or_default.custom_messages_with_timestamp('et') }
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_with_timestamp('eu', true) }
+{ eu: CustomMessageSetting.find_or_default.custom_messages_with_timestamp('eu') }
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_with_timestamp('fa', true) }
+{ fa: CustomMessageSetting.find_or_default.custom_messages_with_timestamp('fa') }
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_with_timestamp('fi', true) }
+{ fi: CustomMessageSetting.find_or_default.custom_messages_with_timestamp('fi') }
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_with_timestamp('fr', true) }
+{ fr: CustomMessageSetting.find_or_default.custom_messages_with_timestamp('fr') }
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_with_timestamp('gl', true) }
+{ gl: CustomMessageSetting.find_or_default.custom_messages_with_timestamp('gl') }
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_with_timestamp('he', true) }
+{ he: CustomMessageSetting.find_or_default.custom_messages_with_timestamp('he') }
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_with_timestamp('hr', true) }
+{ hr: CustomMessageSetting.find_or_default.custom_messages_with_timestamp('hr') }
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_with_timestamp('hu', true) }
+{ hu: CustomMessageSetting.find_or_default.custom_messages_with_timestamp('hu') }
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_with_timestamp('id', true) }
+{ id: CustomMessageSetting.find_or_default.custom_messages_with_timestamp('id') }
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_with_timestamp('it', true) }
+{ it: CustomMessageSetting.find_or_default.custom_messages_with_timestamp('it') }
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_with_timestamp('ja', true) }
+{ ja: CustomMessageSetting.find_or_default.custom_messages_with_timestamp('ja') }
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_with_timestamp('ko', true) }
+{ ko: CustomMessageSetting.find_or_default.custom_messages_with_timestamp('ko') }
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_with_timestamp('lt', true) }
+{ lt: CustomMessageSetting.find_or_default.custom_messages_with_timestamp('lt') }
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_with_timestamp('lv', true) }
+{ lv: CustomMessageSetting.find_or_default.custom_messages_with_timestamp('lv') }
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_with_timestamp('mk', true) }
+{ mk: CustomMessageSetting.find_or_default.custom_messages_with_timestamp('mk') }
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_with_timestamp('mn', true) }
+{ mn: CustomMessageSetting.find_or_default.custom_messages_with_timestamp('mn') }
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_with_timestamp('nl', true) }
+{ nl: CustomMessageSetting.find_or_default.custom_messages_with_timestamp('nl') }
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_with_timestamp('no', true) }
+{ no: CustomMessageSetting.find_or_default.custom_messages_with_timestamp('no') }
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_with_timestamp('pl', true) }
+{ pl: CustomMessageSetting.find_or_default.custom_messages_with_timestamp('pl') }
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_with_timestamp('pt-BR', true) }
+{ "pt-BR": CustomMessageSetting.find_or_default.custom_messages_with_timestamp('pt-BR') }
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_with_timestamp('pt', true) }
+{ pt: CustomMessageSetting.find_or_default.custom_messages_with_timestamp('pt') }
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_with_timestamp('ro', true) }
+{ ro: CustomMessageSetting.find_or_default.custom_messages_with_timestamp('ro') }
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_with_timestamp('ru', true) }
+{ ru: CustomMessageSetting.find_or_default.custom_messages_with_timestamp('ru') }
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_with_timestamp('sk', true) }
+{ sk: CustomMessageSetting.find_or_default.custom_messages_with_timestamp('sk') }
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_with_timestamp('sl', true) }
+{ sl: CustomMessageSetting.find_or_default.custom_messages_with_timestamp('sl') }
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_with_timestamp('sq', true) }
+{ sq: CustomMessageSetting.find_or_default.custom_messages_with_timestamp('sq') }
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_with_timestamp('sr-YU', true) }
+{ "sr-YU": CustomMessageSetting.find_or_default.custom_messages_with_timestamp('sr-YU') }
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_with_timestamp('sr', true) }
+{ sr: CustomMessageSetting.find_or_default.custom_messages_with_timestamp('sr') }
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_with_timestamp('sv', true) }
+{ sv: CustomMessageSetting.find_or_default.custom_messages_with_timestamp('sv') }
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_with_timestamp('th', true) }
+{ th: CustomMessageSetting.find_or_default.custom_messages_with_timestamp('th') }
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_with_timestamp('tr', true) }
+{ tr: CustomMessageSetting.find_or_default.custom_messages_with_timestamp('tr') }
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_with_timestamp('uk', true) }
+{ uk: CustomMessageSetting.find_or_default.custom_messages_with_timestamp('uk') }
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_with_timestamp('vi', true) }
+{ vi: CustomMessageSetting.find_or_default.custom_messages_with_timestamp('vi') }
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_with_timestamp('zh-TW', true) }
+{ "zh-TW": CustomMessageSetting.find_or_default.custom_messages_with_timestamp('zh-TW') }
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_with_timestamp('zh', true) }
+{ zh: CustomMessageSetting.find_or_default.custom_messages_with_timestamp('zh') }
diff --git a/test/unit/custom_message_setting_test.rb b/test/unit/custom_message_setting_test.rb
@@ -58,7 +58,6 @@ def test_custom_messages
   end
 
   def test_custom_messages_with_timestamp
-    assert_equal @custom_message_setting.value['custom_messages'].merge({'redmine_message_customize_timestamp' => @custom_message_setting.updated_on.to_i.to_s}), @custom_message_setting.custom_messages_with_timestamp
     assert_equal ({'label_home' => 'Home1', 'redmine_message_customize_timestamp' => @custom_message_setting.updated_on.to_i.to_s}), @custom_message_setting.custom_messages_with_timestamp('en')
     assert_equal ({'redmine_message_customize_timestamp' => @custom_message_setting.updated_on.to_i.to_s}), @custom_message_setting.custom_messages_with_timestamp('foo')
   end

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