diff options
| author | Jeremy Daer <jeremydaer@gmail.com> | 2016-04-19 22:03:29 -0700 |
|---|---|---|
| committer | Jeremy Daer <jeremydaer@gmail.com> | 2016-04-19 22:59:21 -0700 |
| commit | a0dcc95cd80c5546579fdc50294fdfefc289f41b (patch) | |
| tree | a40c2e754a51451cd025299c2c16a8195863582d /actionview | |
| parent | ff82d7001fb9a4239d9a52d6af4f6d5bb056cc23 (diff) | |
| parent | 318ee5413038fc33b302fcb4f41c146c8f10315f (diff) | |
| download | rails-a0dcc95cd80c5546579fdc50294fdfefc289f41b.tar.gz rails-a0dcc95cd80c5546579fdc50294fdfefc289f41b.tar.bz2 rails-a0dcc95cd80c5546579fdc50294fdfefc289f41b.zip | |
Merge pull request #20625 from Envek/add_country_zones_method
Add ActiveSupport::TimeZone.country_zones helper
Diffstat (limited to 'actionview')
| -rw-r--r-- | actionview/lib/action_view/helpers/form_options_helper.rb | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/actionview/lib/action_view/helpers/form_options_helper.rb b/actionview/lib/action_view/helpers/form_options_helper.rb index 430051379d..b277efd7b6 100644 --- a/actionview/lib/action_view/helpers/form_options_helper.rb +++ b/actionview/lib/action_view/helpers/form_options_helper.rb @@ -268,10 +268,11 @@ module ActionView # for more information.) # # You can also supply an array of ActiveSupport::TimeZone objects - # as +priority_zones+, so that they will be listed above the rest of the - # (long) list. (You can use ActiveSupport::TimeZone.us_zones as a convenience - # for obtaining a list of the US time zones, or a Regexp to select the zones - # of your choice) + # as +priority_zones+ so that they will be listed above the rest of the + # (long) list. You can use ActiveSupport::TimeZone.us_zones for a list + # of US time zones, ActiveSupport::TimeZone.country_zones(country_code) + # for another country's time zones, or a Regexp to select the zones of + # your choice. # # Finally, this method supports a <tt>:default</tt> option, which selects # a default ActiveSupport::TimeZone if the object's time zone is +nil+. |