Download as
Browse Code »

Commit 19a6d1afe8cc46b667e4bf0a6ac467b7a884959c

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

ActionItem916: Using own language method

Showing 2 changed files with 10 additions and 12 deletions   Show diff stats
app/helpers/dates_helper.rb
  Diff comments   View file @19a6d1a
... ... @@ -87,12 +87,12 @@ module DatesHelper
87 87 end
88 88  
89 89 def pick_date(object, method, options = {}, html_options = {})
90   - if GetText.locale.to_s == 'en'
91   - order = [:month, :day, :year]
92   - else
93   - order = [:day, :month, :year]
94   - end
95   - date_select(object, method, html_options.merge(options.merge(:include_blank => true, :order => order, :use_month_names => MONTHS.map {|item| gettext(item)})))
  90 + if language == 'en'
  91 + order = [:month, :day, :year]
  92 + else
  93 + order = [:day, :month, :year]
  94 + end
  95 + date_select(object, method, html_options.merge(options.merge(:include_blank => true, :order => order, :use_month_names => MONTHS.map {|item| gettext(item)})))
96 96 end
97 97  
98 98 end
... ...
test/unit/dates_helper_test.rb
  Diff comments   View file @19a6d1a
... ... @@ -105,24 +105,22 @@ class DatesHelperTest < Test::Unit::TestCase
105 105 expects(:gettext).with('November').returns('November')
106 106 expects(:gettext).with('December').returns('December')
107 107  
  108 + expects(:language).returns('en')
  109 +
108 110 expects(:date_select).with(:object, :method, { :include_blank => true, :order => [:month, :day, :year], :use_month_names => ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December']}).returns("KKKKKKKK")
109 111  
110 112 assert_equal 'KKKKKKKK', pick_date(:object, :method)
111 113 end
112 114  
113 115 should 'order date in english like month day year' do
114   - locale = mock
115   - locale.expects(:to_s).returns('en')
116   - GetText.stubs(:locale).returns(locale)
  116 + expects(:language).returns("en")
117 117 expects(:date_select).with(:object, :method, { :include_blank => true, :order => [:month, :day, :year], :use_month_names => ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December']}).returns("KKKKKKKK")
118 118  
119 119 assert_equal 'KKKKKKKK', pick_date(:object, :method)
120 120 end
121 121  
122 122 should 'order date in other languages like day month year' do
123   - locale = mock
124   - locale.expects(:to_s).returns('pt_BR')
125   - GetText.stubs(:locale).returns(locale)
  123 + expects(:language).returns('pt_BR')
126 124 expects(:date_select).with(:object, :method, { :include_blank => true, :order => [:day, :month, :year], :use_month_names => ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December']}).returns("KKKKKKKK")
127 125  
128 126 assert_equal 'KKKKKKKK', pick_date(:object, :method)
... ...