Merge pull request #5 from ishikawa999/develop

Fix an issue where an exception would occur if init.rb works before running migration.

Author: ishikawa999

app/controllers/custom_message_settings_controller.rb

@@ -1,14 +1,13 @@
 class CustomMessageSettingsController < ApplicationController
   layout 'admin'
   before_action :require_admin, :set_custom_message_setting, :set_lang
-  require_sudo_mode :edit, :update
+  require_sudo_mode :edit, :update, :toggle_enabled
 
   def edit
   end
 
   def update
-    original_custom_messages = @setting.custom_messages
-    languages = (original_custom_messages.try(:keys) ? original_custom_messages.keys.map(&:to_s) : [])
+    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)
@@ -18,8 +17,7 @@ def update
 
     if @setting.errors.blank?
       flash[:notice] = l(:notice_successful_update)
-      new_custom_messages = @setting.custom_messages
-      languages += new_custom_messages.keys.map(&:to_s) if new_custom_messages.try(:keys)
+      languages += @setting.using_languages
       CustomMessageSetting.reload_translations!(languages)
 
       redirect_to edit_custom_message_settings_path(tab: params[:tab], lang: @lang)
@@ -28,6 +26,16 @@ def update
     end
   end
 
+  def toggle_enabled
+    if @setting.toggle_enabled!
+      flash[:notice] =
+        @setting.enabled? ? l(:notice_enabled_customize) : l(:notice_disabled_customize)
+      redirect_to edit_custom_message_settings_path
+    else
+      render :edit
+    end
+  end
+
   private
   def set_custom_message_setting
     @setting = CustomMessageSetting.find_or_default

app/models/custom_message_setting.rb

@@ -6,13 +6,21 @@ def self.find_or_default
     super('plugin_redmine_message_customize')
   end
 
-  def custom_messages(lang=nil)
+  def enabled?
+    self.value[:enabled] != 'false'
+  end
+
+  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)
@@ -57,11 +65,29 @@ def update_with_custom_messages_yaml(yaml)
     self.save
   end
 
+  def toggle_enabled!
+    self.value = self.value.deep_merge({enabled: (!self.enabled?).to_s})
+
+    if result = self.save
+      self.class.reload_translations!(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
+  end
+
   def self.available_messages(lang)
-    messages = I18n.backend.translations[self.find_language(lang).to_s.to_sym]
+    messages = I18n.backend.send(:translations)[self.find_language(lang).to_s.to_sym]
     if messages.nil?
       CustomMessageSetting.reload_translations!([lang])
-      messages = I18n.backend.translations[lang.to_s.to_sym] || {}
+      messages = I18n.backend.send(:translations)[lang.to_s.to_sym] || {}
     end
     self.flatten_hash(messages)
   end
@@ -92,7 +118,7 @@ def self.nested_hash(hash=nil)
   end
 
   def self.reload_translations!(languages)
-    paths = ::I18n.load_path.select {|path| self.find_language(languages).include?(File.basename(path, '.*').to_s)}
+    paths = I18n.load_path.select {|path| self.find_language(languages).include?(File.basename(path, '.*').to_s)}
     I18n.backend.load_translations(paths)
   end
 

app/views/custom_message_settings/edit.html.erb

@@ -6,4 +6,8 @@
 <% if @setting.errors.any? %>
   <%= error_messages_for(@setting) %>
 <% end %>
+<p class='toggle-enable'>
+  <span class='icon icon-settings'></span>
+  <%= link_to (@setting.enabled? ? l(:label_disable_customize) : l(:label_enable_customize)), toggle_enabled_custom_message_settings_path, method: :post %>
+</p>
 <%= render_tabs (@setting.errors.any? ? [] : [{name: 'normal', partial: 'normal_tab', label: 'label_normal_tab'}]) + [{name: 'yaml', partial: 'yaml_tab', label: 'label_yaml_tab'}] %>

assets/stylesheets/custom_messages.css

@@ -34,4 +34,8 @@
 }
 .select2-container--default .select2-results__option[aria-disabled=true] span {
   color: white;
+}
+
+p.toggle-enable {
+  text-align: right;
 }

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) }

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) }

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) }

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) }

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) }

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) }