diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2008-04-13 17:28:14 -0500 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2008-04-13 17:28:14 -0500 |
| commit | be7fd8168aa4776dccfe2e670cb9451204449dd4 (patch) | |
| tree | dd0f9e7d7dca2899449fa9c2faa240bc5f803e64 /railties | |
| parent | 342dcfe789d11e07f89d4ddfc3dc581da650a65e (diff) | |
| parent | 9620372a6dc7eeebdb04f1fdb7f150d29e60fc00 (diff) | |
| download | rails-be7fd8168aa4776dccfe2e670cb9451204449dd4.tar.gz rails-be7fd8168aa4776dccfe2e670cb9451204449dd4.tar.bz2 rails-be7fd8168aa4776dccfe2e670cb9451204449dd4.zip | |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/CHANGELOG | 2 | ||||
| -rw-r--r-- | railties/lib/tasks/misc.rake | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index 5a80e21446..86b30244ba 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* rake time:zones:local finds correct base utc offset for zones in the Southern Hemisphere [Geoff Buesing] + * Don't require rails/gem_builder during rails initialization, it's only needed for the gems:build task. [rick] * script/performance/profiler compatibility with the ruby-prof >= 0.5.0. Closes #9176. [Catfish] diff --git a/railties/lib/tasks/misc.rake b/railties/lib/tasks/misc.rake index d083a8aef4..61042595f9 100644 --- a/railties/lib/tasks/misc.rake +++ b/railties/lib/tasks/misc.rake @@ -24,7 +24,10 @@ namespace :time do desc 'Displays names of time zones recognized by the Rails TimeZone class with the same offset as the system local time' task :local do - build_time_zone_list(:all, Time.now.beginning_of_year.utc_offset) + jan_offset = Time.now.beginning_of_year.utc_offset + jul_offset = Time.now.beginning_of_year.change(:month => 7).utc_offset + offset = jan_offset < jul_offset ? jan_offset : jul_offset + build_time_zone_list(:all, offset) end # to find UTC -06:00 zones, OFFSET can be set to either -6, -6:00 or 21600 |