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

[rails.git] / lib / auth.rb

diff --git a/lib/auth.rb b/lib/auth.rb
index 6190831f7ada6b8fa18c33a1c05b4036049bb351..729772477757ac810113e6abf77a92fead58e904 100644 (file)
--- a/lib/auth.rb
+++ b/lib/auth.rb
@@ -1,9 +1,15 @@
 module Auth
-  PROVIDERS = { "None" => "", "OpenID" => "openid" }.tap do |providers|
-    providers["Google"] = "google" if Settings.key?(:google_auth_id)
-    providers["Facebook"] = "facebook" if Settings.key?(:facebook_auth_id)
-    providers["Windows Live"] = "windowslive" if Settings.key?(:windowslive_auth_id)
-    providers["GitHub"] = "github" if Settings.key?(:github_auth_id)
-    providers["Wikipedia"] = "wikipedia" if Settings.key?(:wikipedia_auth_id)
-  end.freeze
+  @providers = {}
+
+  def self.providers
+    @providers[I18n.locale] ||= {
+      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
+  end
 end