Parcourir la Source

L10n some times

Maarten van den Berg il y a 7 ans
Parent
commit
ab6b70a1b4
2 fichiers modifiés avec 10 ajouts et 5 suppressions
  1. 9 4
      app/views/activities/show.html.haml
  2. 1 1
      app/views/dashboard/home.html.haml

+ 9 - 4
app/views/activities/show.html.haml

31
             = t 'activities.attrs.when'
31
             = t 'activities.attrs.when'
32
 
32
 
33
           %td
33
           %td
34
-            = @activity.start
35
-            \-
36
-            = @activity.end
34
+            = l @activity.start, format: :long
35
+            - if @activity.end
36
+              \-
37
+              - if @activity.end.to_date == @activity.start.to_date
38
+                = l @activity.end, format: '%H:%M'
39
+              - else
40
+                = l @activity.end, format: :long
37
 
41
 
38
         %tr
42
         %tr
39
           %td
43
           %td
40
             = t 'activities.attrs.deadline'
44
             = t 'activities.attrs.deadline'
41
 
45
 
42
           %td
46
           %td
43
-            = @activity.deadline
47
+            - if @activity.deadline
48
+              = l @activity.deadline, format: :long
44
 
49
 
45
   - if @ownparticipant
50
   - if @ownparticipant
46
     .col-md-3
51
     .col-md-3

+ 1 - 1
app/views/dashboard/home.html.haml

32
                       %td
32
                       %td
33
                         = e.group.name
33
                         = e.group.name
34
                       %td
34
                       %td
35
-                        = e.start
35
+                        = l e.start, format: :long
36
                       %td
36
                       %td
37
                         = e.location
37
                         = e.location
38
                       %td
38
                       %td