diff options
author | Philip Arndt <parndt@gmail.com> | 2013-05-12 07:56:06 -0700 |
---|---|---|
committer | Philip Arndt <parndt@gmail.com> | 2013-05-12 07:56:06 -0700 |
commit | d29fb394748fab37fffda7fc0cfd0f2aa400ae28 (patch) | |
tree | 5cddcdc32d378cb82f1f5a035a2a57e0c611b253 /app/controllers/refinery/blog | |
parent | 8a41b59d6e6d0a44f2db7d4afba80f96dc342bed (diff) | |
parent | 04f7aa2ee2b976d80b1b4c9a6d2df6fdb7caacdd (diff) | |
download | refinerycms-blog-d29fb394748fab37fffda7fc0cfd0f2aa400ae28.tar.gz refinerycms-blog-d29fb394748fab37fffda7fc0cfd0f2aa400ae28.tar.bz2 refinerycms-blog-d29fb394748fab37fffda7fc0cfd0f2aa400ae28.zip |
Merge pull request #328 from jerefrer/master
Uses I18n.localize instead of strftime for posts#archives title and no_articles message (plus small fr locale fix)
Diffstat (limited to 'app/controllers/refinery/blog')
-rw-r--r-- | app/controllers/refinery/blog/posts_controller.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/app/controllers/refinery/blog/posts_controller.rb b/app/controllers/refinery/blog/posts_controller.rb index b5caa33..999b49a 100644 --- a/app/controllers/refinery/blog/posts_controller.rb +++ b/app/controllers/refinery/blog/posts_controller.rb @@ -56,14 +56,14 @@ module Refinery def archive if params[:month].present? date = "#{params[:month]}/#{params[:year]}" - @archive_date = Time.parse(date) - @date_title = @archive_date.strftime('%B %Y') - @posts = Post.live.by_month(@archive_date).page(params[:page]) + archive_date = Time.parse(date) + @date_title = ::I18n.l(archive_date, :format => '%B %Y') + @posts = Post.live.by_month(archive_date).page(params[:page]) else date = "01/#{params[:year]}" - @archive_date = Time.parse(date) - @date_title = @archive_date.strftime('%Y') - @posts = Post.live.by_year(@archive_date).page(params[:page]) + archive_date = Time.parse(date) + @date_title = ::I18n.l(archive_date, :format => '%Y') + @posts = Post.live.by_year(archive_date).page(params[:page]) end respond_with (@posts) end |