Download as
Browse Code »

Commit 72d99983a3a8d6b333d24adfbc4d2ac9b4989b97

Authored by Daniela Feitosa
Committed by Antonio Terceiro
1 parent 1a26c326
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Time of comments now display the left zero of minutes 

(ActionItem1691)
Showing 2 changed files with 5 additions and 1 deletions   Show diff stats
app/helpers/dates_helper.rb
  Diff comments   View file @72d9998
... ... @@ -36,7 +36,7 @@ module DatesHelper
36 36 # formats a datetime for displaying.
37 37 def show_time(time)
38 38 if time
39   - _('%{day} %{month} %{year}, %{hour}:%{minutes}') % { :year => time.year, :month => month_name(time.month), :day => time.day, :hour => time.hour, :minutes => time.min }
  39 + _('%{day} %{month} %{year}, %{hour}:%{minutes}') % { :year => time.year, :month => month_name(time.month), :day => time.day, :hour => time.hour, :minutes => time.strftime("%M") }
40 40 else
41 41 ''
42 42 end
... ...
test/unit/dates_helper_test.rb
  Diff comments   View file @72d9998
... ... @@ -148,6 +148,10 @@ class DatesHelperTest < Test::Unit::TestCase
148 148 assert_equal '22 November 2008, 15:34', show_time(Time.mktime(2008, 11, 22, 15, 34, 0, 0))
149 149 end
150 150  
  151 + should 'format time with 2 digits minutes' do
  152 + assert_equal '22 November 2008, 15:04', show_time(Time.mktime(2008, 11, 22, 15, 04, 0, 0))
  153 + end
  154 +
151 155 should 'translate time' do
152 156 time = Time.parse('25 May 2009, 12:47')
153 157 expects(:_).with('%{day} %{month} %{year}, %{hour}:%{minutes}').returns('translated time')
... ...