pulled master, moved locale entry to new location

2017-12-10 15:22:15 -06:00
parent eec5d350fd 26c9b9fa27
commit 072ab191cc
77 changed files with 1611 additions and 175 deletions
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@ -62,6 +62,7 @@ class ApplicationController < ActionController::Base
      pack: pack_name,
      preload: nil,
      skin: nil,
+      supported_locales: data['locales'],
    }
    if data['pack'][pack_name].is_a?(Hash)
      pack_data[:common] = nil if data['pack'][pack_name]['use_common'] == false
@ -93,6 +94,7 @@ class ApplicationController < ActionController::Base
      pack: nil,
      preload: nil,
      skin: nil,
+      supported_locales: data['locales'],
    }
  end