Change to disallow not available languages

Author: ishikawa999

app/models/custom_message_setting.rb

@@ -1,5 +1,6 @@
 class CustomMessageSetting < Setting
-  validate :add_errors, :convertible_to_yaml, :custom_message_keys_are_available
+  validate :add_errors, :convertible_to_yaml,
+           :custom_message_languages_are_available, :custom_message_keys_are_available
 
   def self.find_or_default
     super('plugin_redmine_message_customize')
@@ -122,6 +123,18 @@ def custom_message_keys_are_available
     end
   end
 
+  def custom_message_languages_are_available
+    return false if self.value[:custom_messages].is_a?(Hash) == false || self.errors.present?
+    unavailable_languages =
+      custom_messages.keys.compact.reject do |language|
+        I18n.available_locales.include?(language.to_sym)
+      end
+    if unavailable_languages.present?
+      self.errors.add(:base, l(:error_unavailable_languages) + " [#{unavailable_languages.join(', ')}]")
+      false
+    end
+  end
+
   def convertible_to_yaml
     YAML.dump(self.value[:custom_messages])
   end

config/locales/en.yml

@@ -7,6 +7,7 @@ en:
         label_home: 'Home2'
   text_placeholder_choose_key: Please select the message you want to change.
   error_unavailable_keys: The keys not present in Redmine are used.
+  error_unavailable_languages: The languages not present in Redmine are used.
   error_invalid_yaml_format: The format of yaml is invalid.
   label_normal_tab: Normal mode
   label_yaml_tab: YAML mode

config/locales/ja.yml

@@ -6,7 +6,8 @@ ja:
       ja:
         label_home: 'ホーム2'
   text_placeholder_choose_key: 変更したい文言を選択してください。
-  error_unavailable_keys: Redmineに存在しないキーが利用されています
+  error_unavailable_keys: Redmineに存在しないキーが利用されています。
+  error_unavailable_languages: Redmineで利用できない言語が利用されています。
   error_invalid_yaml_format: YAMLの形式が正しくありません。
   label_normal_tab: 通常モード
   label_yaml_tab: YAMLモード

test/unit/custom_message_setting_test.rb

@@ -14,6 +14,12 @@ def test_validate_with_not_available_keys_should_return_false
     assert_equal "#{l(:error_unavailable_keys)} keys: [foobar]", @custom_message_setting.errors[:base].first
   end
 
+  def test_validate_with_not_available_languages_should_return_false
+    @custom_message_setting.value = { custom_messages: { 'foo' => {'label_home' => 'Home' }} }
+    assert_not @custom_message_setting.save
+    assert_equal "#{l(:error_unavailable_languages)} [foo]", @custom_message_setting.errors[:base].first
+  end
+
   def test_find_or_default
     assert_equal @custom_message_setting, CustomMessageSetting.find_or_default
   end
@@ -34,7 +40,7 @@ def test_custom_messages_to_yaml
     assert_equal 'test', @custom_message_setting.custom_messages_to_yaml
   end
 
-  def test_update_with_custom_messages_if_custom_messages_is_present
+  def test_update_with_custom_messages_if_custom_messages_is_exist
     flatten_hash = {'label_home' => 'Home3', 'time.am' => 'foo'}
 
     assert @custom_message_setting.update_with_custom_messages(flatten_hash, 'en')