From 1a876f622865979ea6415d913adface70716e458 Mon Sep 17 00:00:00 2001
From: Steve Klabnik <steve@steveklabnik.com>
Date: Mon, 26 Nov 2012 10:33:06 -0800
Subject: Add i18n scope to disance_of_time_in_words.

This is a backport of rails/rails#7997.
---
 actionpack/CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'actionpack/CHANGELOG.md')

diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index e060937fac..51518684d7 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,7 +1,8 @@
 ## Rails 3.2.10 (unreleased) ##
 
-*   Fix side effect of `url_for` changing the `:controller` string option. [Backport #6003]
+*   Add i18n scope to disance_of_time_in_words. [Backport #7997] *Steve Klabnik*
 
+*   Fix side effect of `url_for` changing the `:controller` string option. [Backport #6003]
     Before:
 
         controller = '/projects'
-- 
cgit v1.2.3