Merge remote-tracking branch 'upstream/pull/2894'

[rails.git] / lib / id.rb

diff --git a/lib/id.rb b/lib/id.rb
index 15b7f8367428a7d0d0c9b241b83a7c4067582d27..4e6cf3b7c8475e403da4322677f9dbb40c27f189 100644 (file)
--- a/lib/id.rb
+++ b/lib/id.rb
@@ -1,3 +1,3 @@
 module ID
-  LOCALES = Rails.root.join('vendor/assets/iD/iD/locales').entries.map {|p| p.basename.to_s[/(.*).json/] && $1 }.compact
+  LOCALES = Locale.list(Rails.root.join("vendor/assets/iD/iD/locales").entries.map { |p| p.basename.to_s[/(.*).json/] && Regexp.last_match(1) }.compact)
 end