diff --git a/jam_ruby.gemspec b/jam_ruby.gemspec index 6722c6b78..ccb082418 100644 --- a/jam_ruby.gemspec +++ b/jam_ruby.gemspec @@ -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($\) diff --git a/lib/jam_ruby/app/mailers/invited_user_mailer.rb b/lib/jam_ruby/app/mailers/invited_user_mailer.rb index 2d39c6876..a443f9c6d 100644 --- a/lib/jam_ruby/app/mailers/invited_user_mailer.rb +++ b/lib/jam_ruby/app/mailers/invited_user_mailer.rb @@ -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 diff --git a/lib/jam_ruby/app/mailers/user_mailer.rb b/lib/jam_ruby/app/mailers/user_mailer.rb index 3b84767cb..ff5740718 100644 --- a/lib/jam_ruby/app/mailers/user_mailer.rb +++ b/lib/jam_ruby/app/mailers/user_mailer.rb @@ -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 diff --git a/lib/jam_ruby/app/views/jam_ruby/invited_user_mailer/friend_invitation.html.erb b/lib/jam_ruby/app/views/jam_ruby/invited_user_mailer/friend_invitation.html.erb index 142659257..11c4bffd7 100644 --- a/lib/jam_ruby/app/views/jam_ruby/invited_user_mailer/friend_invitation.html.erb +++ b/lib/jam_ruby/app/views/jam_ruby/invited_user_mailer/friend_invitation.html.erb @@ -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 create account page. @@ -7,6 +7,6 @@ To signup, please go to the create account 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 %> \ No newline at end of file diff --git a/lib/jam_ruby/app/views/jam_ruby/invited_user_mailer/friend_invitation.text.erb b/lib/jam_ruby/app/views/jam_ruby/invited_user_mailer/friend_invitation.text.erb index a63d6d104..5bfbd9b17 100644 --- a/lib/jam_ruby/app/views/jam_ruby/invited_user_mailer/friend_invitation.text.erb +++ b/lib/jam_ruby/app/views/jam_ruby/invited_user_mailer/friend_invitation.text.erb @@ -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 %> diff --git a/lib/jam_ruby/app/views/jam_ruby/invited_user_mailer/welcome_betauser.html.erb b/lib/jam_ruby/app/views/jam_ruby/invited_user_mailer/welcome_betauser.html.erb index ae32900a6..c1aafeaee 100644 --- a/lib/jam_ruby/app/views/jam_ruby/invited_user_mailer/welcome_betauser.html.erb +++ b/lib/jam_ruby/app/views/jam_ruby/invited_user_mailer/welcome_betauser.html.erb @@ -1,3 +1,3 @@ -<% provide(:title, 'Welcome to the Jamkazam Beta!') %> +<% provide(:title, 'Welcome to the JamKazam Beta!') %> To signup, please go to the create account page. \ No newline at end of file