From 29a22691d2a9eefbc2eb886659843f87d187c98e Mon Sep 17 00:00:00 2001 From: Gô Shoemake Date: Mon, 19 Jun 2017 02:31:14 -0700 Subject: Fix character/grapheme count stuff (#3839) * Bring Toot button in line with counter Both should use stringz I guess * Use grapheme_length for character count --- app/validators/status_length_validator.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/validators/status_length_validator.rb') diff --git a/app/validators/status_length_validator.rb b/app/validators/status_length_validator.rb index 55135a598..3f3e422d9 100644 --- a/app/validators/status_length_validator.rb +++ b/app/validators/status_length_validator.rb @@ -5,6 +5,6 @@ class StatusLengthValidator < ActiveModel::Validator def validate(status) return unless status.local? && !status.reblog? - status.errors.add(:text, I18n.t('statuses.over_character_limit', max: MAX_CHARS)) if [status.text, status.spoiler_text].join.length > MAX_CHARS + status.errors.add(:text, I18n.t('statuses.over_character_limit', max: MAX_CHARS)) if [status.text, status.spoiler_text].join.mb_chars.grapheme_length > MAX_CHARS end end -- cgit