Download as
Browse Code »

Commit a29cb0b0cba752db36f8472310153840943523fa

Authored by AntonioTerceiro
1 parent 87ca5e8a
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

ActionItem26: displaying periods 


git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1879 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 2 changed files with 30 additions and 0 deletions   Show diff stats
app/helpers/application_helper.rb
  Diff comments   View file @a29cb0b
@@ -475,6 +475,14 @@ module ApplicationHelper @@ -475,6 +475,14 @@ module ApplicationHelper
475 end 475 end
476 end 476 end
477 477
  478 + def show_period(date1, date2 = nil)
  479 + if (date1 == date2) || (date2.nil?)
  480 + show_date(date1)
  481 + else
  482 + _('from %s to %s') % [show_date(date1), show_date(date2)]
  483 + end
  484 + end
  485 +
478 def gravatar_url_for(email, options = {}) 486 def gravatar_url_for(email, options = {})
479 # Ta dando erro de roteamento 487 # Ta dando erro de roteamento
480 url_for( { :gravatar_id => Digest::MD5.hexdigest(email), 488 url_for( { :gravatar_id => Digest::MD5.hexdigest(email),
test/unit/application_helper_test.rb
  Diff comments   View file @a29cb0b
@@ -100,6 +100,28 @@ class ApplicationHelperTest < Test::Unit::TestCase @@ -100,6 +100,28 @@ class ApplicationHelperTest < Test::Unit::TestCase
100 assert_not_nil theme_javascript 100 assert_not_nil theme_javascript
101 end 101 end
102 102
  103 + should 'generate period with two dates' do
  104 + date1 = mock
  105 + expects(:show_date).with(date1).returns('XXX')
  106 + date2 = mock
  107 + expects(:show_date).with(date2).returns('YYY')
  108 + expects(:_).with('from %s to %s').returns('from %s to %s')
  109 + assert_equal 'from XXX to YYY', show_period(date1, date2)
  110 + end
  111 +
  112 + should 'generate period with two equal dates' do
  113 + date1 = mock
  114 + expects(:show_date).with(date1).returns('XXX')
  115 + assert_equal 'XXX', show_period(date1, date1)
  116 + end
  117 +
  118 + should 'generate period with one date only' do
  119 + date1 = mock
  120 + expects(:show_date).with(date1).returns('XXX')
  121 + assert_equal 'XXX', show_period(date1)
  122 + end
  123 +
  124 +
103 protected 125 protected
104 126
105 def content_tag(tag, content, options) 127 def content_tag(tag, content, options)