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
104
104
105
105
if @user . errors . empty? && @user . save
106
106
# TODO: Whitelist origins
107
- UserMailer . email_confirmation ( @user , params [ :origin ] ) . deliver_now
107
+ UserMailer . email_confirmation ( @user , params [ :origin ] , params [ :language ] ) . deliver_now
108
108
render json : {
109
109
success : true ,
110
110
message : 'User created.'
Original file line number Diff line number Diff line change @@ -85,9 +85,10 @@ def update
85
85
end
86
86
87
87
def confirm_email
88
+ language = params [ :language ]
88
89
token = VerificationToken . email . find_by! ( user_id : params [ :user_id ] , token : params [ :id ] )
89
90
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' )
91
92
User . find ( params [ :user_id ] ) . update! ( email_verified : true )
92
93
redirect_to redirect_path , notice : 'Your email address has been verified!'
93
94
end
Original file line number Diff line number Diff line change 3
3
require 'cgi'
4
4
5
5
class UserMailer < ActionMailer ::Base
6
- def email_confirmation ( user , origin = nil )
6
+ def email_confirmation ( user , origin = nil , language = nil )
7
7
@origin = origin
8
8
@user = user
9
9
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 )
11
11
subject = 'Confirm your mooc.fi account email address'
12
+ subject = 'Varmista mooc.fi tunnuksesi sähköpostiosoite' if language == "fi"
12
13
subject = "#{ origin } : #{ subject } " if origin
13
14
if origin
14
15
origin_name = origin . downcase . tr ( ' ' , '_' ) . gsub ( /[\. \/ ]/ , '' )
You can’t perform that action at this time.
0 commit comments