Really fix deprecations.

joevandyk · Oct 18, 2008 · 9c29182 · 9c29182
1 parent d19c1d9
commit 9c29182
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 9 deletions.
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -43,7 +43,7 @@ def pluralize(count, singular, plural = nil)
     elsif plural
       plural
     else
-      Inflector.pluralize(singular)
+      ActiveSupport::Inflector.pluralize(singular)
     end
   end
 

diff --git a/lib/local_time.rb b/lib/local_time.rb
@@ -2,7 +2,7 @@
 module LocalTime
   def adjust_time(time)
     if (tz_string = Radiant::Config["local.timezone"]) and 
-        timezone = (TimeZone[tz_string] || TimeZone[tz_string.to_i]) 
+        timezone = (ActiveSupport::TimeZone[tz_string] || ActiveSupport::TimeZone[tz_string.to_i]) 
       # adjust time 
       time.in_time_zone(timezone).time
     else 

diff --git a/lib/plugins/dependencies_fix/init.rb b/lib/plugins/dependencies_fix/init.rb
diff --git a/spec/models/standard_tags_spec.rb b/spec/models/standard_tags_spec.rb
@@ -424,7 +424,7 @@
     it "should use the configured local timezone" do
       Radiant::Config["local.timezone"] = "Tokyo"
       format = "%H:%m"
-      expected = page.published_at.in_time_zone(TimeZone['Tokyo']).strftime(format)
+      expected = page.published_at.in_time_zone(ActiveSupport::TimeZone['Tokyo']).strftime(format)
       page.should render(%Q(<r:date format="#{format}" />) ).as(expected)
     end
   end