Download as
Browse Code »

Commit 19a6d1afe8cc46b667e4bf0a6ac467b7a884959c

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

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,12 +87,12 @@ module DatesHelper
87 end 87 end
88 88
89 def pick_date(object, method, options = {}, html_options = {}) 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 end 96 end
97 97
98 end 98 end
test/unit/dates_helper_test.rb
  Diff comments   View file @19a6d1a
@@ -105,24 +105,22 @@ class DatesHelperTest < Test::Unit::TestCase @@ -105,24 +105,22 @@ class DatesHelperTest < Test::Unit::TestCase
105 expects(:gettext).with('November').returns('November') 105 expects(:gettext).with('November').returns('November')
106 expects(:gettext).with('December').returns('December') 106 expects(:gettext).with('December').returns('December')
107 107
  108 + expects(:language).returns('en')
  109 +
108 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") 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 assert_equal 'KKKKKKKK', pick_date(:object, :method) 112 assert_equal 'KKKKKKKK', pick_date(:object, :method)
111 end 113 end
112 114
113 should 'order date in english like month day year' do 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 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") 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 assert_equal 'KKKKKKKK', pick_date(:object, :method) 119 assert_equal 'KKKKKKKK', pick_date(:object, :method)
120 end 120 end
121 121
122 should 'order date in other languages like day month year' do 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 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") 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 assert_equal 'KKKKKKKK', pick_date(:object, :method) 126 assert_equal 'KKKKKKKK', pick_date(:object, :method)