Discourse/discourse
Discourse/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-09-06 10:50:21 +08:00
Code Packages Activity Actions 9

FEATURE: new 'always_show_trimmed_content' site setting

Browse source
This commit is contained in:
Régis Hanol 2016-11-16 22:06:07 +01:00
parent a5de6f79a3
commit a69f45d0da
3 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1247,6 +1247,7 @@ en:
attachment_filename_blacklist: "List of keywords used to blacklist attachments based on the filename." attachment_filename_blacklist: "List of keywords used to blacklist attachments based on the filename."
enable_forwarded_emails: "[BETA] Allow users to create a topic by forwarding an email in." enable_forwarded_emails: "[BETA] Allow users to create a topic by forwarding an email in."
always_show_trimmed_content: "Always show trimmed part of incoming emails. WARNING: might reveal email addresses."
manual_polling_enabled: "Push emails using the API for email replies." manual_polling_enabled: "Push emails using the API for email replies."
pop3_polling_enabled: "Poll via POP3 for email replies." pop3_polling_enabled: "Poll via POP3 for email replies."

1
config/site_settings.yml
View file

@ -671,6 +671,7 @@ email:
type: list type: list
default: "smime.p7s|signature.asc" default: "smime.p7s|signature.asc"
enable_forwarded_emails: false enable_forwarded_emails: false
always_show_trimmed_content: false
files: files:
max_image_size_kb: max_image_size_kb:

2
lib/email/receiver.rb
View file

@ -557,7 +557,7 @@ module Email
options[:topic].try(:private_message?) options[:topic].try(:private_message?)
# only add elided part in messages # only add elided part in messages
if options[:elided].present? && is_private_message if options[:elided].present? && (SiteSetting.always_show_trimmed_content || is_private_message)
options[:raw] << "\n\n" << "<details class='elided'>" << "\n" options[:raw] << "\n\n" << "<details class='elided'>" << "\n"
options[:raw] << "<summary title='#{I18n.t('emails.incoming.show_trimmed_content')}'>&#183;&#183;&#183;</summary>" << "\n" options[:raw] << "<summary title='#{I18n.t('emails.incoming.show_trimmed_content')}'>&#183;&#183;&#183;</summary>" << "\n"
options[:raw] << options[:elided] << "\n" options[:raw] << options[:elided] << "\n"