Download as
Browse Code »

Commit 6820a3f580c1a2e435eafa29541e9d285901bab9

Authored by Antonio Terceiro
1 parent 1bcc750d
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

ActionItem1050: better time formatting

Showing 2 changed files with 4 additions and 4 deletions   Show diff stats
app/helpers/dates_helper.rb
  Diff comments   View file @6820a3f
... ... @@ -35,7 +35,7 @@ module DatesHelper
35 35 # formats a datetime for displaying.
36 36 def show_time(time)
37 37 if time
38   - time.strftime(_('%d %B %Y, %H:%M'))
  38 + _('%{day} %{month} %{year}, %{hour}:%{minutes}') % { :year => time.year, :month => month_name(time.month), :day => time.day, :hour => time.hour, :minutes => time.min }
39 39 else
40 40 ''
41 41 end
... ...
test/unit/dates_helper_test.rb
  Diff comments   View file @6820a3f
... ... @@ -131,9 +131,9 @@ class DatesHelperTest < Test::Unit::TestCase
131 131 end
132 132  
133 133 should 'translate time' do
134   - time = mock
135   - expects(:_).with('%d %B %Y, %H:%M').returns('the time')
136   - time.expects(:strftime).with('the time').returns('translated time')
  134 + time = Time.parse('25 May 2009, 12:47')
  135 + expects(:_).with('%{day} %{month} %{year}, %{hour}:%{minutes}').returns('translated time')
  136 + stubs(:_).with('May').returns("Maio")
137 137 assert_equal 'translated time', show_time(time)
138 138 end
139 139  
... ...