seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

* VRFS-521; all emails have Jamkazam > JamKazam fixed

This commit is contained in:
Seth Call 2013-08-11 10:48:12 -05:00
parent 2431af4baa
commit 39fa5bf098
6 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jam_ruby.gemspec
View File

@ -4,8 +4,8 @@ require File.expand_path('../lib/jam_ruby/version', __FILE__)
Gem::Specification.new do |gem|
gem.authors = ["Seth Call"]
gem.email = ["seth@jamkazam.com"]
gem.description = %q{Common library for Jamkazam Ruby code}
gem.summary = %q{Common library for Jamkazam Ruby code}
gem.description = %q{Common library for JamKazam Ruby code}
gem.summary = %q{Common library for JamKazam Ruby code}
gem.homepage = ""
gem.files = `git ls-files`.split($\)

4
lib/jam_ruby/app/mailers/invited_user_mailer.rb
View File

@ -26,7 +26,7 @@ module JamRuby
sendgrid_category "Welcome"
sendgrid_unique_args :type => "welcome_betauser"
mail(:to => invited_user.email, :subject => "Welcome to the Jamkazam Beta release") do |format|
mail(:to => invited_user.email, :subject => "Welcome to the JamKazam Beta release") do |format|
format.text
format.html { render :layout => "user_mailer" }
end
@ -41,7 +41,7 @@ module JamRuby
sendgrid_category "Invitation"
sendgrid_unique_args :type => "friend_invitation"
mail(:to => invited_user.email, :subject => "You've been invited to Jamkazam by #{invited_user.sender.name}") do |format|
mail(:to => invited_user.email, :subject => "You've been invited to JamKazam by #{invited_user.sender.name}") do |format|
format.text
format.html { render :layout => "from_user_mailer" }
end

10
lib/jam_ruby/app/mailers/user_mailer.rb
View File

@ -25,7 +25,7 @@
sendgrid_category "Welcome"
sendgrid_unique_args :type => "welcome_message"
mail(:to => user.email, :subject => "Welcome to Jamkazam, #{user.first_name} ") do |format|
mail(:to => user.email, :subject => "Welcome to JamKazam, #{user.first_name} ") do |format|
format.text
format.html
end
@ -34,7 +34,7 @@
def password_changed(user)
@user = user
sendgrid_unique_args :type => "password_changed"
mail(:to => user.email, :subject => "Jamkazam Password Changed") do |format|
mail(:to => user.email, :subject => "JamKazam Password Changed") do |format|
format.text
format.html
end
@ -44,7 +44,7 @@
@user = user
@password_reset_url = password_reset_url
sendgrid_unique_args :type => "password_reset"
mail(:to => user.email, :subject => "Jamkazam Password Reset") do |format|
mail(:to => user.email, :subject => "JamKazam Password Reset") do |format|
format.text
format.html
end
@ -53,7 +53,7 @@
def updating_email(user)
@user = user
sendgrid_unique_args :type => "updating_email"
mail(:to => user.update_email, :subject => "Jamkazam Email Change Confirmation") do |format|
mail(:to => user.update_email, :subject => "JamKazam Email Change Confirmation") do |format|
format.text
format.html
end
@ -62,7 +62,7 @@
def updated_email(user)
@user = user
sendgrid_unique_args :type => "updated_email"
mail(:to => user.email, :subject => "Jamkazam Email Changed") do |format|
mail(:to => user.email, :subject => "JamKazam Email Changed") do |format|
format.text
format.html
end

4
lib/jam_ruby/app/views/jam_ruby/invited_user_mailer/friend_invitation.html.erb
View File

@ -1,4 +1,4 @@
<% provide(:title, "You've been invited to Jamkazam by #{@sender.name}!") %>
<% provide(:title, "You've been invited to JamKazam by #{@sender.name}!") %>
<% provide(:photo_url, @sender.resolved_photo_url) %>
To signup, please go to the <a href="<%= @signup_url %>">create account</a> page.
@ -7,6 +7,6 @@ To signup, please go to the <a href="<%= @signup_url %>">create account</a> page
<% if @note %>
<%= @sender.name %> says: <%= @note %>
<% else %>
<%= @sender.name %> would like you to join Jamkazam.
<%= @sender.name %> would like you to join JamKazam.
<% end %>
<% end %>

2
lib/jam_ruby/app/views/jam_ruby/invited_user_mailer/friend_invitation.text.erb
View File

@ -1,4 +1,4 @@
You've been invited to Jamkazam by <%= @sender.name %>!
You've been invited to JamKazam by <%= @sender.name %>!
<% unless @note.nil? %>
<%= @sender.name %> says:
<%= @note %>

2
lib/jam_ruby/app/views/jam_ruby/invited_user_mailer/welcome_betauser.html.erb
View File

@ -1,3 +1,3 @@
<% provide(:title, 'Welcome to the Jamkazam Beta!') %>
<% provide(:title, 'Welcome to the JamKazam Beta!') %>
To signup, please go to the <a href="<%= @signup_url %>">create account</a> page.