aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--vendor/plugins/globalize2/lib/globalize/active_record.rb9
1 files changed, 6 insertions, 3 deletions
diff --git a/vendor/plugins/globalize2/lib/globalize/active_record.rb b/vendor/plugins/globalize2/lib/globalize/active_record.rb
index 2915a5737..ce1c50d23 100644
--- a/vendor/plugins/globalize2/lib/globalize/active_record.rb
+++ b/vendor/plugins/globalize2/lib/globalize/active_record.rb
@@ -88,9 +88,12 @@ module Globalize
delegate :set_translation_table_name, :to => :translation_class
def with_locale(locale)
- previous_locale, self.locale = self.locale, locale
- result = yield
- self.locale = previous_locale
+ begin
+ previous_locale, self.locale = self.locale, locale
+ result = yield
+ ensure
+ self.locale = previous_locale
+ end
result
end