diff options
| author | Ondřej Hruška <ondra@ondrovo.com> | 2017-09-28 09:20:59 +0200 |
|---|---|---|
| committer | Ondřej Hruška <ondra@ondrovo.com> | 2017-09-28 09:20:59 +0200 |
| commit | daad07b1d552d5af06b4d8443afdbe1350785a14 (patch) | |
| tree | 4062f211cd6e307a5bbb7c338263f366a9fafade /app/views/settings | |
| parent | 83bda6c1a813c5aeb131b18a0500fed0c07fa9c2 (diff) | |
| parent | f7ca205f382a9d528bf37e3ec38ee8bf77dccccf (diff) | |
Merge remote-tracking branch 'origin/better-themeing' into merging-upstream
Diffstat (limited to 'app/views/settings')
| -rw-r--r-- | app/views/settings/preferences/show.html.haml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/views/settings/preferences/show.html.haml b/app/views/settings/preferences/show.html.haml index f42f92508..5efd538e4 100644 --- a/app/views/settings/preferences/show.html.haml +++ b/app/views/settings/preferences/show.html.haml @@ -5,6 +5,8 @@ = render 'shared/error_messages', object: current_user .fields-group + = f.input :setting_theme, collection: Themes.instance.names, label_method: lambda { |theme| safe_join([I18n.t("themes.#{theme}", default: theme)])}, wrapper: :with_label, include_blank: false + = f.input :locale, collection: I18n.available_locales, wrapper: :with_label, |