diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 684bd7dfebc..178e19d1c6a 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -414,7 +414,7 @@ en: activation: action: "Activate your account" 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}" 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!" diff --git a/lib/email/styles.rb b/lib/email/styles.rb index 9a31ec2f88d..481fef9a8ef 100644 --- a/lib/email/styles.rb +++ b/lib/email/styles.rb @@ -38,8 +38,8 @@ module Email img['height'] = 20 else # having no extra style on email images might work best? - img['width'] = 'auto' if img['width'].to_i > 50 - img['height'] = 'auto' if img['height'].to_i > 50 + img['width'] = 'auto' if img['width'].to_i > 250 + img['height'] = 'auto' if img['height'].to_i > 250 add_styles(img, 'max-width:100%;') if img['style'] !~ /max-width/ end