From: Tom Hughes <tom@compton.nu>
Date: Wed, 28 Mar 2012 15:31:37 +0000 (+0100)
Subject: Update rails-i18n to 0.6.2
X-Git-Tag: live~5630
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/e3a6b8183f0b99b3241f319b7f6223c6c625cfee

Update rails-i18n to 0.6.2
---

diff --git a/Gemfile b/Gemfile
index 2511fd7ea..3da5c9a08 100644
--- a/Gemfile
+++ b/Gemfile
@@ -11,7 +11,7 @@ gem 'pg'
 gem 'jquery-rails'
 
 # Load rails plugins
-gem 'rails-i18n', ">= 0.5.2"
+gem 'rails-i18n', ">= 0.6.2"
 gem 'dynamic_form'
 gem 'rinku', '>= 1.2.2', :require => 'rails_rinku'
 gem 'oauth-plugin', '>= 0.4.0.pre7'
diff --git a/Gemfile.lock b/Gemfile.lock
index d7b29c14c..13a676f59 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -40,7 +40,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.2.0)
-    composite_primary_keys (5.0.2)
+    composite_primary_keys (5.0.4)
       activerecord (~> 3.2.0)
     deadlock_retry (1.2.0)
     dynamic_form (1.1.4)
@@ -61,16 +61,16 @@ GEM
     jquery-rails (2.0.1)
       railties (>= 3.2.0, < 5.0)
       thor (~> 0.14)
-    json (1.6.5)
+    json (1.6.6)
     libv8 (3.3.10.4)
-    libxml-ruby (2.2.2)
+    libxml-ruby (2.3.2)
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     memcached (1.4.1)
-    mime-types (1.17.2)
-    multi_json (1.1.0)
+    mime-types (1.18)
+    multi_json (1.2.0)
     multipart-post (1.1.5)
     nokogiri (1.5.2)
     oauth (0.4.5)
@@ -109,7 +109,7 @@ GEM
       activesupport (= 3.2.2)
       bundler (~> 1.0)
       railties (= 3.2.2)
-    rails-i18n (0.5.2)
+    rails-i18n (0.6.2)
       i18n (~> 0.5)
     railties (3.2.2)
       actionpack (= 3.2.2)
@@ -127,7 +127,7 @@ GEM
     sanitize (2.0.3)
       nokogiri (>= 1.4.4, < 1.6)
     sass (3.1.15)
-    sass-rails (3.2.4)
+    sass-rails (3.2.5)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
@@ -144,7 +144,7 @@ GEM
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.32)
-    uglifier (1.2.3)
+    uglifier (1.2.4)
       execjs (>= 0.3.0)
       multi_json (>= 1.0.2)
     validates_email_format_of (1.5.3)
@@ -170,7 +170,7 @@ DEPENDENCIES
   paperclip (~> 2.0)
   pg
   rails (= 3.2.2)
-  rails-i18n (>= 0.5.2)
+  rails-i18n (>= 0.6.2)
   redcarpet
   rinku (>= 1.2.2)
   sanitize