Additional fixes to email markup and logic [SCI-443]

app/mailers/app_mailer.rb

@@ -16,8 +16,10 @@ class AppMailer < Devise::Mailer
   def notification(user, notification)
     @user = user
     @notification = notification
-    headers = { to: @user.email,
+    headers = {
-      subject: "#{I18n.t('notifications.email_title')} - #{notification.title}" }
+      to: @user.email,
+      subject: I18n.t('notifications.email_title')
+    }
     mail(headers)
   end
 end

app/models/user_notification.rb

@@ -31,11 +31,19 @@ class UserNotification < ActiveRecord::Base
   end
 
   def send_email
-    if notification.type_of == 'system_message'
+    case notification.type_of
-      send_email_notification(user, notification)
+    when 'system_message'
-    elsif user.assignments_notification_email ||
-          user.recent_notification_email
       send_email_notification(user, notification)
+    when 'assignment'
+      send_email_notification(
+        user,
+        notification
+      ) if user.assignments_notification_email
+    when 'recent_changes'
+      send_email_notification(
+        user,
+        notification
+      ) if user.recent_notification_email
     end
   end
 end

app/views/users/mailer/notification.html.erb

@@ -1,6 +1,6 @@
 <p>Hello <%= @user.name %>!</p>
 
-<p>You got new notification!</p>
+<p><%= I18n.t("notifications.email_title") %></p>
 
 <p>Type: <%= I18n.t("notifications.types.#{@notification.type_of}") %></p>
 

config/locales/en.yml

@@ -1523,7 +1523,7 @@ en:
       assignment: "Assignment"
       recent_changes: "Recent changes"
       system_message: "sciNote system message"
-    email_title: "sciNote notification"
+    email_title: "You've received a sciNote notification!"
   # This section contains general words that can be used in any parts of
   # application.