From fdfb316bedc371028c3f637b77b9e1a277ea26d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20FRERE?= Date: Sat, 11 May 2013 14:13:23 +0200 Subject: Uses I18n.localize instead of strftime for posts#archives title and no_articles message --- app/controllers/refinery/blog/posts_controller.rb | 12 ++++++------ app/views/refinery/blog/posts/archive.html.erb | 6 +++--- 2 files changed, 9 insertions(+), 9 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 diff --git a/app/views/refinery/blog/posts/archive.html.erb b/app/views/refinery/blog/posts/archive.html.erb index 31b5c1e..86a648c 100644 --- a/app/views/refinery/blog/posts/archive.html.erb +++ b/app/views/refinery/blog/posts/archive.html.erb @@ -1,13 +1,13 @@ -<% content_for :title, "#{t('.blog_archive_for', :date => @archive_date.strftime('%B %Y'))}" %> +<% content_for :title, "#{t('.blog_archive_for', :date => @date_title)}" %> <% content_for :body do %> -

<%= t('.blog_archive_for', :date => @archive_date.strftime('%B %Y')) %>

+

<%= t('.blog_archive_for', :date => @date_title) %>

<% if @posts.any? %>
<%= render :partial => "/refinery/blog/shared/post", :collection => @posts %>
<% else %> -

<%= t('.no_blog_articles_posted', :date => @archive_date.strftime('%B %Y')) %>

+

<%= t('.no_blog_articles_posted', :date => @date_title) %>

<% end %> <% end %> -- cgit v1.2.3