gunghogeoduck/osem-fcy
1
0
Fork 0
mirror of https://github.com/openSUSE/osem.git synced 2026-08-13 19:54:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #904 from Shriyanshagro/master

Browse source 
Made use of Rails I18n data format in EventSerializer #598
This commit is contained in:
Henne Vogelsang 2016-03-30 17:31:42 +02:00
commit 6aedf2b03d
4 changed files with 14 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Gemfile
View file

@ -21,6 +21,9 @@ gem 'rails-observers'
# for tracking data changes # for tracking data changes
gem 'paper_trail' gem 'paper_trail'
# Internationalizing gem , use gem according to version of your rails application
gem 'rails-i18n', '~> 4.0.0' # For 4.0.x
# as authentification framework # as authentification framework
gem 'devise' gem 'devise'
gem 'devise_ichain_authenticatable' gem 'devise_ichain_authenticatable'

7
Gemfile.lock
View file

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

2
app/serializers/event_serializer.rb
View file

@ -5,7 +5,7 @@ class EventSerializer < ActiveModel::Serializer
def date def date
t = object.start_time 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 end
def speaker_ids def speaker_ids

3
config/locales/en.yml
View file

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