diff options
| author | Andrew White <pixeltrix@users.noreply.github.com> | 2017-04-17 16:24:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-17 16:24:28 +0100 |
| commit | 32a1c30f3893286ba048c3b72d5d4bcc8f520311 (patch) | |
| tree | dc3f247a0ff1e3f31d56affe6633d3494c0fa867 | |
| parent | f53b3af8a86785d27b95780e99ea80713d640f8b (diff) | |
| parent | 5b32746cc0aa11b78570f6dadba63624ee589b78 (diff) | |
| download | rails-32a1c30f3893286ba048c3b72d5d4bcc8f520311.tar.gz rails-32a1c30f3893286ba048c3b72d5d4bcc8f520311.tar.bz2 rails-32a1c30f3893286ba048c3b72d5d4bcc8f520311.zip | |
Merge pull request #28775 from doughsay/master
Add Puerto Rico support to ActiveSupport::TimeZone
| -rw-r--r-- | activesupport/lib/active_support/values/time_zone.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/values/time_zone.rb b/activesupport/lib/active_support/values/time_zone.rb index ce5207546d..96a541a4ef 100644 --- a/activesupport/lib/active_support/values/time_zone.rb +++ b/activesupport/lib/active_support/values/time_zone.rb @@ -6,7 +6,7 @@ module ActiveSupport # The TimeZone class serves as a wrapper around TZInfo::Timezone instances. # It allows us to do the following: # - # * Limit the set of zones provided by TZInfo to a meaningful subset of 146 + # * Limit the set of zones provided by TZInfo to a meaningful subset of 134 # zones. # * Retrieve and display zones with a friendlier name # (e.g., "Eastern Time (US & Canada)" instead of "America/New_York"). @@ -59,6 +59,7 @@ module ActiveSupport "Buenos Aires" => "America/Argentina/Buenos_Aires", "Montevideo" => "America/Montevideo", "Georgetown" => "America/Guyana", + "Puerto Rico" => "America/Puerto_Rico", "Greenland" => "America/Godthab", "Mid-Atlantic" => "Atlantic/South_Georgia", "Azores" => "Atlantic/Azores", |