diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-02-09 17:28:33 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-02-09 17:28:33 +0100 |
| commit | 322e907e0417da482789e4d24263f247f29a5769 (patch) | |
| tree | 8356833bbbf82de571feb1d739e0db7e2a50c9be /app/views/settings/preferences/appearance/show.html.haml | |
| parent | 8987ea4d6b236657b8ea97d619902668768ae8ff (diff) | |
| parent | 3aebe711fd54d75c1ea35e65a5dc342e78508d15 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/views/settings/preferences/appearance/show.html.haml`: Upstream renamed some helper functions that were used in a part of the settings page which glitch-soc slightly changed the layout of. Ported the change.
Diffstat (limited to 'app/views/settings/preferences/appearance/show.html.haml')
| -rw-r--r-- | app/views/settings/preferences/appearance/show.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/settings/preferences/appearance/show.html.haml b/app/views/settings/preferences/appearance/show.html.haml index ccea2e9b7..89bd4f459 100644 --- a/app/views/settings/preferences/appearance/show.html.haml +++ b/app/views/settings/preferences/appearance/show.html.haml @@ -6,7 +6,7 @@ = simple_form_for current_user, url: settings_preferences_appearance_path, html: { method: :put, id: 'edit_user' } do |f| .fields-group - = f.input :locale, collection: I18n.available_locales, wrapper: :with_label, include_blank: false, label_method: lambda { |locale| human_locale(locale) }, selected: I18n.locale, hint: false + = f.input :locale, collection: I18n.available_locales, wrapper: :with_label, include_blank: false, label_method: lambda { |locale| native_locale_name(locale) }, selected: I18n.locale, hint: false - unless I18n.locale == :en .flash-message.translation-prompt |