File tree Expand file tree Collapse file tree 3 files changed +6
-4
lines changed Expand file tree Collapse file tree 3 files changed +6
-4
lines changed Original file line number Diff line number Diff line change @@ -104,7 +104,7 @@ def create
104104
105105 if @user . errors . empty? && @user . save
106106 # TODO: Whitelist origins
107- UserMailer . email_confirmation ( @user , params [ :origin ] ) . deliver_now
107+ UserMailer . email_confirmation ( @user , params [ :origin ] , params [ :language ] ) . deliver_now
108108 render json : {
109109 success : true ,
110110 message : 'User created.'
Original file line number Diff line number Diff line change @@ -85,9 +85,10 @@ def update
8585 end
8686
8787 def confirm_email
88+ language = params [ :language ]
8889 token = VerificationToken . email . find_by! ( user_id : params [ :user_id ] , token : params [ :id ] )
8990 redirect_path = root_url
90- redirect_path = ' https://course.elementsofai.com/email-verification' if params [ :origin ] . start_with? ( 'elements_of_ai' )
91+ redirect_path = " https://course.elementsofai.com/#{ language ? " #{ language } /" : '' } email-verification" if params [ :origin ] . start_with? ( 'elements_of_ai' )
9192 User . find ( params [ :user_id ] ) . update! ( email_verified : true )
9293 redirect_to redirect_path , notice : 'Your email address has been verified!'
9394 end
Original file line number Diff line number Diff line change 33require 'cgi'
44
55class UserMailer < ActionMailer ::Base
6- def email_confirmation ( user , origin = nil )
6+ def email_confirmation ( user , origin = nil , language = nil )
77 @origin = origin
88 @user = user
99 token = user . verification_tokens . email . create!
10- @url = base_url + confirm_email_path ( @user . id , token . token )
10+ @url = base_url + confirm_email_path ( @user . id , token . token , language : language )
1111 subject = 'Confirm your mooc.fi account email address'
12+ subject = 'Varmista mooc.fi tunnuksesi sähköpostiosoite' if language == "fi"
1213 subject = "#{ origin } : #{ subject } " if origin
1314 if origin
1415 origin_name = origin . downcase . tr ( ' ' , '_' ) . gsub ( /[\. \/ ]/ , '' )
You can’t perform that action at this time.
0 commit comments