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/views/layouts | |
| parent | eec5d350fdb94fa44c6938ca059166ff3e3e67b3 (diff) | |
| parent | 26c9b9fa276fd629789fd06f65a5d698b182f67a (diff) | |
pulled master, moved locale entry to new location
Diffstat (limited to 'app/views/layouts')
| -rwxr-xr-x | app/views/layouts/application.html.haml | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 99ae7d90d..20603678b 100755 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -19,7 +19,11 @@ = title = javascript_pack_tag "locales", integrity: true, crossorigin: 'anonymous' - = javascript_pack_tag "locale_#{I18n.locale}", integrity: true, crossorigin: 'anonymous' + - if @theme + - if @theme[:supported_locales].include? I18n.locale.to_s + = javascript_pack_tag "locales/#{@theme[:flavour]}/#{I18n.locale}", integrity: true, crossorigin: 'anonymous' + - elsif @theme[:supported_locales].include? 'en' + = javascript_pack_tag "locales/#{@theme[:flavour]}/en", integrity: true, crossorigin: 'anonymous' = csrf_meta_tags = yield :header_tags |