Merge pull request #3372 from AlchemyCMS/fix-installer

fix(install generator): Init config with language

Author: tvdeyen

lib/generators/alchemy/install/install_generator.rb

@@ -60,7 +60,17 @@ def copy_yml_files
       end
 
       def copy_config_rb
-        @default_config = Alchemy::Configurations::Main.new
+        @default_language = get_primary_language(
+          code: options[:default_language_code],
+          name: options[:default_language_name],
+          auto_accept: options[:auto_accept]
+        )
+        @default_config = Alchemy::Configurations::Main.new(
+          default_language: {
+            name: @default_language[:name],
+            code: @default_language[:code]
+          }
+        )
         template "#{__dir__}/templates/alchemy.rb.tt", app_config_path.join("initializers", "alchemy.rb")
       end
 
@@ -109,6 +119,16 @@ def finalize
 
       private
 
+      def get_primary_language(code: "en", name: "English", auto_accept: false)
+        unless options[:auto_accept]
+          code = ask("- What is the language code of your site's primary language?", default: code)
+        end
+        unless options[:auto_accept]
+          name = ask("- What is the name of your site's primary language?", default: name)
+        end
+        {code:, name:}
+      end
+
       def header
         return if options[:auto_accept]
 

lib/generators/alchemy/install/templates/alchemy.rb.tt

@@ -97,12 +97,12 @@ Alchemy.configure do |config|
   # end
 
   # This is the default language when seeding.
-  # config.default_language.tap do |default_language|
-  #   default_language.code = <%= @default_config.default_language.code.inspect %>
-  #   default_language.name = <%= @default_config.default_language.name.inspect %>
-  #   default_language.page_layout = <%= @default_config.default_language.page_layout.inspect %>
-  #   default_language.frontpage_name = <%= @default_config.default_language.frontpage_name.inspect %>
-  # end
+  config.default_language.tap do |default_language|
+    default_language.code = <%= @default_config.default_language.code.inspect %>
+    default_language.name = <%= @default_config.default_language.name.inspect %>
+    # default_language.page_layout = <%= @default_config.default_language.page_layout.inspect %>
+    # default_language.frontpage_name = <%= @default_config.default_language.frontpage_name.inspect %>
+  end
 
   # === Mailer Settings:
   #
@@ -193,4 +193,8 @@ Alchemy.configure do |config|
 
   # The sizes for the preview size select in the page editor.
   # config.page_preview_sizes = <%= @default_config.page_preview_sizes.inspect %>
+
+  # The storage adapter for Pictures and Attachments
+  #
+  config.storage_adapter = <%= @default_config.storage_adapter.inspect %>
 end