Merge branch 'release/0.9'0.9

Conflicts:
    locale/cs/app.po
    locale/he_IL/app.po
    locale/id/app.po
    locale/it/app.po
    locale/ro_RO/app.po
    locale/uk/app.po

1 files changed, 3 insertions, 4 deletions

diff --git a/app/models/track_mailer.rb b/app/models/track_mailer.rb
index 51440e4d7..7262c82f3 100644
--- a/app/models/track_mailer.rb
+++ b/app/models/track_mailer.rb
@@ -91,10 +91,9 @@ class TrackMailer < ApplicationMailer
             if email_about_things.size > 0
                 # Send the email
 
-                previous_locale = I18n.locale
-                I18n.locale = user.get_locale
-                TrackMailer.deliver_event_digest(user, email_about_things)
-                I18n.locale = previous_locale
+                I18n.with_locale(user.get_locale) do
+                    TrackMailer.deliver_event_digest(user, email_about_things)
+                end
             end
 
             # Record that we've now sent those alerts to that user