diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2010-02-24 22:28:40 -0200 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2010-02-25 08:31:02 -0800 |
| commit | f76eaa4b7c44e5793bb73f10f47989cff6be6ea3 (patch) | |
| tree | d362f1c09fac6fd9c6c80f8b8f1d96482884c01c /actionpack/lib/action_view | |
| parent | df85ab41c1ff6992dd462a0e63dac9dcdcee0348 (diff) | |
| download | rails-f76eaa4b7c44e5793bb73f10f47989cff6be6ea3.tar.gz rails-f76eaa4b7c44e5793bb73f10f47989cff6be6ea3.tar.bz2 rails-f76eaa4b7c44e5793bb73f10f47989cff6be6ea3.zip | |
add time_separator for minutes only if minutes aren't hidden
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
Diffstat (limited to 'actionpack/lib/action_view')
| -rw-r--r-- | actionpack/lib/action_view/helpers/date_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/date_helper.rb b/actionpack/lib/action_view/helpers/date_helper.rb index c2810b3190..89ac682c18 100644 --- a/actionpack/lib/action_view/helpers/date_helper.rb +++ b/actionpack/lib/action_view/helpers/date_helper.rb @@ -907,7 +907,7 @@ module ActionView when :hour (@options[:discard_year] && @options[:discard_day]) ? "" : @options[:datetime_separator] when :minute - @options[:time_separator] + @options[:discard_minute] ? "" : @options[:time_separator] when :second @options[:include_seconds] ? @options[:time_separator] : "" end |