Update order of install generator

projectblacklight · Jan 30, 2024 · c988068 · c988068
1 parent 3c182f1
commit c988068
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 13 deletions.
diff --git a/lib/generators/spotlight/install_generator.rb b/lib/generators/spotlight/install_generator.rb
@@ -152,24 +152,20 @@ def add_mailer_defaults
       end
     end
 
-    def generate_config
-      directory 'config'
-    end
-
-    def add_solr_config_resources
-      copy_file '.solr_wrapper.yml', '.solr_wrapper.yml'
-      directory 'solr'
-    end
-
     def generate_devise_invitable
       gem 'devise_invitable'
       bundle_install
       generate 'devise_invitable:install'
       generate 'devise_invitable', 'User'
     end
 
-    def add_translations
-      copy_file 'config/initializers/translation.rb'
+    def generate_config
+      directory 'config'
+    end
+
+    def add_solr_config_resources
+      copy_file '.solr_wrapper.yml', '.solr_wrapper.yml'
+      directory 'solr'
     end
 
     def configure_logging

diff --git a/lib/generators/spotlight/templates/config/initializers/translation.rb b/lib/generators/spotlight/templates/config/initializers/translation.rb
@@ -7,8 +7,10 @@
   # Don't allow initializer to break if DB doesn't exist yet
   # see: https://github.com/projectblacklight/spotlight/issues/2133
   if ENV['SKIP_TRANSLATION'].blank?
-    raise unless Translation.table_exists?
-
+    unless Translation.table_exists?
+      warn "Translation table doesn't exist. Skipping translation config."
+      next
+    end
     ##
     # Sets up the new Spotlight Translation backend, backed by ActiveRecord. To
     # turn on the ActiveRecord backend, uncomment the following lines.