Merge pull request #5232 from taro-k/develop5231

fix locale of invitation email subject #5231

Changelog.md

@@ -48,6 +48,7 @@ The default for including jQuery from a CDN has changed. If you want to continue
 * Move submit button to the right in conversations view [#4960](https://github.com/diaspora/diaspora/pull/4960)
 * Handle long URLs and titles in OpenGraph descriptions [#5208](https://github.com/diaspora/diaspora/pull/5208)
 * Fix deformed getting started popover [#5227](https://github.com/diaspora/diaspora/pull/5227)
+* Use correct locale for invitation subject [#5232](https://github.com/diaspora/diaspora/pull/5232)
 
 ## Features
 * Don't pull jQuery from a CDN by default [#5105](https://github.com/diaspora/diaspora/pull/5105)

app/assets/stylesheets/profile.css.scss

@@ -13,6 +13,8 @@
     padding: 0;
   }
 
+  .avatar.large { margin-bottom: 0; }
+
   ul#profile_information {
     margin: 1em 0;
     > li {

app/mailers/notifier.rb

@@ -43,11 +43,11 @@ class Notifier < ActionMailer::Base
     @locale = locale
     @invitation_code = invitation_code
 
+    I18n.with_locale(locale) do
       mail_opts = {:to => email, :from => AppConfig.mail.sender_address,
                  :subject => I18n.t('notifier.invited_you', :name => @inviter.name),
                  :host => AppConfig.pod_uri.host}
 
-    I18n.with_locale(locale) do
       mail(mail_opts) do |format|
         format.text { render :layout => nil }
         format.html { render :layout => nil }