diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2013-01-19 11:20:50 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2013-01-19 11:20:50 -0800 |
| commit | b718998f3e8e6f3d01ad138e40f08fbcc3736285 (patch) | |
| tree | 14985a61d4910a0d1b8befec0cd8de5a0e3416a8 /actionpack/lib/action_view | |
| parent | 782ed888dcc5154c1222028d5e9d49f7ae115728 (diff) | |
| parent | 60289ab659a12d1297b9f94e12cd1a9b06fd8652 (diff) | |
| download | rails-b718998f3e8e6f3d01ad138e40f08fbcc3736285.tar.gz rails-b718998f3e8e6f3d01ad138e40f08fbcc3736285.tar.bz2 rails-b718998f3e8e6f3d01ad138e40f08fbcc3736285.zip | |
Merge pull request #8978 from chrismcg/remove_i18n_symbol_dependency
Remove i18n symbol dependency
Diffstat (limited to 'actionpack/lib/action_view')
| -rw-r--r-- | actionpack/lib/action_view/helpers/date_helper.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/lib/action_view/helpers/date_helper.rb b/actionpack/lib/action_view/helpers/date_helper.rb index cf978d8e83..10748aacf4 100644 --- a/actionpack/lib/action_view/helpers/date_helper.rb +++ b/actionpack/lib/action_view/helpers/date_helper.rb @@ -880,6 +880,7 @@ module ActionView def translated_date_order date_order = I18n.translate(:'date.order', :locale => @options[:locale], :default => []) + date_order = date_order.map { |element| element.to_sym } forbidden_elements = date_order - [:year, :month, :day] if forbidden_elements.any? |