Use I18n for media attachment validation errors

These are currently user facing errors, but are not localized. This adds the
ability for these messages to be localized.

diff --git a/app/services/post_status_service.rb b/app/services/post_status_service.rb
index b8179f7dccfc9ca63389d001f75a57f836582e0d..221aa42a3896ff82beb3bf6126b590bdbc252a8f 100644 (file)
--- 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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 742219df99f7d84056f935621a33b2db49b9f5c6..aa3a732f96b967fda38df3ad9bbb5217c73430ed 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -163,3 +163,7 @@ en:
     invalid_otp_token: Invalid two-factor code
   will_paginate:
     page_gap: "…"
+  media_attachments:
+    validations:
+      too_many: Cannot attach more than 4 files
+      images_and_video: Cannot attach a video to a status that already contains images

diff --git a/spec/services/post_status_service_spec.rb b/spec/services/post_status_service_spec.rb
index 3fe878f637fd7f853c93ed5ea837558b38035e34..0e39cd969a8d0c0e9b6619f36e80c3a9d885c321 100644 (file)
--- a/spec/services/post_status_service_spec.rb
+++ b/spec/services/post_status_service_spec.rb
@@ -141,7 +141,7 @@ RSpec.describe PostStatusService do
       )
     end.to raise_error(
       Mastodon::ValidationError,
-      'Cannot attach more than 4 files',
+      I18n.t('media_attachments.validations.too_many'),
     )
   end
 
@@ -160,7 +160,7 @@ RSpec.describe PostStatusService do
       )
     end.to raise_error(
       Mastodon::ValidationError,
-      'Cannot attach a video to a toot that already contains images',
+      I18n.t('media_attachments.validations.images_and_video'),
     )
   end