From 17afdc34cc4e296c0a794db479570c0d9ffda934 Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Fri, 25 Mar 2016 17:56:52 +0530 Subject: [PATCH] UX: user invite email style should be consistent with other user notifications --- app/mailers/user_notifications.rb | 28 ++++++++++---- app/views/email/invite.html.erb | 13 +++++++ config/locales/server.en.yml | 64 ++++++++++++++++--------------- 3 files changed, 68 insertions(+), 37 deletions(-) create mode 100644 app/views/email/invite.html.erb diff --git a/app/mailers/user_notifications.rb b/app/mailers/user_notifications.rb index f549b606c..1fa152df2 100644 --- a/app/mailers/user_notifications.rb +++ b/app/mailers/user_notifications.rb @@ -173,12 +173,14 @@ class UserNotifications < ActionMailer::Base end def user_invited_to_private_message(user, opts) - opts[:use_template_html] = true + opts[:allow_reply_by_email] = false + opts[:use_invite_template] = true notification_email(user, opts) end def user_invited_to_topic(user, opts) - opts[:use_template_html] = true + opts[:allow_reply_by_email] = false + opts[:use_invite_template] = true opts[:show_category_in_subject] = true notification_email(user, opts) end @@ -273,7 +275,7 @@ class UserNotifications < ActionMailer::Base add_re_to_subject: opts[:add_re_to_subject], show_category_in_subject: opts[:show_category_in_subject], notification_type: notification_type, - use_template_html: opts[:use_template_html], + use_invite_template: opts[:use_invite_template], user: user ) end @@ -322,9 +324,21 @@ class UserNotifications < ActionMailer::Base .where('created_at > ?', 1.day.ago) .count) >= (SiteSetting.max_emails_per_day_per_user-1) - topic_excerpt = "" - if opts[:use_template_html] + if opts[:use_invite_template] + if post.topic.private_message? + invite_template = "user_notifications.invited_to_private_message_body" + else + invite_template = "user_notifications.invited_to_topic_body" + end topic_excerpt = post.excerpt.gsub("\n", " ") if post.is_first_post? && post.excerpt + message = I18n.t(invite_template, username: post.username, topic_title: title, topic_excerpt: topic_excerpt, site_title: SiteSetting.title, site_description: SiteSetting.site_description) + html = UserNotificationRenderer.new(Rails.configuration.paths["app/views"]).render( + template: 'email/invite', + format: :html, + locals: { message: PrettyText.cook(message, sanitize: false).html_safe, + classes: RTL.new(user).css_class + } + ) else in_reply_to_post = post.reply_to_post if user.user_option.email_in_reply_to html = UserNotificationRenderer.new(Rails.configuration.paths["app/views"]).render( @@ -337,6 +351,7 @@ class UserNotifications < ActionMailer::Base classes: RTL.new(user).css_class } ) + message = email_post_markdown(post) + (reached_limit ? "\n\n#{I18n.t "user_notifications.reached_limit", count: SiteSetting.max_emails_per_day_per_user}" : ""); end template = "user_notifications.user_#{notification_type}" @@ -348,8 +363,7 @@ class UserNotifications < ActionMailer::Base email_opts = { topic_title: title, - topic_excerpt: topic_excerpt, - message: email_post_markdown(post) + (reached_limit ? "\n\n#{I18n.t "user_notifications.reached_limit", count: SiteSetting.max_emails_per_day_per_user}" : ""), + message: message, url: post.url, post_id: post.id, topic_id: post.topic_id, diff --git a/app/views/email/invite.html.erb b/app/views/email/invite.html.erb new file mode 100644 index 000000000..f6c1dfccc --- /dev/null +++ b/app/views/email/invite.html.erb @@ -0,0 +1,13 @@ +
> + +
%{header_instructions}
+ + <% if message.present? %> +
<%= message %>
+ <% end %> + +
+
%{respond_instructions}
+
%{unsubscribe_link}%{unsubscribe_via_email_link}
+ +
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index bdd5b6e60..21bdf0fe2 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -2067,53 +2067,57 @@ en: posted_by: "Posted by %{username} on %{post_date}" + invited_to_private_message_body: | + %{username} invited you to a message + + > **%{topic_title}** + > + > %{topic_excerpt} + + at + + > %{site_title} -- %{site_description} + + invited_to_topic_body: | + %{username} invited you to a discussion + + > **%{topic_title}** + > + > %{topic_excerpt} + + at + + > %{site_title} -- %{site_description} + user_invited_to_private_message_pm: subject_template: "[%{site_name}] %{username} invited you to a message '%{topic_title}'" text_body_template: | + %{header_instructions} - %{username} invited you to a message + %{message} - > **%{topic_title}** - > - > %{topic_excerpt} - - at - - > %{site_title} -- %{site_description} - - Please visit this link to view the message: %{base_url}%{url} + --- + %{respond_instructions} user_invited_to_private_message_pm_staged: subject_template: "[%{site_name}] %{username} invited you to a message '%{topic_title}'" text_body_template: | + %{header_instructions} - %{username} invited you to a message + %{message} - > **%{topic_title}** - > - > %{topic_excerpt} - - at - - > %{site_title} -- %{site_description} - - Please visit this link to view the message: %{base_url}%{url} + --- + %{respond_instructions} user_invited_to_topic: subject_template: "[%{site_name}] %{username} invited you to '%{topic_title}'" text_body_template: | + %{header_instructions} - %{username} invited you to a discussion + %{message} - > **%{topic_title}** - > - > %{topic_excerpt} - - at - - > %{site_title} -- %{site_description} - - Please visit this link to view the message: %{base_url}%{url} + --- + %{respond_instructions} user_replied: subject_template: "[%{site_name}] %{topic_title}"