AO3-4820-AO3-3810 i18n and tidy

app/models/skin.rb

@@ -93,7 +93,7 @@ def clean_media
   validate :valid_media
   def valid_media
     if media && media.is_a?(Array) && media.any? {|m| !MEDIA.include?(m)}
-      errors.add(:base, ts("We don't currently support the media type %{media}, sorry! If we should, please let Support know.", media: media.join(', ')))
+      errors.add(:base, :invalid_media, media: media.join(', '))
     end
   end
 
@@ -103,15 +103,15 @@ def valid_media
   validate :valid_public_preview
   def valid_public_preview
     return true if (self.official? || !self.public? || self.icon_file_name)
-    errors.add(:base, ts("You need to upload a screencap if you want to share your skin."))
+    errors.add(:base, :no_public_preview)
   end
 
-  validates :title, presence: true, uniqueness: { message: ts("must be unique"), case_sensitive: true }
+  validates :title, presence: true, uniqueness: { case_sensitive: true }
   validate :allowed_title
   def allowed_title
-    return true if (!self.title.match(/archive/i) || User.current_user.is_a?(Admin))
+    return true if !self.title.match(/archive/i) || User.current_user.is_a?(Admin)
 
-    errors.add(:base, ts("You can't use the word 'Archive' in your skin title, sorry! (We have to reserve it for official skins.)"))
+    errors.add(:base, :archive_in_title)
   end
 
   validates_numericality_of :margin, :base_em, allow_nil: true

config/locales/models/en.yml

@@ -155,6 +155,15 @@ en:
               not_work: Only a link to a work can be listed as an inspiration.
               protected: You can't use the related works function to cite works by the protected user %{login}.
           format: "%{message}"
+        skin:
+          attributes:
+            base:
+              archive_in_title: You can't use the word 'Archive' in your skin title, sorry! (We have to reserve it for official skins.)
+              format: "%{message}"
+              invalid_media: We don't currently support the media type %{media}, sorry! If we should, please let Support know.
+              no_public_preview: You need to upload a screencap if you want to share your skin.
+            title:
+              taken: must be unique
         skin/skin_parents:
           attributes:
             base:

features/admins/admin_skins.feature

@@ -139,7 +139,7 @@ Feature: Admin manage skins
   Then I should not see "{ text-decoration: blink; }" in the page style
 
   Scenario: Admin can edit a skin with the word "archive" in the title
-  Given the approved public skin "official archive skin" that has reserved words in the title
+  Given the approved public skin "official archive skin" has reserved words in the title
     And I am logged in as a "superadmin" admin
   When I go to "official archive skin" skin page
     And I follow "Edit"

features/step_definitions/skin_steps.rb

@@ -80,21 +80,21 @@
   Skin.load_site_css
 end
 
-Given /^the approved public skin "([^"]*)" with css "([^"]*)"$/ do |skin_name, css|
-  step "the unapproved public skin \"#{skin_name}\" with css \"#{css}\""
-  step "I approve the skin \"#{skin_name}\""
+Given "the approved public skin {string} with css {string}" do |skin_name, css|
+  step %{the unapproved public skin "#{skin_name}" with css "#{css}"}
+  step %{I approve the skin "#{skin_name}"}
   step "I am logged out"
 end
 
 Given /^the approved public skin "([^"]*)"$/ do |skin_name|
   step "the approved public skin \"#{skin_name}\" with css #{DEFAULT_CSS}"
 end
 
-Given /^the approved public skin "(.*?)" that has reserved words in the title$/ do |skin_name|
+Given "the approved public skin {string} has reserved words in the title" do |skin_name|
   # Admins can't create skins, so we have to create it this way.
   FactoryBot.build(:skin, title: skin_name, public: true).save!(validate: false)
 
-  step "I approve the skin \"#{skin_name}\""
+  step %{I approve the skin "#{skin_name}"}
   step "I am logged out"
 end