Skip to content

Commit 965b591

Browse files
committed
Clean up condition to skip validation
1 parent 79f3b96 commit 965b591

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

app/models/custom_message_setting.rb

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ def update_with_custom_messages(custom_messages, lang)
4848
def update_with_custom_messages_yaml(yaml)
4949
begin
5050
messages = YAML.load(yaml)
51-
@errs = {base: l(:error_invalid_yaml_format) } if messages.is_a?(Hash) == false && messages.present?
51+
@errs = {base: l(:error_invalid_yaml_format) } if !messages.is_a?(Hash) && messages.present?
5252
self.value = {custom_messages: (messages.present? ? messages : {})}
5353
rescue => e
5454
@errs = {base: e.message}
@@ -109,7 +109,7 @@ def self.find_language(language=nil)
109109
private
110110

111111
def custom_message_keys_are_available
112-
return false if self.value[:custom_messages].is_a?(Hash) == false || self.errors.present?
112+
return false if !value[:custom_messages].is_a?(Hash) || errors.present?
113113

114114
custom_messages_hash = {}
115115
custom_messages.values.compact.each do |val|
@@ -124,7 +124,8 @@ def custom_message_keys_are_available
124124
end
125125

126126
def custom_message_languages_are_available
127-
return false if self.value[:custom_messages].is_a?(Hash) == false || self.errors.present?
127+
return false if !value[:custom_messages].is_a?(Hash) || errors.present?
128+
128129
unavailable_languages =
129130
custom_messages.keys.compact.reject do |language|
130131
I18n.available_locales.include?(language.to_sym)

0 commit comments

Comments
 (0)