Merge branch 'master' into staging

Leandro Santos
2 parents d14eec8c 15eb68fe
Showing 1 changed file with 1 additions and 1 deletions Show diff stats
plugins/oauth_client/controllers/public/oauth_client_plugin_public_controller.rb
@@ -37,7 +37,7 @@ class OauthClientPluginPublicController &lt; PublicController
     if auth.enabled? && provider.enabled?
       self.current_user = person.user
     else
-      session[:notice] = _("Can't login with #{provider.name}")
+      session[:notice] = _("Can't login with %s") % provider.name
     end
     session[:oauth_client_popup] = true if request.env.fetch("omniauth.params", {})['oauth_client_popup']
     session[:return_to] = url_for(
...	...	@@ -37,7 +37,7 @@ class OauthClientPluginPublicController < PublicController
37	37	if auth.enabled? && provider.enabled?
38	38	self.current_user = person.user
39	39	else
40		- session[:notice] = _("Can't login with #{provider.name}")
	40	+ session[:notice] = _("Can't login with %s") % provider.name
41	41	end
42	42	session[:oauth_client_popup] = true if request.env.fetch("omniauth.params", {})['oauth_client_popup']
43	43	session[:return_to] = url_for(
...	...