diff --git a/app/frontend/packs/locale.js.erb b/app/frontend/packs/locale.js.erb new file mode 100644 index 000000000..4319f43c4 --- /dev/null +++ b/app/frontend/packs/locale.js.erb @@ -0,0 +1,10 @@ +import 'angular-i18n/angular-locale_<%= Rails.application.secrets.angular_locale %>.js'; +<% if Rails.application.secrets.moment_locale != 'en' %> +import 'moment/locale/<%= Rails.application.secrets.moment_locale %>.js'; +<% end %> +<% if Rails.application.secrets.summernote_locale != 'en-US' %> +import 'summernote/lang/summernote-<%= Rails.application.secrets.summernote_locale %>.js'; +<% end %> +<% if Rails.application.secrets.fullcalendar_locale != 'en' %> +import 'fullcalendar/dist/lang/<%= Rails.application.secrets.fullcalendar_locale %>.js'; +<% end %> diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 7f28ad931..60ef47237 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -95,18 +95,6 @@ module ApplicationHelper res end - ## - # check if the provided asset file is available - # @see https://github.com/rails/sprockets-rails/issues/298 - # - def asset_available?(logical_path) - if Rails.configuration.assets.compile - Rails.application.precompiled_assets.include? logical_path - else - Rails.application.assets_manifest.assets[logical_path].present? - end - end - private ## inspired by gems/actionview-4.2.5/lib/action_view/helpers/translation_helper.rb diff --git a/app/views/application/index.html.erb b/app/views/application/index.html.erb index 3b47fde1d..826fe672a 100644 --- a/app/views/application/index.html.erb +++ b/app/views/application/index.html.erb @@ -122,32 +122,6 @@ <%= javascript_packs_with_chunks_tag 'application' %> - - - - -<% if asset_available?("moment/locale/#{Rails.application.secrets.moment_locale}.js") %> - -<% - elsif Rails.application.secrets.moment_locale != 'en' - raise LoadError, "moment/locale/#{Rails.application.secrets.moment_locale}.js does not exists" - end -%> - -<% if asset_available?("summernote/lang/summernote-#{Rails.application.secrets.summernote_locale}.js") %> - -<% - elsif Rails.application.secrets.summernote_locale != 'en-US' - raise LoadError, "summernote/lang/summernote-#{Rails.application.secrets.summernote_locale}.js does not exists" - end -%> - -<% if asset_available?("fullcalendar/dist/lang/#{Rails.application.secrets.fullcalendar_locale}.js") %> - -<% - elsif Rails.application.secrets.fullcalendar_locale != 'en' - raise LoadError, "fullcalendar/dist/lang/#{Rails.application.secrets.fullcalendar_locale}.js does not exists" - end -%> +<%= javascript_packs_with_chunks_tag 'locale' %> diff --git a/babel.config.js b/babel.config.js index 4df194934..0d4c8366a 100644 --- a/babel.config.js +++ b/babel.config.js @@ -1,9 +1,9 @@ -module.exports = function(api) { - var validEnv = ['development', 'test', 'production'] - var currentEnv = api.env() - var isDevelopmentEnv = api.env('development') - var isProductionEnv = api.env('production') - var isTestEnv = api.env('test') +module.exports = function (api) { + var validEnv = ['development', 'test', 'production']; + var currentEnv = api.env(); + var isDevelopmentEnv = api.env('development'); + var isProductionEnv = api.env('production'); + var isTestEnv = api.env('test'); if (!validEnv.includes(currentEnv)) { throw new Error( @@ -12,7 +12,7 @@ module.exports = function(api) { '"test", and "production". Instead, received: ' + JSON.stringify(currentEnv) + '.' - ) + ); } return { @@ -66,5 +66,5 @@ module.exports = function(api) { } ] ].filter(Boolean) - } -} + }; +};