From 29a22691d2a9eefbc2eb886659843f87d187c98e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=B4=20Shoemake?= Date: Mon, 19 Jun 2017 02:31:14 -0700 Subject: [PATCH] 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 --- .../mastodon/features/compose/components/compose_form.js | 3 ++- app/validators/status_length_validator.rb | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/javascript/mastodon/features/compose/components/compose_form.js b/app/javascript/mastodon/features/compose/components/compose_form.js index 8da3f8046..0ee45c978 100644 --- a/app/javascript/mastodon/features/compose/components/compose_form.js +++ b/app/javascript/mastodon/features/compose/components/compose_form.js @@ -18,6 +18,7 @@ import UploadFormContainer from '../containers/upload_form_container'; import TextIconButton from './text_icon_button'; import WarningContainer from '../containers/warning_container'; import ImmutablePureComponent from 'react-immutable-pure-component'; +import { length } from 'stringz'; const messages = defineMessages({ placeholder: { id: 'compose_form.placeholder', defaultMessage: 'What is on your mind?' }, @@ -193,7 +194,7 @@ class ComposeForm extends ImmutablePureComponent {
-
+
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