From 7e48c47d378c98f826f8778d0a98c732b483956e Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Wed, 31 Jan 2018 11:34:50 +0530
Subject: [PATCH] rename 'enable_private_email_messages' to
 'enable_personal_email_messages'

---
 config/locales/server.en.yml                         | 2 +-
 config/site_settings.yml                             | 2 +-
 db/migrate/20180131052859_rename_private_personal.rb | 2 ++
 lib/guardian.rb                                      | 2 +-
 spec/components/topic_creator_spec.rb                | 4 ++--
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index a2d4ca232fe..37a69c9951e 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -1038,7 +1038,7 @@ en:
 
     enable_personal_messages: "Allow trust level 1 (configurable via min trust level to send messages) users to create messages and reply to messages. Note that staff can always send messages no matter what."
     enable_system_message_replies: "Allows users to reply to system messages, even if private messages are disabled"
-    enable_private_email_messages: "Allow trust level 4 (configurable via min trust level to send messages) users to send private email messages. Note that staff can always send messages no matter what."
+    enable_personal_email_messages: "Allow trust level 4 (configurable via min trust level to send messages) users to send private email messages. Note that staff can always send messages no matter what."
 
     enable_long_polling: "Message bus used for notification can use long polling"
     long_polling_base_url: "Base URL used for long polling (when a CDN is serving dynamic content, be sure to set this to origin pull) eg: http://origin.site.com"
diff --git a/config/site_settings.yml b/config/site_settings.yml
index d9e6cd9a9ef..20a5cd54266 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -510,7 +510,7 @@ posting:
     client: true
   enable_system_message_replies:
     default: true
-  enable_private_email_messages:
+  enable_personal_email_messages:
     default: false
     client: true
     validator: "EnablePrivateEmailMessagesValidator"
diff --git a/db/migrate/20180131052859_rename_private_personal.rb b/db/migrate/20180131052859_rename_private_personal.rb
index b97478f6894..c97ade8ffe3 100644
--- a/db/migrate/20180131052859_rename_private_personal.rb
+++ b/db/migrate/20180131052859_rename_private_personal.rb
@@ -8,11 +8,13 @@ class RenamePrivatePersonal < ActiveRecord::Migration[5.1]
     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
   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
   end
 end
diff --git a/lib/guardian.rb b/lib/guardian.rb
index 789d479ec00..19d9fe78231 100644
--- a/lib/guardian.rb
+++ b/lib/guardian.rb
@@ -320,7 +320,7 @@ class Guardian
     # User is trusted enough
     @user.has_trust_level?(SiteSetting.min_trust_to_send_email_messages) &&
     # PMs to email addresses are enabled
-    (is_staff? || SiteSetting.enable_private_email_messages)
+    (is_staff? || SiteSetting.enable_personal_email_messages)
   end
 
   def can_see_emails?
diff --git a/spec/components/topic_creator_spec.rb b/spec/components/topic_creator_spec.rb
index 0ed814cae12..ceb81d4e392 100644
--- a/spec/components/topic_creator_spec.rb
+++ b/spec/components/topic_creator_spec.rb
@@ -80,7 +80,7 @@ describe TopicCreator do
         end
 
         it "should be possible for a trusted user to send private messages via email" do
-          SiteSetting.expects(:enable_private_email_messages).returns(true)
+          SiteSetting.expects(:enable_personal_email_messages).returns(true)
           SiteSetting.min_trust_to_send_email_messages = TrustLevel[1]
 
           expect(TopicCreator.create(user, Guardian.new(user), pm_to_email_valid_attrs)).to be_valid
@@ -89,7 +89,7 @@ describe TopicCreator do
 
       context 'failure cases' do
         it "should be rollback the changes when email is invalid" do
-          SiteSetting.expects(:enable_private_email_messages).returns(true)
+          SiteSetting.expects(:enable_personal_email_messages).returns(true)
           SiteSetting.min_trust_to_send_email_messages = TrustLevel[1]
           attrs = pm_to_email_valid_attrs.dup
           attrs[:target_emails] = "t" * 256