thredded 0.13.0 → 0.14.0

data/app/controllers/thredded/private_post_previews_controller.rb

@@ -6,14 +6,14 @@ module Thredded
 
     # Preview a new post
     def preview
-      @private_post = PrivatePost.new(private_post_params)
-      @private_post.postable = PrivateTopic.friendly_find!(params[:private_topic_id])
+      @private_post = Thredded::PrivatePost.new(private_post_params)
+      @private_post.postable = Thredded::PrivateTopic.friendly_find!(params[:private_topic_id])
       render_preview
     end
 
     # Preview an update to an existing post
     def update
-      @private_post = PrivatePost.find(params[:private_post_id])
+      @private_post = Thredded::PrivatePost.find(params[:private_post_id])
       @private_post.assign_attributes(private_post_params)
       render_preview
     end

data/app/controllers/thredded/private_posts_controller.rb

@@ -12,14 +12,14 @@ module Thredded
     after_action :verify_authorized
 
     def new
-      @post_form = PrivatePostForm.new(
+      @post_form = Thredded::PrivatePostForm.new(
         user: thredded_current_user, topic: parent_topic, post_params: new_private_post_params
       )
       authorize_creating @post_form.post
     end
 
     def create
-      @post_form = PrivatePostForm.new(
+      @post_form = Thredded::PrivatePostForm.new(
         user: thredded_current_user, topic: parent_topic, post_params: new_private_post_params
       )
       authorize_creating @post_form.post
@@ -31,7 +31,7 @@ module Thredded
     end
 
     def edit
-      @post_form = PrivatePostForm.for_persisted(post)
+      @post_form = Thredded::PrivatePostForm.for_persisted(post)
       authorize @post_form.post, :update?
       return redirect_to(canonical_topic_params) unless params_match?(canonical_topic_params)
       render
@@ -39,7 +39,7 @@ module Thredded
 
     def update
       authorize post, :update?
-      post.update_attributes(post_params.except(:user, :ip))
+      post.update(new_private_post_params)
 
       redirect_to post_path(post, user: thredded_current_user)
     end
@@ -79,7 +79,7 @@ module Thredded
     end
 
     def parent_topic
-      PrivateTopic
+      Thredded::PrivateTopic
         .includes(:private_users)
         .friendly
         .find(params[:private_topic_id])

data/app/controllers/thredded/private_topic_previews_controller.rb

@@ -6,7 +6,7 @@ module Thredded
     include Thredded::RenderPreview
 
     def preview
-      form = PrivateTopicForm.new(new_private_topic_params)
+      form = Thredded::PrivateTopicForm.new(new_private_topic_params)
       @private_post = form.post
       @private_post.postable = form.private_topic
       render_preview

data/app/controllers/thredded/read_states_controller.rb

@@ -5,7 +5,7 @@ module Thredded
     before_action :thredded_require_login!
 
     def update
-      MarkAllRead.run(thredded_current_user) if thredded_signed_in?
+      Thredded::MarkAllRead.run(thredded_current_user) if thredded_signed_in?
 
       redirect_to request.referer
     end

data/app/controllers/thredded/theme_previews_controller.rb

@@ -3,32 +3,32 @@
 module Thredded
   class ThemePreviewsController < Thredded::ApplicationController
     def show # rubocop:disable Metrics/MethodLength
-      @messageboard = Messageboard.first
+      @messageboard = Thredded::Messageboard.first
       fail Thredded::Errors::DatabaseEmpty unless @messageboard
-      @user              = if thredded_current_user.thredded_anonymous?
-                             Thredded.user_class.new(id: 1334, name: 'joe', email: 'joe@example.com')
-                           else
-                             thredded_current_user
-                           end
-      @messageboards     = Messageboard.all
-      @topics            = TopicsPageView.new(@user, @messageboard.topics.page(1).limit(3))
-      @private_topics    = PrivateTopicsPageView.new(@user, @user.thredded_private_topics.page(1).limit(3))
-      topic              = Topic.new(messageboard: @messageboard, title: 'Hello', slug: 'hello', user: @user)
-      @topic             = TopicView.from_user(topic, @user)
-      @posts             = TopicPostsPageView.new(@user, topic, topic.posts.page(1).limit(3))
-      @post              = topic.posts.build(id: 1337, postable: topic, content: 'Hello world', user: @user)
-      @post_form         = PostForm.for_persisted(@post)
-      @new_post          = PostForm.new(user: @user, topic: topic)
-      @new_topic         = TopicForm.new(user: @user, messageboard: @messageboard)
-      @new_private_topic = PrivateTopicForm.new(user: @user)
-      private_topic      = PrivateTopic.new(id: 1337, title: 'Hello', user: @user, last_user: @user, users: [@user])
-      @private_topic     = PrivateTopicView.from_user(private_topic, @user)
-      @private_posts     = TopicPostsPageView.new(@user, private_topic, private_topic.posts.page(1).limit(3))
-      @private_post      = private_topic.posts.build(
+      @user = if thredded_current_user.thredded_anonymous?
+                Thredded.user_class.new(id: 1334, name: 'joe', email: 'joe@example.com')
+              else
+                thredded_current_user
+              end
+      @messageboards = Thredded::Messageboard.all
+      @topics = Thredded::TopicsPageView.new(@user, @messageboard.topics.page(1).limit(3))
+      @private_topics = Thredded::PrivateTopicsPageView.new(@user, @user.thredded_private_topics.page(1).limit(3))
+      topic = Thredded::Topic.new(messageboard: @messageboard, title: 'Hello', slug: 'hello', user: @user)
+      @topic = Thredded::TopicView.from_user(topic, @user)
+      @posts = Thredded::TopicPostsPageView.new(@user, topic, topic.posts.page(1).limit(3))
+      @post = topic.posts.build(id: 1337, postable: topic, content: 'Hello world', user: @user)
+      @post_form = Thredded::PostForm.for_persisted(@post)
+      @new_post = Thredded::PostForm.new(user: @user, topic: topic)
+      @new_topic = Thredded::TopicForm.new(user: @user, messageboard: @messageboard)
+      @new_private_topic = Thredded::PrivateTopicForm.new(user: @user)
+      private_topic = Thredded::PrivateTopic.new(id: 17, title: 'Hello', user: @user, last_user: @user, users: [@user])
+      @private_topic = Thredded::PrivateTopicView.from_user(private_topic, @user)
+      @private_posts = Thredded::TopicPostsPageView.new(@user, private_topic, private_topic.posts.page(1).limit(3))
+      @private_post = private_topic.posts.build(
         id: 1337, postable: private_topic, content: 'A private hello world', user: @user
       )
-      @private_post_form = PrivatePostForm.for_persisted(@private_post)
-      @preferences = UserPreferencesForm.new(user: @user, messageboard: @messageboard)
+      @private_post_form = Thredded::PrivatePostForm.for_persisted(@private_post)
+      @preferences = Thredded::UserPreferencesForm.new(user: @user, messageboard: @messageboard)
     end
   end
 end

data/app/controllers/thredded/topic_previews_controller.rb

@@ -6,7 +6,7 @@ module Thredded
     include Thredded::RenderPreview
 
     def preview
-      form = TopicForm.new(new_topic_params)
+      form = Thredded::TopicForm.new(new_topic_params)
       @post = form.post
       @post.postable = form.topic
       render_preview

data/app/forms/thredded/private_topic_form.rb

@@ -89,7 +89,7 @@ module Thredded
     def topic_categories
       if category_ids
         ids = category_ids.reject(&:empty?)
-        Category.where(id: ids)
+        Thredded::Category.where(id: ids)
       else
         []
       end

data/app/forms/thredded/topic_form.rb

@@ -33,7 +33,7 @@ module Thredded
       ActiveRecord::Base.transaction do
         topic.save!
         post.save!
-        UserTopicReadState.read_on_first_post!(user, topic) if topic.previous_changes.include?(:id)
+        Thredded::UserTopicReadState.read_on_first_post!(user, topic) if topic.previous_changes.include?(:id)
       end
       true
     end
@@ -75,7 +75,7 @@ module Thredded
     def topic_categories
       if category_ids
         ids = category_ids.reject(&:empty?)
-        Category.where(id: ids)
+        Thredded::Category.where(id: ids)
       else
         []
       end

data/app/forms/thredded/user_preferences_form.rb

@@ -39,7 +39,7 @@ module Thredded
 
         # Update all of the messageboards' auto_follow_topics if the global preference has changed.
         if user_preference.previous_changes.include?('auto_follow_topics')
-          UserMessageboardPreference.where(user: @user)
+          Thredded::UserMessageboardPreference.where(user: @user)
             .update_all(auto_follow_topics: user_preference.auto_follow_topics)
           user_messageboard_preference.auto_follow_topics_will_change! if messageboard
         end
@@ -50,7 +50,7 @@ module Thredded
     end
 
     def messageboard_groups
-      @messageboard_groups ||= MessageboardGroupView.grouped(@messageboards)
+      @messageboard_groups ||= Thredded::MessageboardGroupView.grouped(@messageboards)
     end
 
     def notifications_for_private_topics

data/app/helpers/thredded/render_helper.rb

@@ -7,7 +7,7 @@ module Thredded
     # @param expires_in [ActiveSupport::Duration]
     # @return Array<[T, String]>
     def render_collection_to_strings_with_cache(collection:, partial:, expires_in:, **opts)
-      CollectionToStringsWithCacheRenderer.new(lookup_context).render_collection_to_strings_with_cache(
+      Thredded::CollectionToStringsWithCacheRenderer.new(lookup_context).render_collection_to_strings_with_cache(
         self, collection: collection, partial: partial, expires_in: expires_in, **opts
       )
     end

data/app/jobs/thredded/auto_follow_and_notify_job.rb

@@ -5,10 +5,10 @@ module Thredded
     queue_as :default
 
     def perform(post_id)
-      post = Post.find(post_id)
+      post = Thredded::Post.find(post_id)
 
-      AutofollowUsers.new(post).run
-      NotifyFollowingUsers.new(post).run
+      Thredded::AutofollowUsers.new(post).run
+      Thredded::NotifyFollowingUsers.new(post).run
     end
   end
 end

data/app/mailer_previews/thredded/base_mailer_preview.rb

@@ -23,7 +23,7 @@ Additionally, Markdown is extended to support the following:
 
     def mock_topic(attr = {})
       fail 'Do not assign ID here or a has_many association might get updated' if attr.key?(:id)
-      Topic.new(
+      Thredded::Topic.new(
         attr.reverse_merge(
           title:        'A test topic',
           slug:         'a-test-topic',
@@ -41,7 +41,7 @@ Additionally, Markdown is extended to support the following:
 
     def mock_post(attr = {})
       topic = attr[:postable] || mock_topic
-      Post.new(
+      Thredded::Post.new(
         attr.reverse_merge(
           content:      'A test post',
           created_at:   Time.zone.now,
@@ -56,7 +56,7 @@ Additionally, Markdown is extended to support the following:
 
     def mock_private_topic(attr = {})
       fail 'Do not assign ID here or a has_many association might get updated' if attr.key?(:id)
-      PrivateTopic.new(
+      Thredded::PrivateTopic.new(
         attr.reverse_merge(
           title:       'A test private topic',
           slug:        'a-test-private-topic',
@@ -71,7 +71,7 @@ Additionally, Markdown is extended to support the following:
 
     def mock_private_post(attr = {})
       private_topic = attr[:postable] || mock_private_topic
-      PrivatePost.new(
+      Thredded::PrivatePost.new(
         attr.reverse_merge(
           content:    'A test private post',
           created_at: Time.zone.now,
@@ -85,7 +85,7 @@ Additionally, Markdown is extended to support the following:
 
     def mock_messageboard(attr = {})
       fail 'Do not assign ID here or a has_many association might get updated' if attr.key?(:id)
-      Messageboard.new(
+      Thredded::Messageboard.new(
         attr.reverse_merge(
           name:         'A test messageboard',
           slug:         'a-test-messageboard',

data/app/mailer_previews/thredded/private_topic_mailer_preview.rb

@@ -4,12 +4,8 @@ module Thredded
   # Previews for the PrivateTopicMailer
   class PrivateTopicMailerPreview < BaseMailerPreview
     def message_notification
-      post = mock_private_post(content: mock_content(mention_users: ['glebm']))
       PrivateTopicMailer.message_notification(
-        mock_private_topic(posts: [
-                             post
-                           ]),
-        post,
+        mock_private_post(content: mock_content(mention_users: ['glebm'])),
         %w[glebm@test.com joel@test.com]
       )
     end

data/app/mailers/thredded/post_mailer.rb

@@ -3,14 +3,19 @@
 module Thredded
   class PostMailer < Thredded::BaseMailer
     def post_notification(post_id, emails)
-      @post                = find_record Thredded::Post, post_id
-      email_details        = Thredded::TopicEmailView.new(@post.postable)
+      @post = find_record Thredded::Post, post_id
+      email_details = Thredded::TopicEmailView.new(@post.postable)
       headers['X-SMTPAPI'] = email_details.smtp_api_tag('post_notification')
 
-      mail from:     email_details.no_reply,
-           to:       email_details.no_reply,
-           bcc:      emails,
-           subject:  email_details.subject
+      mail from: email_details.no_reply,
+           to: email_details.no_reply,
+           bcc: emails,
+           subject: [
+             Thredded.email_outgoing_prefix,
+             t('thredded.emails.post_notification.subject',
+               user: @post.user.thredded_display_name,
+               topic_title: @post.postable.title)
+           ].compact.join
     end
   end
 end

data/app/mailers/thredded/private_topic_mailer.rb

@@ -2,16 +2,20 @@
 
 module Thredded
   class PrivateTopicMailer < Thredded::BaseMailer
-    def message_notification(private_topic_id, post_id, emails)
-      @topic               = find_record Thredded::PrivateTopic, private_topic_id
-      @post                = find_record Thredded::PrivatePost, post_id
-      email_details        = Thredded::TopicEmailView.new(@topic)
+    def message_notification(post_id, emails)
+      @post = find_record Thredded::PrivatePost, post_id
+      email_details = Thredded::TopicEmailView.new(@post.postable)
       headers['X-SMTPAPI'] = email_details.smtp_api_tag('private_topic_mailer')
 
-      mail from:     email_details.no_reply,
-           to:       email_details.no_reply,
-           bcc:      emails,
-           subject:  email_details.subject
+      mail from: email_details.no_reply,
+           to: email_details.no_reply,
+           bcc: emails,
+           subject: [
+             Thredded.email_outgoing_prefix,
+             t('thredded.emails.message_notification.subject',
+               user: @post.user.thredded_display_name,
+               topic_title: @post.postable.title)
+           ].compact.join
     end
   end
 end

data/app/models/concerns/thredded/content_moderation_state.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Thredded
-  # Moderation state of a piece of content, such as a Topic or a Post.
+  # Moderation state of a piece of content, such as a Thredded::Topic or a Thredded::Post.
   # Requires an integer moderation_state column, a user_id column, and a user_detail association on the including class.
   # @api private
   module ContentModerationState

data/app/models/thredded/topic.rb

@@ -172,7 +172,7 @@ module Thredded
       # Update the associated messageboard metadata that Rails does not update them automatically.
       previous_changes['messageboard_id'].each do |messageboard_id|
         Thredded::Messageboard.reset_counters(messageboard_id, :topics, :posts)
-        Messageboard.find(messageboard_id).update_last_topic!
+        Thredded::Messageboard.find(messageboard_id).update_last_topic!
       end
     end
   end

data/app/models/thredded/user_permissions/moderate/if_moderator_column_true.rb

@@ -5,22 +5,11 @@ module Thredded
     module Moderate
       module IfModeratorColumnTrue
         extend ActiveSupport::Concern
-        included { extend ClassMethods }
 
         # @return [ActiveRecord::Relation<Thredded::Messageboard>] messageboards that the user can moderate
         def thredded_can_moderate_messageboards
           send(Thredded.moderator_column) ? Thredded::Messageboard.all : Thredded::Messageboard.none
         end
-
-        module ClassMethods
-          # Users that can moderate the given messageboards.
-          #
-          # @param _messageboards [Array<Thredded::Messageboard>]
-          # @return [ActiveRecord::Relation<Thredded.user_class>] users that can moderate the given messageboards
-          def thredded_messageboards_moderators(_messageboards)
-            where(Thredded.moderator_column => true)
-          end
-        end
       end
     end
   end

data/app/models/thredded/user_permissions/moderate/none.rb

@@ -5,22 +5,11 @@ module Thredded
     module Moderate
       module None
         extend ActiveSupport::Concern
-        included { extend ClassMethods }
 
         # @return [ActiveRecord::Relation<Thredded::Messageboard>] messageboards that the user can moderate
         def thredded_can_moderate_messageboards
           Thredded::Messageboard.none
         end
-
-        module ClassMethods
-          # Users that can moderate the given messageboards.
-          #
-          # @param _messageboards [Array<Thredded::Messageboard>]
-          # @return [ActiveRecord::Relation<Thredded.user_class>] users that can moderate the given messageboards
-          def thredded_messageboards_moderators(_messageboards)
-            none
-          end
-        end
       end
     end
   end

data/app/models/thredded/user_permissions/write/all.rb

@@ -5,22 +5,11 @@ module Thredded
     module Write
       module All
         extend ActiveSupport::Concern
-        included { extend ClassMethods }
 
         # @return [ActiveRecord::Relation<Thredded::Messageboard>] messageboards that the user can post in
         def thredded_can_write_messageboards
           Thredded::Messageboard.all
         end
-
-        module ClassMethods
-          # Users that can post to the given messageboards.
-          #
-          # @param _messageboards [Array<Thredded::Messageboard>]
-          # @return [ActiveRecord::Relation<Thredded.user_class>] users that can post to the given messageboards
-          def thredded_messageboards_writers(_messageboards)
-            all
-          end
-        end
       end
     end
   end

data/app/models/thredded/user_permissions/write/none.rb

@@ -5,22 +5,11 @@ module Thredded
     module Write
       module None
         extend ActiveSupport::Concern
-        included { extend ClassMethods }
 
         # @return [ActiveRecord::Relation<Thredded::Messageboard>] messageboards that the user can post in
         def thredded_can_write_messageboards
           Thredded::Messageboard.none
         end
-
-        module ClassMethods
-          # Users that can post to the given messageboards.
-          #
-          # @param _messageboards [Array<Thredded::Messageboard>]
-          # @return [ActiveRecord::Relation<Thredded.user_class>] users that can post to the given messageboards
-          def thredded_messageboards_writers(_messageboards)
-            none
-          end
-        end
       end
     end
   end

data/app/models/thredded/user_topic_follow.rb

@@ -21,8 +21,10 @@ module Thredded
     #
     # @return [Thredded::UserTopicFollow]
     def self.create_unless_exists(user_id, topic_id, reason = :manual)
-      transaction(requires_new: true) do
-        create_with(reason: reason).find_or_create_by(user_id: user_id, topic_id: topic_id)
+      uncached do
+        transaction(requires_new: true) do
+          create_with(reason: reason).find_or_create_by(user_id: user_id, topic_id: topic_id)
+        end
       end
     rescue ActiveRecord::RecordNotUnique
       # The record has been created from another connection, retry to find it.

data/app/notifiers/thredded/email_notifier.rb

@@ -2,6 +2,10 @@
 
 module Thredded
   class EmailNotifier
+    def initialize
+      fail 'Please set Thredded.email_from in config/initializers/thredded.rb' if Thredded.email_from.blank?
+    end
+
     def human_name
       I18n.t('thredded.email_notifier.by_email')
     end
@@ -11,11 +15,11 @@ module Thredded
     end
 
     def new_post(post, users)
-      PostMailer.post_notification(post.id, users.map(&:email)).deliver_now
+      Thredded::PostMailer.post_notification(post.id, users.map(&:email)).deliver_now
     end
 
     def new_private_post(post, users)
-      PrivateTopicMailer.message_notification(post.postable.id, post.id, users.map(&:email)).deliver_now
+      Thredded::PrivateTopicMailer.message_notification(post.id, users.map(&:email)).deliver_now
     end
   end
 end

data/app/policies/thredded/messageboard_policy.rb

@@ -37,7 +37,9 @@ module Thredded
     end
 
     def post?
-      @user.thredded_admin? || @user.thredded_can_write_messageboards.include?(@messageboard)
+      @user.thredded_admin? ||
+        (!@messageboard.locked? || moderate?) &&
+          @user.thredded_can_write_messageboards.include?(@messageboard)
     end
 
     def moderate?

data/app/policies/thredded/post_policy.rb

@@ -26,7 +26,11 @@ module Thredded
     end
 
     def create?
-      @user.thredded_admin? || !@post.postable.locked? && messageboard_policy.post?
+      @user.thredded_admin? ||
+        !@post.postable.locked? &&
+          # Users are allowed to post in unlocked topics of a locked messageboard
+          # only if they would be allowed to post if the messageboard wasn't locked.
+          @user.thredded_can_write_messageboards.include?(@post.messageboard)
     end
 
     def read?

data/app/view_models/thredded/private_topic_view.rb

@@ -11,7 +11,7 @@ module Thredded
 
     def self.from_user(topic, user)
       read_state = if user && !user.thredded_anonymous?
-                     UserPrivateTopicReadState
+                     Thredded::UserPrivateTopicReadState
                        .find_by(user_id: user.id, postable_id: topic.id)
                    end
       new(topic, read_state, Pundit.policy!(user, topic))

data/app/view_models/thredded/topic_email_view.rb

@@ -11,10 +11,6 @@ module Thredded
       %({"category": ["thredded_#{@topic.private? ? 'private_topic' : @topic.messageboard.name}","#{tag}"]})
     end
 
-    def subject
-      "#{Thredded.email_outgoing_prefix} #{@topic.title}"
-    end
-
     def no_reply
       Thredded.email_from
     end

data/app/views/thredded/messageboards/_form.html.erb

@@ -13,6 +13,12 @@
         <%= f.collection_select :messageboard_group_id, Thredded::MessageboardGroup.all, :id, :name,
                                 include_blank: t('thredded.messageboard.form.no_group') %>
       </li>
+      <li>
+        <%= f.label :locked do %>
+            <%= f.check_box :locked %> <%= t 'thredded.messageboard.form.locked_label' %>
+        <% end %>
+      </li>
+
       <li>
         <%= f.submit @messageboard.persisted? ? t('thredded.messageboard.update') : t('thredded.messageboard.create'),
                      class: 'thredded--form--submit',

data/app/views/thredded/messageboards/_messageboard.html.erb

@@ -3,11 +3,7 @@
     <%= link_to messageboard_topics_path(messageboard), class: 'thredded--messageboard' do %>
       <header class="thredded--messageboard--header">
         <h2 class="thredded--messageboard--title"><%= messageboard.name %></h2>
-        <h3 class="thredded--messageboard--meta">
-          <%= t 'thredded.messageboard.topics_and_posts_counts',
-                topics_count: number_with_delimiter(messageboard.topics_count),
-                posts_count: number_with_delimiter(messageboard.posts_count) %>
-        </h3>
+        <%= render 'thredded/messageboards/messageboard_meta', messageboard: messageboard %>
       </header>
 
       <p class="thredded--messageboard--description"><%= messageboard.description %></p>

data/app/views/thredded/messageboards/_messageboard_meta.html.erb

@@ -0,0 +1,13 @@
+<div class="thredded--messageboard--meta">
+  <% if messageboard.locked? %>
+    <span class="thredded--messageboard--meta--locked"
+          title="<%= t('thredded.messageboard.form.locked_notice') %>">
+      <%= inline_svg('thredded/lock.svg', class: 'thredded--messageboard--meta--icon') %>
+    </span>
+  <% end %>
+  <h3 class="thredded--messageboard--meta--counts">
+    <%= t 'thredded.messageboard.topics_and_posts_counts',
+          topics_count: number_with_delimiter(messageboard.topics_count),
+          posts_count: number_with_delimiter(messageboard.posts_count) %>
+  </h3>
+</div>

data/app/views/thredded/moderation/users.html.erb

@@ -14,8 +14,8 @@
         <caption><%= page_entries_info @users %></caption>
         <thead>
         <tr>
-          <th>User</th>
-          <th>Moderation state</th>
+          <th><%= t 'thredded.moderation.user.name' %></th>
+          <th><%= t 'thredded.moderation.moderation_state.name' %></th>
         </tr>
         </thead>
         <tbody>

data/app/views/thredded/post_mailer/post_notification.html.erb

@@ -1,7 +1,10 @@
 <div class="thredded--email">
   <figure class="thredded--email-post">
     <figcaption class="thredded--email-post--author">
-      <%= @post.user.thredded_display_name %> <%= link_to 'said', post_permalink_url(@post) %>:
+      <%= t 'thredded.emails.post_notification.html.post_lead_html',
+            user: @post.user.thredded_display_name,
+            post_url: post_permalink_url(@post.id),
+            topic_title: @post.postable.title %>
     </figcaption>
     <% cache [@post, 'content-onebox-placeholders'] do %>
       <%= render partial: 'thredded/posts/content',
@@ -11,13 +14,13 @@
   <hr/>
 
   <p>
-    This email was sent to you because you are following this topic
-    "<%= link_to @post.postable.title, post_permalink_url(@post.id) %>".
-    <%= link_to 'View the conversation here', topic_url(@post.postable) %>.
+    <%= t 'thredded.emails.post_notification.html.email_sent_reason_html',
+          post_url: post_permalink_url(@post.id),
+          topic_title: @post.postable.title %>
   </p>
 
   <p>
-    To unsubscribe from these emails, update your
-    <%= link_to 'preferences', edit_messageboard_preferences_url(@post.messageboard) %>.
+    <%= t 'thredded.emails.post_notification.html.unsubscribe_instructions_html',
+          preferences_url: edit_messageboard_preferences_url(@post.messageboard) %>
   </p>
 </div>