see if rubocop will let me get away with not fixing all instances of …

…ts()
otwcode · Sep 22, 2024 · 450dbeb · 450dbeb
1 parent 047a875
commit 450dbeb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/app/models/collection.rb b/app/models/collection.rb
@@ -146,8 +146,8 @@ def title
                       maximum: ArchiveConfig.SUMMARY_MAX,
                       too_long: ts("must be less than %{max} characters long.", max: ArchiveConfig.SUMMARY_MAX) }
 
-  validates :header_image_url, format: { allow_blank: true, with: URI::DEFAULT_PARSER.make_regexp(%w[http https]), message: ts("is not a valid URL.") }
-  validates :header_image_url, format: { allow_blank: true, with: /\A\S+\.(png|gif|jpg)\z/, message: ts("can only point to a gif, jpg, or png file."), multiline: true }
+  validates :header_image_url, format: { allow_blank: true, with: URI::DEFAULT_PARSER.make_regexp(%w[http https]), message: I18n.t("collection.header_image.invalid_url") }
+  validates :header_image_url, format: { allow_blank: true, with: /\A\S+\.(png|gif|jpg)\z/, message: I18n.t("collection.header_image.invalid_file_type"), multiline: true }
 
   validates :tags_after_saving,
             length: { maximum: ArchiveConfig.COLLECTION_TAGS_MAX,
@@ -207,7 +207,7 @@ def to_param
   end
 
   # Change membership of collection(s) from a particular pseud to the orphan account
-  def self.orphan(pseuds, collections, default=true)
+  def self.orphan(pseuds, collections, default = true)
     pseuds.each do |pseud|
       collections.each do |collection|
         if pseud && collection && collection.owners.include?(pseud)

diff --git a/config/locales/models/en.yml b/config/locales/models/en.yml
@@ -235,6 +235,10 @@ en:
         other: Works
   attributes:
     ticket_number: Ticket ID
+  collection:
+    header_image:
+      invalid_file_type: can only point to a gif, jpg, or png file.
+      invalid_url: is not a valid URL.
   errors:
     attributes:
       ticket_number: