diff options
| author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 23:05:08 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 23:05:08 -0400 |
| commit | 63686fd36f9dead2bc0d4b3cb53d841a9b320da2 (patch) | |
| tree | cf24925ee083396659048373096e8907de458341 /app/services | |
| parent | 4c751d25e5f0a2a211115b069651f0747c162d7a (diff) | |
| parent | a25a384af3d08a05bc0907261f76410da36cbb10 (diff) | |
Merge branch 'master' into patch-2
Diffstat (limited to 'app/services')
| -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 |