Custom field date times now show year.

vinodkanneganti · Dec 5, 2012 · 9168f26 · 9168f26
1 parent c94c2a4
commit 9168f26
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/app/models/fields/field.rb b/app/models/fields/field.rb
@@ -103,7 +103,7 @@ def render(value)
     when 'date'
       value && value.strftime(I18n.t("date.formats.mmddyy"))
     when 'datetime'
-      value && value.strftime(I18n.t("time.formats.mmddhhss"))
+      value && value.strftime(I18n.t("time.formats.mmddyyyy_hhmm"))
     when 'check_boxes'
       value.select(&:present?).in_groups_of(2, false).map {|g| g.join(', ')}.join("<br />".html_safe) if Array === value
     else

diff --git a/config/locales/en-GB_fat_free_crm.yml b/config/locales/en-GB_fat_free_crm.yml
@@ -749,7 +749,7 @@ en-GB:
   time:
     formats:
       mmddhhss: "%e %b at %l:%M%p"
-      mmddyyyy_hhmm: "%Y-%m-%d %H:%M"
+      mmddyyyy_hhmm: "%e %b %Y at %l:%M%p"
 
   # will_paginate translations copied from 'en-US'
   #----------------------------------------------------------------------------

diff --git a/config/locales/en-US_fat_free_crm.yml b/config/locales/en-US_fat_free_crm.yml
@@ -768,7 +768,7 @@ en-US:
   time:
     formats:
       mmddhhss: "%b %e at %l:%M%p"
-      mmddyyyy_hhmm: "%m/%d/%Y %l:%M %p"
+      mmddyyyy_hhmm: "%e %b %Y at %l:%M%p"
 
   # will_paginate translations copied for 'en-US'
   #----------------------------------------------------------------------------