Discourse/discourse
Discourse/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-09-05 08:59:27 +08:00
Code Packages Activity Actions 11

rename 'max_private_messages_per_day' to 'max_personal_messages_per_day'

Browse source
This commit is contained in:
Arpit Jalan 2018-01-31 11:46:25 +05:30
parent 7cda3a37af
commit 6be536ca50
4 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/models/topic.rb
View file

@ -310,7 +310,7 @@ class Topic < ActiveRecord::Base
def limit_private_messages_per_day def limit_private_messages_per_day
return unless private_message? return unless private_message?
apply_per_day_rate_limit_for("pms", :max_private_messages_per_day) apply_per_day_rate_limit_for("pms", :max_personal_messages_per_day)
end end
def self.fancy_title(title) def self.fancy_title(title)

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

@ -1203,7 +1203,7 @@ en:
max_bookmarks_per_day: "Maximum number of bookmarks per user per day." max_bookmarks_per_day: "Maximum number of bookmarks per user per day."
max_edits_per_day: "Maximum number of edits per user per day." max_edits_per_day: "Maximum number of edits per user per day."
max_topics_per_day: "Maximum number of topics a user can create per day." max_topics_per_day: "Maximum number of topics a user can create per day."
max_private_messages_per_day: "Maximum number of messages users can create per day." max_personal_messages_per_day: "Maximum number of messages users can create per day."
max_invites_per_day: "Maximum number of invites a user can send per day." max_invites_per_day: "Maximum number of invites a user can send per day."
max_topic_invitations_per_day: "Maximum number of topic invitations a user can send per day." max_topic_invitations_per_day: "Maximum number of topic invitations a user can send per day."

2
config/site_settings.yml
View file

@ -1041,7 +1041,7 @@ rate_limits:
rate_limit_new_user_create_topic: 120 rate_limit_new_user_create_topic: 120
rate_limit_new_user_create_post: 30 rate_limit_new_user_create_post: 30
max_topics_per_day: 20 max_topics_per_day: 20
max_private_messages_per_day: 20 max_personal_messages_per_day: 20
max_likes_per_day: 50 max_likes_per_day: 50
max_bookmarks_per_day: 20 max_bookmarks_per_day: 20
max_flags_per_day: 20 max_flags_per_day: 20

2
db/migrate/20180131052859_rename_private_personal.rb
View file

@ -10,6 +10,7 @@ class RenamePrivatePersonal < ActiveRecord::Migration[5.1]
setting :enable_private_messages, :enable_personal_messages setting :enable_private_messages, :enable_personal_messages
setting :enable_private_email_messages, :enable_personal_email_messages setting :enable_private_email_messages, :enable_personal_email_messages
setting :private_email_time_window_seconds, :personal_email_time_window_seconds setting :private_email_time_window_seconds, :personal_email_time_window_seconds
setting :max_private_messages_per_day, :max_personal_messages_per_day
end end
def down def down
@ -18,5 +19,6 @@ class RenamePrivatePersonal < ActiveRecord::Migration[5.1]
setting :enable_private_messages, :enable_personal_messages setting :enable_private_messages, :enable_personal_messages
setting :enable_private_email_messages, :enable_personal_email_messages setting :enable_private_email_messages, :enable_personal_email_messages
setting :private_email_time_window_seconds, :personal_email_time_window_seconds setting :private_email_time_window_seconds, :personal_email_time_window_seconds
setting :max_private_messages_per_day, :max_personal_messages_per_day
end end
end end