Merge branch 'pull/5030'

[rails.git] / lib / auth.rb

diff --git a/lib/auth.rb b/lib/auth.rb
index 4d1356e2b25ec50b00b2883c0c8704343e75c798..729772477757ac810113e6abf77a92fead58e904 100644 (file)
--- a/lib/auth.rb
+++ b/lib/auth.rb
@@ -3,12 +3,11 @@ module Auth
 
   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_graph")] = "microsoft_graph" if Settings.key?(:microsoft_graph_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