diff options
| author | cwm <chriswmartin@protonmail.com> | 2017-12-10 15:22:15 -0600 |
|---|---|---|
| committer | cwm <chriswmartin@protonmail.com> | 2017-12-10 15:22:15 -0600 |
| commit | 072ab191cc47692bad1145a26aa27912aeefb12f (patch) | |
| tree | d217dc63f36554c7271b1c68a90d8d044640a732 /app/controllers/application_controller.rb | |
| parent | eec5d350fdb94fa44c6938ca059166ff3e3e67b3 (diff) | |
| parent | 26c9b9fa276fd629789fd06f65a5d698b182f67a (diff) | |
pulled master, moved locale entry to new location
Diffstat (limited to 'app/controllers/application_controller.rb')
| -rw-r--r-- | app/controllers/application_controller.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index c6d148c8c..3b2070f39 100644 --- 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 |