diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-05-11 11:43:30 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-05-11 11:43:30 -0700 |
| commit | d45d0a18647e906223b2859d1ce2a83be00095b1 (patch) | |
| tree | fb7c8afe4cf0c368da13893dfef338e46d988a66 /activesupport/lib | |
| parent | 4817bf94d135c44ddfae1a30acb15de989e3c86c (diff) | |
| parent | 4932f7b38f72104819022abca0c952ba6f9888cb (diff) | |
| download | rails-d45d0a18647e906223b2859d1ce2a83be00095b1.tar.gz rails-d45d0a18647e906223b2859d1ce2a83be00095b1.tar.bz2 rails-d45d0a18647e906223b2859d1ce2a83be00095b1.zip | |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'activesupport/lib')
| -rw-r--r-- | activesupport/lib/active_support/ordered_hash.rb | 4 | ||||
| -rw-r--r-- | activesupport/lib/active_support/values/time_zone.rb | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/ordered_hash.rb b/activesupport/lib/active_support/ordered_hash.rb index fed8094a24..33fd2a29b9 100644 --- a/activesupport/lib/active_support/ordered_hash.rb +++ b/activesupport/lib/active_support/ordered_hash.rb @@ -57,6 +57,10 @@ module ActiveSupport self end + def to_a + @keys.map { |key| [ key, self[key] ] } + end + def each_key @keys.each { |key| yield key } end diff --git a/activesupport/lib/active_support/values/time_zone.rb b/activesupport/lib/active_support/values/time_zone.rb index e2d759aa50..b37dae1c2a 100644 --- a/activesupport/lib/active_support/values/time_zone.rb +++ b/activesupport/lib/active_support/values/time_zone.rb @@ -92,7 +92,7 @@ module ActiveSupport "Bucharest" => "Europe/Bucharest", "Cairo" => "Africa/Cairo", "Helsinki" => "Europe/Helsinki", - "Kyev" => "Europe/Kiev", + "Kyiv" => "Europe/Kiev", "Riga" => "Europe/Riga", "Sofia" => "Europe/Sofia", "Tallinn" => "Europe/Tallinn", @@ -336,7 +336,7 @@ module ActiveSupport "Copenhagen", "Madrid", "Paris", "Amsterdam", "Berlin", "Bern", "Rome", "Stockholm", "Vienna", "West Central Africa" ], - [ 7_200, "Bucharest", "Cairo", "Helsinki", "Kyev", "Riga", "Sofia", + [ 7_200, "Bucharest", "Cairo", "Helsinki", "Kyiv", "Riga", "Sofia", "Tallinn", "Vilnius", "Athens", "Istanbul", "Minsk", "Jerusalem", "Harare", "Pretoria" ], [ 10_800, "Moscow", "St. Petersburg", "Volgograd", "Kuwait", "Riyadh", |