app/controllers/contributions_controller.rb

@@ -11,7 +11,8 @@ class ContributionsController < ApplicationController
       @contributions,
       :scopes => {
         'Item' => Item.includes(:translations),
-        'PetType' => PetType.includes(:species, :color)
+        'PetType' => PetType.includes({:species => :translations,
+                                       :color => :translations})
       }
     )
   end

app/controllers/outfits_controller.rb

@@ -59,9 +59,12 @@ class OutfitsController < ApplicationController
     @newest_unmodeled_items_predicted_missing_species_by_color = {}
     @newest_unmodeled_items_predicted_modeled_ratio = {}
     @newest_unmodeled_items.each do |item|
-      h = item.predicted_missing_nonstandard_body_ids_by_species_by_color
+      h = item.predicted_missing_nonstandard_body_ids_by_species_by_color(
+        Color.includes(:translations),
+        Species.includes(:translations))
       standard_body_ids_by_species = item.
-        predicted_missing_standard_body_ids_by_species
+        predicted_missing_standard_body_ids_by_species(
+          Species.includes(:translations))
       if standard_body_ids_by_species.present?
         h[:standard] = standard_body_ids_by_species
       end

app/controllers/pet_types_controller.rb

@@ -2,7 +2,7 @@ class PetTypesController < ApplicationController
 	def index
 		color = Color.find params[:color_id]
 		pet_types = color.pet_types.includes(pet_states: [:swf_assets]).
-			includes(:species)
+			includes(species: [:translations])
 
 		# This is a relatively big request, for relatively static data. Let's
 		# consider it fresh for 10min (so new pet releases show up quickly), but

app/helpers/items_helper.rb

@@ -106,7 +106,7 @@ module ItemsHelper
     species_ids = species.map(&:id)
     pet_types = special_color ?
       PetType.where(:color_id => special_color.id, :species_id => species_ids).
-        order(:species_id) :
+        order(:species_id).includes_child_translations :
       PetType.random_basic_per_species(species.map(&:id))
     pet_types.map(&block).join.html_safe
   end

app/models/color.rb

@@ -1,23 +1,27 @@
 class Color < ApplicationRecord
-  translates # TODO: Remove once we're all done with translations!
+  translates :name
   has_many :pet_types
   
-  scope :alphabetical, -> { order(:name) }
-  scope :basic, -> { where(basic: true) }
-  scope :standard, -> { where(standard: true) }
-  scope :nonstandard, -> { where(standard: false) }
+  scope :alphabetical, -> {
+    ct = Color::Translation.arel_table
+    with_translations(I18n.locale).order(ct[:name].asc)
+  }
+  scope :basic, -> { where(:basic => true) }
+  scope :standard, -> { where(:standard => true) }
+  scope :nonstandard, -> { where(:standard => false) }
   scope :funny, -> { order(:prank) unless pranks_funny? }
+  scope :matching_name, ->(name, locale = I18n.locale) {
+    ct = Color::Translation.arel_table
+    joins(:translations).where(ct[:locale].eq(locale)).
+      where(ct[:name].matches(sanitize_sql_like(name)))
+  }
 
   validates :name, presence: true
 
-  # Temporary writer to keep the English translation record updated, while
-  # primarily using the attribute on the model itself.
-  #
-  # Once this app and DTI 2020 are both comfortably off the translation system,
-  # we can remove this!
-  def name=(new_name)
-    globalize.write(:en, :name, new_name)
-    write_attribute(:name, new_name)
+  # TODO: Should we consider replacing this at call sites? This used to be
+  # built into the globalize gem but isn't anymore!
+  def self.find_by_name(name)
+    matching_name(name).first
   end
   
   def as_json(options={})

app/models/item.rb

@@ -352,8 +352,8 @@ class Item < ApplicationRecord
               inject({}) { |h, pt| h[pt.species_id] = pt.body_id; h }
   end
 
-  def predicted_missing_standard_body_ids_by_species
-    species = Species.where(id: predicted_missing_standard_body_ids_by_species_id.keys)
+  def predicted_missing_standard_body_ids_by_species(species_scope=Species.all)
+    species = species_scope.where(id: predicted_missing_standard_body_ids_by_species_id.keys)
     species_by_id = species.inject({}) { |h, s| h[s.id] = s; h }
     predicted_missing_standard_body_ids_by_species_id.inject({}) { |h, (sid, bid)|
       h[species_by_id[sid]] = bid; h }
@@ -365,16 +365,16 @@ class Item < ApplicationRecord
                   colors: {standard: false})
   end
 
-  def predicted_missing_nonstandard_body_ids_by_species_by_color
+  def predicted_missing_nonstandard_body_ids_by_species_by_color(colors_scope=Color.all, species_scope=Species.all)
     pet_types = predicted_missing_nonstandard_body_pet_types
 
     species_by_id = {}
-    Species.find(pet_types.map(&:species_id)).each do |species|
+    species_scope.find(pet_types.map(&:species_id)).each do |species|
       species_by_id[species.id] = species
     end
 
     colors_by_id = {}
-    Color.find(pet_types.map(&:color_id)).each do |color|
+    colors_scope.find(pet_types.map(&:color_id)).each do |color|
       colors_by_id[color.id] = color
     end
 

app/models/item/search/query.rb

@@ -49,7 +49,7 @@ class Item
           when 'fits'
             color_name, species_name = value.split('-')
             begin
-              pet_type = PetType.matching_name(color_name, species_name).first!
+              pet_type = PetType.matching_name(color_name, species_name, locale).first!
             rescue ActiveRecord::RecordNotFound
               message = I18n.translate('items.search.errors.not_found.pet_type',
                 name1: color_name.capitalize, name2: species_name.capitalize)
@@ -60,8 +60,8 @@ class Item
               Filter.not_fits(pet_type.body_id, color_name, species_name))
           when 'species'
             begin
-              species = Species.find_by_name!(value)
-              color = Color.find_by_name!('blue')
+              species = Species.matching_name(value, locale).first!
+              color = Color.matching_name('blue', 'en').first!
               pet_type = PetType.where(color_id: color.id, species_id: species.id).first!
             rescue ActiveRecord::RecordNotFound
               message = I18n.translate('items.search.errors.not_found.species',

app/models/pet_type.rb

@@ -19,9 +19,12 @@ class PetType < ApplicationRecord
 
   scope :nonstandard_colors, -> { where(:color_id => Color.nonstandard) }
   
-  scope :matching_name, ->(color_name, species_name) {
-    color = Color.find_by_name!(color_name)
-    species = Species.find_by_name!(species_name)
+  scope :includes_child_translations,
+    -> { includes({:color => :translations, :species => :translations}) }
+  
+  scope :matching_name, ->(color_name, species_name, locale = I18n.locale) {
+    color = Color.matching_name(color_name, locale).first!
+    species = Species.matching_name(species_name, locale).first!
     where(color_id: color.id, species_id: species.id)
   }
 

app/models/species.rb

@@ -1,22 +1,27 @@
 class Species < ApplicationRecord
-  translates # TODO: Remove once we're all done with translations!
+  translates :name
   has_many :pet_types
   
-  scope :alphabetical, -> { order(:name) }
+  scope :alphabetical, -> {
+    st = Species::Translation.arel_table
+    with_translations(I18n.locale).order(st[:name].asc)
+  }
+
+  scope :matching_name, ->(name, locale = I18n.locale) {
+    st = Species::Translation.arel_table
+    joins(:translations).where(st[:locale].eq(locale)).
+      where(st[:name].matches(sanitize_sql_like(name)))
+  }
 
   scope :with_body_id, -> body_id {
     pt = PetType.arel_table
     joins(:pet_types).where(pt[:body_id].eq(body_id)).limit(1)
   }
 
-  # Temporary writer to keep the English translation record updated, while
-  # primarily using the attribute on the model itself.
-  #
-  # Once this app and DTI 2020 are both comfortably off the translation system,
-  # we can remove this!
-  def name=(new_name)
-    globalize.write(:en, :name, new_name)
-    write_attribute(:name, new_name)
+  # TODO: Should we consider replacing this at call sites? This used to be
+  # built into the globalize gem but isn't anymore!
+  def self.find_by_name(name)
+    matching_name(name).first
   end
   
   def as_json(options={})

db/migrate/20240123125509_add_name_to_species_and_color.rb

@@ -1,20 +0,0 @@
-class AddNameToSpeciesAndColor < ActiveRecord::Migration[7.1]
-  def change
-    add_column :species, :name, :string, null: false
-    add_column :colors, :name, :string, null: false
-
-    reversible do |direction|
-      direction.up do
-        Species.includes(:translations).find_each do |species|
-          species.name = species.translation_for(:en).name
-          species.save!
-        end
-
-        Color.includes(:translations).find_each do |color|
-          color.name = color.translation_for(:en).name
-          color.save!
-        end
-      end
-    end
-  end
-end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.1].define(version: 2024_01_23_125509) do
+ActiveRecord::Schema[7.1].define(version: 2024_01_19_061745) do
   create_table "auth_servers", id: :integer, charset: "latin1", collation: "latin1_swedish_ci", force: :cascade do |t|
     t.string "short_name", limit: 10, null: false
     t.string "name", limit: 40, null: false
@@ -74,7 +74,6 @@ ActiveRecord::Schema[7.1].define(version: 2024_01_23_125509) do
     t.boolean "basic"
     t.boolean "standard"
     t.boolean "prank", default: false, null: false
-    t.string "name", null: false
   end
 
   create_table "contributions", id: :integer, charset: "latin1", collation: "latin1_swedish_ci", force: :cascade do |t|
@@ -234,7 +233,6 @@ ActiveRecord::Schema[7.1].define(version: 2024_01_23_125509) do
   end
 
   create_table "species", id: :integer, charset: "latin1", collation: "latin1_swedish_ci", force: :cascade do |t|
-    t.string "name", null: false
   end
 
   create_table "species_translations", id: :integer, charset: "latin1", collation: "latin1_swedish_ci", force: :cascade do |t|