diff --git a/app/jobs/scheduled/pending_flags_reminder.rb b/app/jobs/scheduled/pending_reviewables_reminder.rb
similarity index 83%
rename from app/jobs/scheduled/pending_flags_reminder.rb
rename to app/jobs/scheduled/pending_reviewables_reminder.rb
index da38e2bc2e6..30a3ec7039b 100644
--- a/app/jobs/scheduled/pending_flags_reminder.rb
+++ b/app/jobs/scheduled/pending_reviewables_reminder.rb
@@ -2,7 +2,7 @@ require_dependency 'flag_query'
module Jobs
- class PendingFlagsReminder < Jobs::Scheduled
+ class PendingReviewablesReminder < Jobs::Scheduled
every 1.hour
attr_reader :sent_reminder
@@ -27,8 +27,8 @@ module Jobs
target_group_names: Group[:moderators].name,
archetype: Archetype.private_message,
subtype: TopicSubtype.system_message,
- title: I18n.t('flags_reminder.subject_template', count: reviewable_ids.size),
- raw: mentions + I18n.t('flags_reminder.flags_were_submitted', count: SiteSetting.notify_about_flags_after, base_path: Discourse.base_path)
+ title: I18n.t('reviewables_reminder.subject_template', count: reviewable_ids.size),
+ raw: mentions + I18n.t('reviewables_reminder.submitted', count: SiteSetting.notify_about_flags_after, base_path: Discourse.base_path)
).present?
self.class.last_notified_id = reviewable_ids[0]
diff --git a/app/views/pending_flags_mailer/notify.html.erb b/app/views/pending_flags_mailer/notify.html.erb
deleted file mode 100644
index 940fc6c6e64..00000000000
--- a/app/views/pending_flags_mailer/notify.html.erb
+++ /dev/null
@@ -1,29 +0,0 @@
-
- <%= t 'flags_reminder.flags_were_submitted', count: @hours %>
- <%= t 'flags_reminder.please_review' %>
-
-
-
- <% @posts.each do |post| %>
-
-
-
- " title="<%= post[:user].username %>">
-
- |
-
- <%= link_to post[:title], post[:url] %>
- <%= raw post[:excerpt] %>
- |
-
-
- <%= raw post[:html_reason_counts] %> |
-
- <% end %>
-
-
-
diff --git a/app/views/pending_flags_mailer/notify.text.erb b/app/views/pending_flags_mailer/notify.text.erb
deleted file mode 100644
index ca10b097b4e..00000000000
--- a/app/views/pending_flags_mailer/notify.text.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<%=t 'flags_reminder.flags_were_submitted', count: @hours %> <%=t 'flags_reminder.please_review' %>
-
-<%= Discourse.base_url + '/admin/flags' %>
-
-<% @posts.each do |post| %>
- - <%= post[:title] %>: <%=t 'flags_reminder.post_number' %> <%= post[:post_number] %> - <%= post[:reason_counts] %>
-<% end %>
-
-<%=t 'flags_reminder.how_to_disable' %>
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index d3d6ba842d0..0376302e944 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -2221,13 +2221,13 @@ en:
same_ip_address: "Same IP address (%{ip_address}) as other users"
inactive_user: "Inactive user"
- flags_reminder:
- flags_were_submitted:
- one: "Flags were submitted over 1 hour ago. [Please review them](%{base_path}/admin/flags)."
- other: "Flags were submitted over %{count} hours ago. [Please review them](%{base_path}/admin/flags)."
+ reviewables_reminder:
+ submitted:
+ one: "Items were submitted over 1 hour ago. [Please review them](%{base_path}/review)."
+ other: "Items were submitted over %{count} hours ago. [Please review them](%{base_path}/review)."
subject_template:
- one: "1 flag waiting to be handled"
- other: "%{count} flags waiting to be handled"
+ one: "1 item needs to be reviewed"
+ other: "%{count} items need to be reviewed"
unsubscribe_mailer:
title: "Unsubscribe Mailer"
diff --git a/spec/jobs/pending_flags_reminder_spec.rb b/spec/jobs/pending_reviewables_reminder_spec.rb
similarity index 97%
rename from spec/jobs/pending_flags_reminder_spec.rb
rename to spec/jobs/pending_reviewables_reminder_spec.rb
index 69f3c69c5f5..cad9433bbae 100644
--- a/spec/jobs/pending_flags_reminder_spec.rb
+++ b/spec/jobs/pending_reviewables_reminder_spec.rb
@@ -1,6 +1,6 @@
require 'rails_helper'
-describe Jobs::PendingFlagsReminder do
+describe Jobs::PendingReviewablesReminder do
let(:job) { described_class.new }
def create_flag(created_at)