diff --git a/app/helpers/dates_helper.rb b/app/helpers/dates_helper.rb
index ec170ca..317bcaf 100644
--- a/app/helpers/dates_helper.rb
+++ b/app/helpers/dates_helper.rb
@@ -87,12 +87,12 @@ module DatesHelper
   end
 
   def pick_date(object, method, options = {}, html_options = {})
-      if GetText.locale.to_s == 'en'
-        order = [:month, :day, :year]
-      else
-        order = [:day, :month, :year]
-      end
-      date_select(object, method, html_options.merge(options.merge(:include_blank => true, :order => order, :use_month_names => MONTHS.map {|item| gettext(item)})))
+    if language == 'en'
+      order = [:month, :day, :year]
+    else
+      order = [:day, :month, :year]
+    end
+    date_select(object, method, html_options.merge(options.merge(:include_blank => true, :order => order, :use_month_names => MONTHS.map {|item| gettext(item)})))
   end
 
 end
diff --git a/test/unit/dates_helper_test.rb b/test/unit/dates_helper_test.rb
index 89e89d3..41d0140 100644
--- a/test/unit/dates_helper_test.rb
+++ b/test/unit/dates_helper_test.rb
@@ -105,24 +105,22 @@ class DatesHelperTest < Test::Unit::TestCase
     expects(:gettext).with('November').returns('November')
     expects(:gettext).with('December').returns('December')
 
+    expects(:language).returns('en')
+
     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")
 
     assert_equal 'KKKKKKKK', pick_date(:object, :method)
   end
 
   should 'order date in english like month day year' do
-    locale = mock
-    locale.expects(:to_s).returns('en')
-    GetText.stubs(:locale).returns(locale)
+    expects(:language).returns("en")
     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")
 
     assert_equal 'KKKKKKKK', pick_date(:object, :method)
   end
 
   should 'order date in other languages like day month year' do
-    locale = mock
-    locale.expects(:to_s).returns('pt_BR')
-    GetText.stubs(:locale).returns(locale)
+    expects(:language).returns('pt_BR')
     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")
 
     assert_equal 'KKKKKKKK', pick_date(:object, :method)
--
libgit2 0.21.2