diff options
author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 21:34:41 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-07 21:34:41 -0400 |
commit | bc237d17a71320829dce55d8dca4013d5f772665 (patch) | |
tree | 006e8e3df6d3ba1e9967c32cc7d27885d0a19914 /app/services/post_status_service.rb | |
parent | c441208e29cc86cbf514851879bdaa9130351b22 (diff) | |
parent | a872f2f4c64f4a370fa1a92a28f9c07c1dd3b06d (diff) |
Merge branch 'master' into patch-1
Diffstat (limited to 'app/services/post_status_service.rb')
-rw-r--r-- | app/services/post_status_service.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/services/post_status_service.rb b/app/services/post_status_service.rb index b8179f7dc..221aa42a3 100644 --- a/app/services/post_status_service.rb +++ b/app/services/post_status_service.rb @@ -37,11 +37,11 @@ class PostStatusService < BaseService def validate_media!(media_ids) return if media_ids.nil? || !media_ids.is_a?(Enumerable) - raise Mastodon::ValidationError, 'Cannot attach more than 4 files' if media_ids.size > 4 + raise Mastodon::ValidationError, I18n.t('media_attachments.validations.too_many') if media_ids.size > 4 media = MediaAttachment.where(status_id: nil).where(id: media_ids.take(4).map(&:to_i)) - raise Mastodon::ValidationError, 'Cannot attach a video to a toot that already contains images' if media.size > 1 && media.find(&:video?) + raise Mastodon::ValidationError, I18n.t('media_attachments.validations.images_and_video') if media.size > 1 && media.find(&:video?) media end |