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

[rails.git] / lib / auth.rb

diff --git a/lib/auth.rb b/lib/auth.rb
index 01167fb1d6695bd9089617f1d1ee259bdb61057c..2c6d0c1d7036ad5f4f2d4f1e6a53593f3048b65d 100644 (file)
--- a/lib/auth.rb
+++ b/lib/auth.rb
@@ -1,16 +1,13 @@
 module Auth
-  @providers = {}
+  @providers = ["openid"]
+  @providers << "google" if Settings.key?(:google_auth_id)
+  @providers << "facebook" if Settings.key?(:facebook_auth_id)
+  @providers << "microsoft" if Settings.key?(:microsoft_auth_id)
+  @providers << "github" if Settings.key?(:github_auth_id)
+  @providers << "wikipedia" if Settings.key?(:wikipedia_auth_id)
+  @providers.freeze
 
   def self.providers
-    @providers[I18n.locale] ||= {
-      I18n.t("auth.providers.none") => "",
-      I18n.t("auth.providers.openid") => "openid"
-    }.tap do |providers|
-      providers[I18n.t("auth.providers.google")] = "google" if Settings.key?(:google_auth_id)
-      providers[I18n.t("auth.providers.facebook")] = "facebook" if Settings.key?(:facebook_auth_id)
-      providers[I18n.t("auth.providers.microsoft")] = "microsoft" if Settings.key?(:microsoft_auth_id)
-      providers[I18n.t("auth.providers.github")] = "github" if Settings.key?(:github_auth_id)
-      providers[I18n.t("auth.providers.wikipedia")] = "wikipedia" if Settings.key?(:wikipedia_auth_id)
-    end.freeze
+    @providers
   end
 end