Remove deprecated mb_chars
method (#34039)
This commit is contained in:
parent
43f616a1c8
commit
d90d68bddf
11 changed files with 69 additions and 11 deletions
|
@ -8,7 +8,7 @@ class NoteLengthValidator < ActiveModel::EachValidator
|
|||
private
|
||||
|
||||
def too_long?(value)
|
||||
countable_text(value).mb_chars.grapheme_length > options[:maximum]
|
||||
countable_text(value).each_grapheme_cluster.size > options[:maximum]
|
||||
end
|
||||
|
||||
def countable_text(value)
|
||||
|
|
|
@ -7,7 +7,7 @@ class PollOptionsValidator < ActiveModel::Validator
|
|||
def validate(poll)
|
||||
poll.errors.add(:options, I18n.t('polls.errors.too_few_options')) unless poll.options.size > 1
|
||||
poll.errors.add(:options, I18n.t('polls.errors.too_many_options', max: MAX_OPTIONS)) if poll.options.size > MAX_OPTIONS
|
||||
poll.errors.add(:options, I18n.t('polls.errors.over_character_limit', max: MAX_OPTION_CHARS)) if poll.options.any? { |option| option.mb_chars.grapheme_length > MAX_OPTION_CHARS }
|
||||
poll.errors.add(:options, I18n.t('polls.errors.over_character_limit', max: MAX_OPTION_CHARS)) if poll.options.any? { |option| option.each_grapheme_cluster.size > MAX_OPTION_CHARS }
|
||||
poll.errors.add(:options, I18n.t('polls.errors.duplicate_options')) unless poll.options.uniq.size == poll.options.size
|
||||
end
|
||||
end
|
||||
|
|
|
@ -18,7 +18,7 @@ class StatusLengthValidator < ActiveModel::Validator
|
|||
end
|
||||
|
||||
def countable_length(str)
|
||||
str.mb_chars.grapheme_length
|
||||
str.each_grapheme_cluster.size
|
||||
end
|
||||
|
||||
def combined_text(status)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue