tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' into glitch-soc/merge-upstream

Browse Source 
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.
This commit is contained in:
Claire
2022-02-09 17:28:33 +01:00
parent 8987ea4d6b 3aebe711fd
commit 322e907e04
28 changed files with 645 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/settings/preferences/appearance/show.html.haml
View File

@@ -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