Merge branch 'master' into dashboard

config/application.rb

@@ -1,7 +1,6 @@
+require File.expand_path("../boot", __FILE__)
 
-require File.expand_path('../boot', __FILE__)
-
-require 'rails/all'
+require "rails/all"
 
 # Require the gems listed in Gemfile, including any gems
 # you've limited to :test, :development, or :production.
@@ -29,24 +28,30 @@ module Consul
       "fr",
       "gl",
       "he",
+      "id",
       "it",
       "nl",
       "pl",
       "pt-BR",
+      "ru",
+      "sl",
       "sq",
+      "so",
       "sv",
       "val",
       "zh-CN",
       "zh-TW"]
     config.i18n.available_locales = available_locales
     config.i18n.fallbacks = {
-      'fr'    => 'es',
-      'gl'    => 'es',
-      'it'    => 'es',
-      'pt-BR' => 'es'
+      "fr"    => "es",
+      "gl"    => "es",
+      "it"    => "es",
+      "pt-BR" => "es"
     }
-    config.i18n.load_path += Dir[Rails.root.join('config', 'locales', '**', '*.{rb,yml}')]
-    config.i18n.load_path += Dir[Rails.root.join('config', 'locales', 'custom', '**', '*.{rb,yml}')]
+    config.i18n.load_path += Dir[Rails.root.join("config", "locales", "**", "*.{rb,yml}")]
+    config.i18n.load_path += Dir[Rails.root.join("config", "locales", "custom", "**", "*.{rb,yml}")]
+
+    config.after_initialize { Globalize.set_fallbacks_to_all_available_locales }
 
     config.assets.paths << Rails.root.join("app", "assets", "fonts")
     config.assets.paths << Rails.root.join("vendor", "assets", "fonts")
@@ -55,8 +60,8 @@ module Consul
     config.active_record.raise_in_transactional_callbacks = true
 
     # Add lib to the autoload path
-    config.autoload_paths << Rails.root.join('lib')
-    config.time_zone = 'Madrid'
+    config.autoload_paths << Rails.root.join("lib")
+    config.time_zone = "Madrid"
     config.active_job.queue_adapter = :delayed_job
 
     # CONSUL specific custom overrides
@@ -66,7 +71,7 @@ module Consul
     #
     config.autoload_paths << "#{Rails.root}/app/controllers/custom"
     config.autoload_paths << "#{Rails.root}/app/models/custom"
-    config.paths['app/views'].unshift(Rails.root.join('app', 'views', 'custom'))
+    config.paths["app/views"].unshift(Rails.root.join("app", "views", "custom"))
   end
 end