github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-21 18:12:32 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Add rubocop to our build. (#5004)

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/validators/string_setting_validator.rb
View File

@ -1,5 +1,5 @@
class StringSettingValidator
def initialize(opts={})
def initialize(opts = {})
@opts = opts
@regex = Regexp.new(opts[:regex]) if opts[:regex]
@regex_error = opts[:regex_error] || 'site_settings.errors.regex_mismatch'
@ -8,12 +8,12 @@ class StringSettingValidator
def valid_value?(val)
return true if !val.present?
if (@opts[:min] and @opts[:min].to_i > val.length) || (@opts[:max] and @opts[:max].to_i < val.length)
if (@opts[:min] && @opts[:min].to_i > (val.length)) || (@opts[:max] && @opts[:max].to_i < (val.length))
@length_fail = true
return false
end
if @regex and !(val =~ @regex)
if @regex && !(val =~ @regex)
@regex_fail = true
return false
end
@ -26,11 +26,11 @@ class StringSettingValidator
I18n.t(@regex_error)
elsif @length_fail
if @opts[:min] && @opts[:max]
I18n.t('site_settings.errors.invalid_string_min_max', {min: @opts[:min], max: @opts[:max]})
I18n.t('site_settings.errors.invalid_string_min_max', min: @opts[:min], max: @opts[:max])
elsif @opts[:min]
I18n.t('site_settings.errors.invalid_string_min', {min: @opts[:min]})
I18n.t('site_settings.errors.invalid_string_min', min: @opts[:min])
else
I18n.t('site_settings.errors.invalid_string_max', {max: @opts[:max]})
I18n.t('site_settings.errors.invalid_string_max', max: @opts[:max])
end
else
I18n.t('site_settings.errors.invalid_string')