Use I18n.available_locales to build @locales options

This is more "the Rails way (tm)" and therefore less magic for new developers, but also comes with a bonus advantage: It's possible to check in new locale files or keep no longer maintained existing ones while excluding them from the language dropdowns.
ivaldi · Oct 11, 2018 · ddf473d · ddf473d
1 parent 4115152
commit ddf473d
Showing 1 changed file with 2 additions and 7 deletions.
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -62,13 +62,8 @@ def load_labels
 
   def set_locale
     @time_zones = ActiveSupport::TimeZone.all.map(&:name).sort
-    @locales = []
-
-    Dir.open("#{Rails.root}/config/locales").each do |file|
-      unless ['.', '..'].include?(file) || file[0] == '.'
-        code = file[0...-4] # strip of .yml
-        @locales << [I18n.translate(:language_name, locale: code), code]
-      end
+    @locales = I18n.available_locales.map do |locale|
+      [I18n.translate(:language_name, locale: locale), locale]
     end
 
     if user_signed_in? && !current_user.locale.blank?