Merge branch 'master' into handle_merge_conflicts

Gemfile

@@ -40,6 +40,10 @@ gem 'rolify'
 # to show flash messages from ajax requests
 gem 'unobtrusive_flash', '>=3'
 
+
+# Internationalizing gem , use gem according to version of your rails application
+gem 'rails-i18n', '~> 4.0.0' # For 4.0.x
+
 # as state machine
 gem 'transitions', :require => %w( transitions active_record/transitions )
 

Gemfile.lock

@@ -357,6 +357,9 @@ GEM
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
+    rails-i18n (4.0.8)
+      i18n (~> 0.7)
+      railties (~> 4.0)
     rails-observers (0.1.2)
       activemodel (~> 4.0)
     railties (4.2.5.2)
@@ -558,6 +561,7 @@ DEPENDENCIES
   rails-assets-to-markdown!
   rails-assets-trianglify!
   rails-assets-waypoints!
+  rails-i18n (~> 4.0.0)
   rails-observers
   rdoc-generator-fivefish
   redcarpet
@@ -579,3 +583,6 @@ DEPENDENCIES
   web-console (~> 2.0)
   webmock
   whenever
+
+BUNDLED WITH
+   1.11.2

app/serializers/event_serializer.rb

@@ -5,7 +5,7 @@ class EventSerializer < ActiveModel::Serializer
 
   def date
     t = object.start_time
-    t.blank? ? '' : %{ #{t.time.strftime('%Y-%m-%dT%H:%M:%S')}#{t.formatted_offset(false)} }
+    t.blank? ? '' : %{ #{l t , format: :short}#{t.formatted_offset(false)} }
   end
 
   def speaker_ids

config/locales/en.yml

@@ -3,3 +3,6 @@
 
 en:
   hello: "Hello world"
+  time:
+    formats:
+      short: "%Y-%m-%dT%H:%M:%S"