diff --git a/ruby/lib/jam_ruby/app/mailers/user_mailer.rb b/ruby/lib/jam_ruby/app/mailers/user_mailer.rb
index 8bb38cde7..2c4108565 100644
--- a/ruby/lib/jam_ruby/app/mailers/user_mailer.rb
+++ b/ruby/lib/jam_ruby/app/mailers/user_mailer.rb
@@ -31,9 +31,9 @@ module JamRuby
sendgrid_recipients([user.email])
sendgrid_substitute('@USERID', [user.id])
- mail(:to => user.email, :subject => "Please confirm your JamKazam email") do |format|
+ mail(:to => user.email, :subject => "Please confirm your JamKazam email address") do |format|
format.text
- format.html
+ format.html { render layout: "user_mailer_beta" }
end
end
diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/confirm_email.html.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/confirm_email.html.erb
index 358f0f2b1..92fee1d6b 100644
--- a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/confirm_email.html.erb
+++ b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/confirm_email.html.erb
@@ -1,9 +1,34 @@
<% provide(:title, 'Welcome to JamKazam!') %>
-
We’re delighted you have joined our community of <%= APP_CONFIG.musician_count %> musicians. We’d like to send you an orientation email with information and resource links that will help you get the most out of JamKazam. Please click here to confirm this email has reached you successfully and we will then send the orientation email.
If you have received this email but aren’t familiar with JamKazam or JamTracks, then someone has registered at our website using your email address, and you can just ignore and delete this email.
\ No newline at end of file
diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/confirm_email.html.erb.backup b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/confirm_email.html.erb.backup
new file mode 100644
index 000000000..358f0f2b1
--- /dev/null
+++ b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/confirm_email.html.erb.backup
@@ -0,0 +1,9 @@
+<% provide(:title, 'Welcome to JamKazam!') %>
+
+
We’re delighted you have joined our community of <%= APP_CONFIG.musician_count %> musicians. We’d like to send you an orientation email with information and resource links that will help you get the most out of JamKazam. Please click here to confirm this email has reached you successfully and we will then send the orientation email.
+
+
If you have received this email but aren’t familiar with JamKazam or JamTracks, then someone has registered at our website using your email address, and you can just ignore and delete this email.
+
+
Best Regards,
+ Team JamKazam
+
\ No newline at end of file
diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/confirm_email.text.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/confirm_email.text.erb
index 129da288d..c465f5ea9 100644
--- a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/confirm_email.text.erb
+++ b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/confirm_email.text.erb
@@ -1,8 +1,8 @@
-Welcome to JamKazam!
+<%= I18n.t 'user_mailer.confirm_email.paragraph1' -%>
-We’re delighted you have joined our community of <%= APP_CONFIG.musician_count %> musicians. We’d like to send you an orientation email with information and resource links that will help you get the most out of JamKazam. Please click <%= @signup_confirm_url %> to confirm this email has reached you successfully and we will then send the orientation email.
+<%= @signup_confirm_url %>
-If you have received this email but aren’t familiar with JamKazam or JamTracks, then someone has registered at our website using your email address, and you can just ignore and delete this email.
+<%= I18n.t 'user_mailer.confirm_email.paragraph2' -%>
-Best Regards,
-Team JamKazam
\ No newline at end of file
+<%= I18n.t 'user_mailer.confirm_email.best_wishes' -%>
+<%= I18n.t 'user_mailer.confirm_email.signature' -%>
\ No newline at end of file
diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/confirm_email.text.erb.backup b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/confirm_email.text.erb.backup
new file mode 100644
index 000000000..129da288d
--- /dev/null
+++ b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/confirm_email.text.erb.backup
@@ -0,0 +1,8 @@
+Welcome to JamKazam!
+
+We’re delighted you have joined our community of <%= APP_CONFIG.musician_count %> musicians. We’d like to send you an orientation email with information and resource links that will help you get the most out of JamKazam. Please click <%= @signup_confirm_url %> to confirm this email has reached you successfully and we will then send the orientation email.
+
+If you have received this email but aren’t familiar with JamKazam or JamTracks, then someone has registered at our website using your email address, and you can just ignore and delete this email.
+
+Best Regards,
+Team JamKazam
\ No newline at end of file
diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/new_musicians_match.text.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/new_musicians_match.text.erb
index 30d6cb449..e372b88ef 100644
--- a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/new_musicians_match.text.erb
+++ b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/new_musicians_match.text.erb
@@ -2,7 +2,7 @@
Hi <%= @user.first_name %>,
<% end %>
-The following musicians have joined JamKazam within the last week and have low internet latency to you that will support enjoyable sessions. If you'd like to make more musical connections, we encourage you to use the links below to send these new users a welcome message and perhaps arrange a session to play together.
+<%= I18n.t 'user_mailer.new_musicians_match.paragraph1' -%>
<%
@musicians_data.each do | data | -%>
@@ -13,20 +13,20 @@ The following musicians have joined JamKazam within the last week and have low i
latency = latencies.find{|l| l[:user_id] == musician.id }
-%>
<%= musician.first_name %> <%= musician.last_name %>
- Latency To You: <%= latency_info(latency) %>
+ <%= I18n.t 'user_mailer.new_musicians_match.latency_to_you' -%>: <%= latency_info(latency) %>
<% if musician.last_active_timestamp -%>
- Last Active On: <%= time_ago_in_words(Time.at(musician.last_active_timestamp)) %> ago
+ <%= I18n.t 'user_mailer.new_musicians_match.last_active' -%>: <%= time_ago_in_words(Time.at(musician.last_active_timestamp)) %> ago
<% end -%>
<% musician.musician_instruments.each do |mi| -%>
<%= mi.description %> (<%= @instrument_proficiencies[mi.proficiency_level.to_s.to_sym] %>)
<% end -%>
- View Profile: <%= APP_CONFIG.spa_origin -%>/friends?id=<%= musician.id %>&open=details
- Send Message: <%= APP_CONFIG.spa_origin -%>/friends?id=<%= musician.id %>&open=message
- Send Friend Request: <%= APP_CONFIG.spa_origin -%>/friends?id=<%= musician.id %>&open=connect
+ <%= I18n.t 'user_mailer.new_musicians_match.view_profile' -%>: <%= APP_CONFIG.spa_origin -%>/friends?id=<%= musician.id %>&open=details
+ <%= I18n.t 'user_mailer.new_musicians_match.send_message' -%>: <%= APP_CONFIG.spa_origin -%>/friends?id=<%= musician.id %>&open=message
+ <%= I18n.t 'user_mailer.new_musicians_match.send_friend_request' -%>: <%= APP_CONFIG.spa_origin -%>/friends?id=<%= musician.id %>&open=connect
<% end -%>
<% end -%>
- To find great musical matches across the entire JamKazam commiunity and make new connections, use the link below to access our musician search feature. This let you filter JamKazammers by latency, instruments, skill level, genre interests, last active day and more.
+ <%= I18n.t 'user_mailer.new_musicians_match.paragraph2' -%>
- Search JamKazam Musicians: <%= APP_CONFIG.spa_origin -%>/friends
\ No newline at end of file
+ <%= I18n.t 'user_mailer.new_musicians_match.search_musicians' -%>: <%= APP_CONFIG.spa_origin -%>/friends
\ No newline at end of file
diff --git a/ruby/lib/jam_ruby/app/views/layouts/user_mailer_beta.html.erb b/ruby/lib/jam_ruby/app/views/layouts/user_mailer_beta.html.erb
index d5417be56..ae24e13b6 100644
--- a/ruby/lib/jam_ruby/app/views/layouts/user_mailer_beta.html.erb
+++ b/ruby/lib/jam_ruby/app/views/layouts/user_mailer_beta.html.erb
@@ -25,38 +25,40 @@
+ <% if @user && @user.unsubscribe_token -%>
+