Merge pull request #56 from farend/add_process_to_reload_messages

Add a process to look at the timestamp and reload the term if it is not latest

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
@@ -58,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

app/models/custom_message_setting.rb

@@ -18,6 +18,18 @@ def custom_messages(lang=nil, check_enabled=false)
     messages || {}
   end
 
+  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
+
+  def latest_messages_applied?(lang)
+    return true if self.new_record?
+
+    redmine_message_customize_timestamp = I18n.backend.send(:translations)[:"#{lang}"][:redmine_message_customize_timestamp]
+    redmine_message_customize_timestamp == self.updated_on.to_i.to_s
+  end
+
   def custom_messages_to_flatten_hash(lang=nil)
     self.class.flatten_hash(custom_messages(lang))
   end
@@ -53,20 +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
-  end
-
-  def using_languages
-    messages = self.custom_messages
-    if messages.is_a?(Hash)
-      messages.keys.map(&:to_s)
-    else
-      [User.current.language]
-    end
+    self.save
   end
 
   # { date: { formats: { defaults: '%m/%d/%Y'}}} to {'date.formats.defaults' => '%m/%d/%Y'}

config/locales/custom_messages/ar.rb

@@ -1 +1 @@
-{ ar: CustomMessageSetting.find_or_default.custom_messages('ar', true) }
+{ ar: CustomMessageSetting.find_or_default.custom_messages_with_timestamp('ar') }

config/locales/custom_messages/az.rb

@@ -1 +1 @@
-{ az: CustomMessageSetting.find_or_default.custom_messages('az', true) }
+{ az: CustomMessageSetting.find_or_default.custom_messages_with_timestamp('az') }

config/locales/custom_messages/bg.rb

@@ -1 +1 @@
-{ bg: CustomMessageSetting.find_or_default.custom_messages('bg', true) }
+{ bg: CustomMessageSetting.find_or_default.custom_messages_with_timestamp('bg') }

config/locales/custom_messages/bs.rb

@@ -1 +1 @@
-{ bs: CustomMessageSetting.find_or_default.custom_messages('bs', true) }
+{ bs: CustomMessageSetting.find_or_default.custom_messages_with_timestamp('bs') }

config/locales/custom_messages/ca.rb

@@ -1 +1 @@
-{ ca: CustomMessageSetting.find_or_default.custom_messages('ca', true) }
+{ ca: CustomMessageSetting.find_or_default.custom_messages_with_timestamp('ca') }

config/locales/custom_messages/cs.rb

@@ -1 +1 @@
-{ cs: CustomMessageSetting.find_or_default.custom_messages('cs', true) }
+{ cs: CustomMessageSetting.find_or_default.custom_messages_with_timestamp('cs') }

config/locales/custom_messages/da.rb

@@ -1 +1 @@
-{ da: CustomMessageSetting.find_or_default.custom_messages('da', true) }
+{ da: CustomMessageSetting.find_or_default.custom_messages_with_timestamp('da') }

config/locales/custom_messages/de.rb

@@ -1 +1 @@
-{ de: CustomMessageSetting.find_or_default.custom_messages('de', true) }
+{ de: CustomMessageSetting.find_or_default.custom_messages_with_timestamp('de') }