diff --git a/Gemfile b/Gemfile index 3f1fc374e26..c1a007e96a4 100644 --- a/Gemfile +++ b/Gemfile @@ -70,7 +70,8 @@ gem 'lemmatizer', '~> 0.2.2' gem 'mailman', require: false # To implement fontawesome v4.7.0 gem "font-awesome-rails" - gem "lazyload-rails" +gem "lazyload-rails" +gem 'jquery-rails-cdn' # To convert html to markdown gem 'reverse_markdown' diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index bbe2691d47d..a9c46a9ea8b 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -32,6 +32,7 @@ + <%= jquery_include_tag :google, force: true %> <%= javascript_include_tag "application" %> <%= csrf_meta_tags %> diff --git a/config/application.rb b/config/application.rb index 3b1f4aa3f90..8def69ee8b7 100644 --- a/config/application.rb +++ b/config/application.rb @@ -54,15 +54,15 @@ class Application < Rails::Application # Enable the asset pipeline config.assets.enabled = true - + I18n.available_locales = [:en, :de, "zh-CN", :ar, :es, "hi-IN", :it, :ko, "pt-BR", :ru] - config.i18n.default_locale = :en - + config.i18n.default_locale = :en + config.i18n.load_path += Dir[Rails.root.join('config', 'locales', '**', '*.{rb,yml}')] # rails will fallback to config.i18n.default_locale translation config.i18n.fallbacks = true - + # rails will fallback to en, no matter what is set as config.i18n.default_locale config.i18n.fallbacks = [:en] @@ -74,6 +74,8 @@ class Application < Rails::Application config.paths.add File.join('app/api'), glob: File.join('**', '*.rb') config.autoload_paths += Dir[Rails.root.join('app','api', '**', '*.rb')] + config.assets.precompile += ['jquery3.js'] + # Version of your assets, change this if you want to expire all your assets config.assets.version = '1.0' config.assets.paths << Rails.root.join("public","lib") diff --git a/config/initializers/jquery_cdn.rb b/config/initializers/jquery_cdn.rb new file mode 100644 index 00000000000..02cc569495a --- /dev/null +++ b/config/initializers/jquery_cdn.rb @@ -0,0 +1 @@ +Jquery::Rails::Cdn.major_version = 3