Add rubocop to our build. (#5004)

This commit is contained in:
Guo Xiang Tan
2017-07-28 10:20:09 +09:00
committed by GitHub
parent ff4e295c4f
commit 5012d46cbd
871 changed files with 5480 additions and 6056 deletions

View File

@ -1,5 +1,5 @@
class IntegerSettingValidator
def initialize(opts={})
def initialize(opts = {})
@opts = opts
@opts[:min] = 0 unless @opts[:min].present? || @opts[:hidden]
@opts[:max] = 20000 unless @opts[:max].present? || @opts[:hidden]
@ -7,18 +7,18 @@ class IntegerSettingValidator
def valid_value?(val)
return false if val.to_i.to_s != val.to_s
return false if @opts[:min] and @opts[:min].to_i > val.to_i
return false if @opts[:max] and @opts[:max].to_i < val.to_i
return false if @opts[:min] && @opts[:min].to_i > (val.to_i)
return false if @opts[:max] && @opts[:max].to_i < (val.to_i)
true
end
def error_message
if @opts[:min] && @opts[:max]
I18n.t('site_settings.errors.invalid_integer_min_max', {min: @opts[:min], max: @opts[:max]})
I18n.t('site_settings.errors.invalid_integer_min_max', min: @opts[:min], max: @opts[:max])
elsif @opts[:min]
I18n.t('site_settings.errors.invalid_integer_min', {min: @opts[:min]})
I18n.t('site_settings.errors.invalid_integer_min', min: @opts[:min])
elsif @opts[:max]
I18n.t('site_settings.errors.invalid_integer_max', {max: @opts[:max]})
I18n.t('site_settings.errors.invalid_integer_max', max: @opts[:max])
else
I18n.t('site_settings.errors.invalid_integer')
end