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

[rails.git] / app / controllers / users_controller.rb

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 1e927aa01d71b2d80c0ff94ce2d9832d2d3239eb..abd998030eda898c28d439f82d6156c219c701c9 100644 (file)
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -53,7 +53,7 @@ class UsersController < ApplicationController
   end
 
   def new
   end
 
   def new

-    @title = t "users.new.title"
+    @title = t ".title"

     @referer = if params[:referer]
                  safe_referer(params[:referer])
                else
     @referer = if params[:referer]
                  safe_referer(params[:referer])
                else


@@ -127,7 +127,7 @@ class UsersController < ApplicationController
     if request.xhr?
       render :partial => "terms"
     else
     if request.xhr?
       render :partial => "terms"
     else

-      @title = t "users.terms.title"
+      @title = t ".title"

 
       if current_user&.terms_agreed?
         # Already agreed to terms, so just show settings
 
       if current_user&.terms_agreed?
         # Already agreed to terms, so just show settings


@@ -151,7 +151,7 @@ class UsersController < ApplicationController
 
         redirect_to referer || edit_account_path
       elsif params[:decline]
 
         redirect_to referer || edit_account_path
       elsif params[:decline]

-        redirect_to t("users.terms.declined")
+        redirect_to t("users.terms.declined"), :allow_other_host => true

       else
         redirect_to :action => :terms
       end
       else
         redirect_to :action => :terms
       end


@@ -220,7 +220,7 @@ class UsersController < ApplicationController
   def go_public
     current_user.data_public = true
     current_user.save
   def go_public
     current_user.data_public = true
     current_user.save

-    flash[:notice] = t "users.go_public.flash success"
+    flash[:notice] = t ".flash success"

     redirect_to edit_account_path
   end
 
     redirect_to edit_account_path
   end
 


@@ -304,7 +304,7 @@ class UsersController < ApplicationController
   ##
   # omniauth failure callback
   def auth_failure
   ##
   # omniauth failure callback
   def auth_failure

-    flash[:error] = t(params[:message], :scope => "users.auth_failure", :default => t("users.auth_failure.unknown_error"))
+    flash[:error] = t(params[:message], :scope => "users.auth_failure", :default => t(".unknown_error"))

 
     origin = safe_referer(params[:origin]) if params[:origin]
 
 
     origin = safe_referer(params[:origin]) if params[:origin]