Merge pull request #43 from AlchemyCMS/move-js-assets

Fix loading of JS locales

Author: tvdeyen

README.md

@@ -1,12 +1,13 @@
 # AlchemyCMS Translations
 
-Translations files for AlchemyCMS 4.4 and above.
+Translations files for AlchemyCMS 6.0 and above.
 
 ## Installation
 
 Add this Gem to your `Gemfile` and run the install generator
 
 ```
+bundle add alchemy_i18n
 bin/rails g alchemy_i18n:install
 ```
 

alchemy_i18n.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
 
   s.files = Dir["{app,locales,lib,vendor}/**/*", "CHANGELOG.md", "LICENSE", "README.md"]
 
-  s.add_dependency "alchemy_cms", [">= 4.4.0.a", "< 6.1"]
+  s.add_dependency "alchemy_cms", [">= 6.0.0", "< 7"]
   s.add_dependency "rails-i18n"
 
   s.add_development_dependency "github_changelog_generator"

lib/generators/alchemy_i18n/install/install_generator.rb

@@ -20,31 +20,15 @@ def self.description
 
       source_root AlchemyI18n::Engine.root
 
-      def copy_locales
-        locales.each do |locale|
-          js_filename = "#{locale}.js"
-          copy_file File.join('app', 'assets', 'javascripts', 'alchemy_i18n', js_filename), Rails.root.join('vendor', 'assets', 'javascripts', 'alchemy_i18n', js_filename)
-          copy_file File.join('vendor', 'assets', 'javascripts', 'flatpickr', js_filename), Rails.root.join('vendor', 'assets', 'javascripts', 'flatpickr', js_filename)
-        end
-      end
-
       def append_assets
         locales.each do |locale|
           append_file 'vendor/assets/javascripts/alchemy/admin/all.js', <<~ASSETS
             //= require alchemy_i18n/#{locale}
             //= require select2_locale_#{locale}
-            //= require flatpickr/#{locale}
           ASSETS
         end
       end
 
-      def copy_tinymce_locales
-        locales.each do |locale|
-          copy_file File.join("locales", "tinymce", "#{locale}.js"),
-            Rails.root.join('vendor', 'assets', 'javascripts', 'tinymce', 'langs', "#{locale}.js")
-        end
-      end
-
       def append_manifest
         locales.each do |locale|
           append_file 'app/assets/config/manifest.js', <<~MANIFEST
@@ -53,6 +37,16 @@ def append_manifest
         end
       end
 
+      def append_pack
+        webpack_config = YAML.load_file(Rails.root.join("config", "webpacker.yml"))[Rails.env]
+        pack = Rails.root.join(webpack_config["source_path"], webpack_config["source_entry_path"], "alchemy/admin.js")
+        locales.each do |locale|
+          append_file pack, <<~PACK
+            import "flatpickr/dist/l10n/#{locale}.js"
+          PACK
+        end
+      end
+
       def add_rails_i18n
         environment do
           "config.i18n.available_locales = #{locales.map(&:to_sym).inspect}"