Download as
Browse Code »

Commit c52de943d0b1b7a11b1dcbe6cd2a7eeaa0f6e8e5

Authored by Rodrigo Souto
Committed by Daniela Feitosa
1 parent 6d7a6999
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

Fixing crash on event with armenian language 

(ActionItem1846)
Showing 2 changed files with 14 additions and 2 deletions   Show diff stats
app/helpers/dates_helper.rb
  Diff comments   View file @c52de94
@@ -46,7 +46,7 @@ module DatesHelper @@ -46,7 +46,7 @@ module DatesHelper
46 if (date1 == date2) || (date2.nil?) 46 if (date1 == date2) || (date2.nil?)
47 show_date(date1) 47 show_date(date1)
48 else 48 else
49 - _('from %s to %s') % [show_date(date1), show_date(date2)] 49 + _('from %{date1} to %{date2}') % {:date1 => show_date(date1), :date2 => show_date(date2)}
50 end 50 end
51 end 51 end
52 52
test/unit/dates_helper_test.rb
  Diff comments   View file @c52de94
@@ -20,7 +20,7 @@ class DatesHelperTest < Test::Unit::TestCase @@ -20,7 +20,7 @@ class DatesHelperTest < Test::Unit::TestCase
20 expects(:show_date).with(date1).returns('XXX') 20 expects(:show_date).with(date1).returns('XXX')
21 date2 = mock 21 date2 = mock
22 expects(:show_date).with(date2).returns('YYY') 22 expects(:show_date).with(date2).returns('YYY')
23 - expects(:_).with('from %s to %s').returns('from %s to %s') 23 + expects(:_).with('from %{date1} to %{date2}').returns('from %{date1} to %{date2}')
24 assert_equal 'from XXX to YYY', show_period(date1, date2) 24 assert_equal 'from XXX to YYY', show_period(date1, date2)
25 end 25 end
26 26
@@ -36,6 +36,18 @@ class DatesHelperTest < Test::Unit::TestCase @@ -36,6 +36,18 @@ class DatesHelperTest < Test::Unit::TestCase
36 assert_equal 'XXX', show_period(date1) 36 assert_equal 'XXX', show_period(date1)
37 end 37 end
38 38
  39 + should 'not crash with events that have start_date and end_date' do
  40 + FastGettext.default_text_domain = 'noosferofull'
  41 + assert_nothing_raised do
  42 + Noosfero.locales.keys.each do |key|
  43 + Noosfero.with_locale(key) do
  44 + show_period(Date.today, Date.tomorrow)
  45 + end
  46 + end
  47 + end
  48 + FastGettext.default_text_domain = 'noosferotest'
  49 + end
  50 +
39 should 'show day of week' do 51 should 'show day of week' do
40 expects(:_).with("Sunday").returns("Domingo") 52 expects(:_).with("Sunday").returns("Domingo")
41 date = mock 53 date = mock