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

new 'convert_pasted_images_quality' site setting

This commit is contained in:
Régis Hanol 2016-07-27 19:59:44 +02:00
parent be099bb637
commit 6dac9075dc
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/uploads_controller.rb
View File

@ -73,7 +73,7 @@ class UploadsController < ApplicationController
# convert pasted images to HQ jpegs # convert pasted images to HQ jpegs
if filename == "blob.png" && SiteSetting.convert_pasted_images_to_hq_jpg if filename == "blob.png" && SiteSetting.convert_pasted_images_to_hq_jpg
jpeg_path = "#{File.dirname(tempfile.path)}/blob.jpg" jpeg_path = "#{File.dirname(tempfile.path)}/blob.jpg"
`convert #{tempfile.path} -quality 95 #{jpeg_path}` `convert #{tempfile.path} -quality #{SiteSetting.convert_pasted_images_quality} #{jpeg_path}`
# only change the format of the image when JPG is at least 5% smaller # only change the format of the image when JPG is at least 5% smaller
if File.size(jpeg_path) < File.size(tempfile.path) * 0.95 if File.size(jpeg_path) < File.size(tempfile.path) * 0.95
filename = "blob.jpg" filename = "blob.jpg"

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

@ -1070,6 +1070,7 @@ en:
allow_all_attachments_for_group_messages: "Allow all email attachments for group messages." allow_all_attachments_for_group_messages: "Allow all email attachments for group messages."
convert_pasted_images_to_hq_jpg: "Convert pasted images to high-quality JPG files." convert_pasted_images_to_hq_jpg: "Convert pasted images to high-quality JPG files."
convert_pasted_images_quality: "Quality of the converted JPG file (1 is lowest quality, 100 is best quality)."
enable_flash_video_onebox: "Enable embedding of swf and flv (Adobe Flash) links in oneboxes. WARNING: may introduce security risks." enable_flash_video_onebox: "Enable embedding of swf and flv (Adobe Flash) links in oneboxes. WARNING: may introduce security risks."

4
config/site_settings.yml
View File

@ -718,6 +718,10 @@ files:
default_opengraph_image_url: '' default_opengraph_image_url: ''
allow_all_attachments_for_group_messages: false allow_all_attachments_for_group_messages: false
convert_pasted_images_to_hq_jpg: true convert_pasted_images_to_hq_jpg: true
convert_pasted_images_quality:
default: 95
min: 1
max: 100
trust: trust:
default_trust_level: default_trust_level: