ActionItem1050: better time formatting

Antonio Terceiro
1 parent 1bcc750d
Showing 2 changed files with 4 additions and 4 deletions Show diff stats
app/helpers/dates_helper.rb
test/unit/dates_helper_test.rb
@@ -35,7 +35,7 @@ module DatesHelper
   # formats a datetime for displaying. 
   def show_time(time)
     if time
-      time.strftime(_('%d %B %Y, %H:%M'))
+      _('%{day} %{month} %{year}, %{hour}:%{minutes}') % { :year => time.year, :month => month_name(time.month), :day => time.day, :hour => time.hour, :minutes => time.min }
     else
       ''
     end
@@ -131,9 +131,9 @@ class DatesHelperTest &lt; Test::Unit::TestCase
   end
   should 'translate time' do
-    time = mock
-    expects(:_).with('%d %B %Y, %H:%M').returns('the time')
-    time.expects(:strftime).with('the time').returns('translated time')
+    time = Time.parse('25 May 2009, 12:47')
+    expects(:_).with('%{day} %{month} %{year}, %{hour}:%{minutes}').returns('translated time')
+    stubs(:_).with('May').returns("Maio")
     assert_equal 'translated time', show_time(time)
   end
	@@ -35,7 +35,7 @@ module DatesHelper		@@ -35,7 +35,7 @@ module DatesHelper
35	# formats a datetime for displaying.	35	# formats a datetime for displaying.
36	def show_time(time)	36	def show_time(time)
37	if time	37	if time
38	- time.strftime(_('%d %B %Y, %H:%M'))	38	+ _('%{day} %{month} %{year}, %{hour}:%{minutes}') % { :year => time.year, :month => month_name(time.month), :day => time.day, :hour => time.hour, :minutes => time.min }
39	else	39	else
40	''	40	''
41	end	41	end