about summary refs log tree commit diff
path: root/app/views/settings/preferences/show.html.haml
diff options
context:
space:
mode:
authorbeatrix <beatrix.bitrot@gmail.com>2017-09-10 13:34:14 -0400
committerGitHub <noreply@github.com>2017-09-10 13:34:14 -0400
commitc9df53044a333276853f7dc7ef2aed6d48df087f (patch)
tree011ea44fc94bcff6f8ec4e23c3edf887359243d2 /app/views/settings/preferences/show.html.haml
parent3dff74eecf5387b92b862893248710d2efb90eec (diff)
parent67ad4533732f2e5cfc8c7f7ad3abaf7a5eb2647b (diff)
Merge pull request #142 from glitch-soc/sync/upstream-1.6.0rc4
Merge with 1.6.0rc4

STRAP IN BUCKAWOO HERE WE GO AGAIN
Diffstat (limited to 'app/views/settings/preferences/show.html.haml')
-rw-r--r--app/views/settings/preferences/show.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/settings/preferences/show.html.haml b/app/views/settings/preferences/show.html.haml
index fae6090c8..f42f92508 100644
--- a/app/views/settings/preferences/show.html.haml
+++ b/app/views/settings/preferences/show.html.haml
@@ -13,7 +13,7 @@
       selected: I18n.locale
 
     = f.input :filtered_languages,
-      collection: I18n.available_locales,
+      collection: filterable_languages,
       wrapper: :with_block_label,
       include_blank: false,
       label_method: lambda { |locale| human_locale(locale) },