github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-26 13:13:39 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

rename 'default_email_private_messages' to 'default_email_personal_messages'

Browse Source
This commit is contained in:
Arpit Jalan 2018-01-31 12:09:46 +05:30
parent 49424fd798
commit f88b8a8945
5 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/user_option.rb
View File

@ -27,7 +27,7 @@ class UserOption < ActiveRecord::Base
self.mailing_list_mode_frequency = SiteSetting.default_email_mailing_list_mode_frequency
self.email_direct = SiteSetting.default_email_direct
self.automatically_unpin_topics = SiteSetting.default_topics_automatic_unpin
self.email_private_messages = SiteSetting.default_email_private_messages
self.email_private_messages = SiteSetting.default_email_personal_messages
self.email_previous_replies = SiteSetting.default_email_previous_replies
self.email_in_reply_to = SiteSetting.default_email_in_reply_to

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

@ -1550,7 +1550,7 @@ en:
default_email_digest_frequency: "How often users receive summary emails by default."
default_include_tl0_in_digests: "Include posts from new users in summary emails by default. Users can change this in their preferences."
default_email_private_messages: "Send an email when someone messages the user by default."
default_email_personal_messages: "Send an email when someone messages the user by default."
default_email_direct: "Send an email when someone quotes/replies to/mentions or invites the user by default."
default_email_mailing_list_mode: "Send an email for every new post by default."
default_email_mailing_list_mode_frequency: "Users who enable mailing list mode will receive emails this often by default."

2
config/site_settings.yml
View File

@ -1421,7 +1421,7 @@ user_preferences:
enum: 'DigestEmailSiteSetting'
default: 10080
default_include_tl0_in_digests: false
default_email_private_messages: true
default_email_personal_messages: true
default_email_direct: true
default_email_mailing_list_mode: false
default_email_mailing_list_mode_frequency:

14
db/migrate/20180131052859_rename_private_personal.rb
View File

@ -11,14 +11,16 @@ class RenamePrivatePersonal < ActiveRecord::Migration[5.1]
setting :enable_private_email_messages, :enable_personal_email_messages
setting :private_email_time_window_seconds, :personal_email_time_window_seconds
setting :max_private_messages_per_day, :max_personal_messages_per_day
setting :default_email_private_messages, :default_email_personal_messages
end
def down
setting :min_private_message_post_length, :min_personal_message_post_length
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
setting :max_private_messages_per_day, :max_personal_messages_per_day
setting :min_personal_message_post_length, :min_private_message_post_length
setting :min_personal_message_title_length, :min_private_message_title_length
setting :enable_personal_messages, :enable_private_messages
setting :enable_personal_email_messages, :enable_private_email_messages
setting :personal_email_time_window_seconds, :private_email_time_window_seconds
setting :max_personal_messages_per_day, :max_private_messages_per_day
setting :default_email_personal_messages, :default_email_private_messages
end
end

2
spec/models/user_spec.rb
View File

@ -1366,7 +1366,7 @@ describe User do
before do
SiteSetting.default_email_digest_frequency = 1440 # daily
SiteSetting.default_email_private_messages = false
SiteSetting.default_email_personal_messages = false
SiteSetting.default_email_direct = false
SiteSetting.default_email_mailing_list_mode = true
SiteSetting.default_email_always = true