diff options
| author | ncls7615 <himasoto@gmail.com> | 2017-12-11 09:43:21 +0900 |
|---|---|---|
| committer | ncls7615 <himasoto@gmail.com> | 2017-12-11 09:43:21 +0900 |
| commit | a98b0a47ef19f587da60907b68c5c5edfde432a0 (patch) | |
| tree | 50a37fa1dc6aafb1210a441dd989605a646d3e21 /app/views | |
| parent | 0e567977923f2e7827192da0990d529859033f1a (diff) | |
| parent | 26c9b9fa276fd629789fd06f65a5d698b182f67a (diff) | |
Merge branch 'master' of https://github.com/glitch-soc/mastodon into glitch-langfiles
# Conflicts: # app/javascript/glitch/locales/ja.json
Diffstat (limited to 'app/views')
| -rwxr-xr-x | app/views/layouts/application.html.haml | 6 | ||||
| -rw-r--r-- | app/views/settings/preferences/show.html.haml | 4 |
2 files changed, 7 insertions, 3 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 diff --git a/app/views/settings/preferences/show.html.haml b/app/views/settings/preferences/show.html.haml index 9564c0399..e2e48a699 100644 --- a/app/views/settings/preferences/show.html.haml +++ b/app/views/settings/preferences/show.html.haml @@ -27,8 +27,8 @@ .fields-group - if Themes.instance.flavours.size > 1 - = f.input :setting_flavour, collection: Themes.instance.flavours, label_method: lambda { |flavour| I18n.t("themes.#{flavour}", default: flavour) }, wrapper: :with_label, include_blank: false - = f.input :setting_skin, collection: Themes.instance.skins_for(current_flavour), label_method: lambda { |skin| I18n.t("themes.#{current_flavour}.skins.#{skin}", default: skin) }, wrapper: :with_label, include_blank: false + = f.input :setting_flavour, collection: Themes.instance.flavours, label_method: lambda { |flavour| I18n.t("flavours.#{flavour}", default: flavour) }, wrapper: :with_label, include_blank: false + = f.input :setting_skin, collection: Themes.instance.skins_for(current_flavour), label_method: lambda { |skin| I18n.t("skins.#{current_flavour}.#{skin}", default: skin) }, wrapper: :with_label, include_blank: false = f.input :setting_unfollow_modal, as: :boolean, wrapper: :with_label = f.input :setting_boost_modal, as: :boolean, wrapper: :with_label |