Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rename 'private_email_time_window_seconds' to 'personal_email_time_window_seconds'

This commit is contained in:
Arpit Jalan 2018-01-31 11:37:10 +05:30
parent 7e48c47d37
commit 7cda3a37af
5 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/services/notification_emailer.rb
View File

@ -99,7 +99,7 @@ class NotificationEmailer
end
def private_delay
SiteSetting.private_email_time_window_seconds
SiteSetting.personal_email_time_window_seconds
end
def post_type

2
config/locales/server.en.yml
View File

@ -1302,7 +1302,7 @@ en:
create_thumbnails: "Create thumbnails and lightbox images that are too large to fit in a post."
email_time_window_mins: "Wait (n) minutes before sending any notification emails, to give users a chance to edit and finalize their posts."
private_email_time_window_seconds: "Wait (n) seconds before sending any private notification emails, to give users a chance to edit and finalize their messages."
personal_email_time_window_seconds: "Wait (n) seconds before sending any private notification emails, to give users a chance to edit and finalize their messages."
email_posts_context: "How many prior replies to include as context in notification emails."
flush_timings_secs: "How frequently we flush timing data to the server, in seconds."
title_max_word_length: "The maximum allowed word length, in characters, in a topic title."

2
config/site_settings.yml
View File

@ -660,7 +660,7 @@ email:
email_time_window_mins:
default: 10
client: true
private_email_time_window_seconds: 20
personal_email_time_window_seconds: 20
email_posts_context: 5
digest_min_excerpt_length:
default: 100

2
db/migrate/20180131052859_rename_private_personal.rb
View File

@ -9,6 +9,7 @@ class RenamePrivatePersonal < ActiveRecord::Migration[5.1]
setting :min_private_message_title_length, :min_personal_message_title_length
setting :enable_private_messages, :enable_personal_messages
setting :enable_private_email_messages, :enable_personal_email_messages
setting :private_email_time_window_seconds, :personal_email_time_window_seconds
end
def down
@ -16,5 +17,6 @@ class RenamePrivatePersonal < ActiveRecord::Migration[5.1]
setting :min_private_message_title_length, :min_personal_message_title_length
setting :enable_private_messages, :enable_personal_messages
setting :enable_private_email_messages, :enable_personal_email_messages
setting :private_email_time_window_seconds, :personal_email_time_window_seconds
end
end

6
spec/services/notification_emailer_spec.rb
View File

@ -144,7 +144,7 @@ describe NotificationEmailer do
context 'user_private_message' do
let(:type) { :user_private_message }
let(:delay) { SiteSetting.private_email_time_window_seconds }
let(:delay) { SiteSetting.personal_email_time_window_seconds }
let!(:notification) { create_notification(:private_message) }
include_examples "enqueue_private"
@ -159,7 +159,7 @@ describe NotificationEmailer do
context 'user_invited_to_private_message' do
let(:type) { :user_invited_to_private_message }
let(:delay) { SiteSetting.private_email_time_window_seconds }
let(:delay) { SiteSetting.personal_email_time_window_seconds }
let!(:notification) { create_notification(:invited_to_private_message) }
include_examples "enqueue_public"
@ -167,7 +167,7 @@ describe NotificationEmailer do
context 'user_invited_to_topic' do
let(:type) { :user_invited_to_topic }
let(:delay) { SiteSetting.private_email_time_window_seconds }
let(:delay) { SiteSetting.personal_email_time_window_seconds }
let!(:notification) { create_notification(:invited_to_topic) }
include_examples "enqueue_public"