github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 07:53:49 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

copyedits; email image auto for > 250 width/height

Browse Source
This commit is contained in:
Jeff Atwood
2014-11-09 01:27:09 -08:00
parent e669fed8ea
commit 435cd37021
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -414,7 +414,7 @@ en:
activation: activation:
action: "Activate your account" action: "Activate your account"
already_done: "Sorry, this account confirmation link is no longer valid. Perhaps your account is already active?" already_done: "Sorry, this account confirmation link is no longer valid. Perhaps your account is already active?"
please_continue: "Your new account is confirmed! You will now be redirected to the home page." please_continue: "Your new account is confirmed; you will be redirected to the home page."
continue_button: "Continue to %{site_name}" continue_button: "Continue to %{site_name}"
welcome_to: "Welcome to %{site_name}!" welcome_to: "Welcome to %{site_name}!"
approval_required: "A moderator must manually approve your new account before you can access this forum. You'll get an email when your account is approved!" approval_required: "A moderator must manually approve your new account before you can access this forum. You'll get an email when your account is approved!"

4
lib/email/styles.rb
View File

@ -38,8 +38,8 @@ module Email
img['height'] = 20 img['height'] = 20
else else
# having no extra style on email images might work best? # having no extra style on email images might work best?
img['width'] = 'auto' if img['width'].to_i > 50 img['width'] = 'auto' if img['width'].to_i > 250
img['height'] = 'auto' if img['height'].to_i > 50 img['height'] = 'auto' if img['height'].to_i > 250
add_styles(img, 'max-width:100%;') if img['style'] !~ /max-width/ add_styles(img, 'max-width:100%;') if img['style'] !~ /max-width/
end end