diff options
| author | Philip Arndt <parndt@gmail.com> | 2011-09-04 15:28:07 -0700 |
|---|---|---|
| committer | Philip Arndt <parndt@gmail.com> | 2011-09-04 15:28:07 -0700 |
| commit | f584651b5844896586dcbca859c5108110407b77 (patch) | |
| tree | d114279b5941e210d418e454777a344176c5d7e4 /app | |
| parent | 40be4f71ee425ee55ecedea96ff2b0dc510d71db (diff) | |
| parent | b9c44d851e806f812c548dc0de43d3002c2d88a5 (diff) | |
| download | refinerycms-blog-f584651b5844896586dcbca859c5108110407b77.tar.gz refinerycms-blog-f584651b5844896586dcbca859c5108110407b77.tar.bz2 refinerycms-blog-f584651b5844896586dcbca859c5108110407b77.zip | |
Merge pull request #127 from enmasse-entertainment/more-comment-fixes
More comment fixes
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/refinery/blog/posts_controller.rb | 5 | ||||
| -rw-r--r-- | app/sweepers/refinery/blog_sweeper.rb | 4 | ||||
| -rw-r--r-- | app/views/refinery/blog/posts/_comment.html.erb | 4 | ||||
| -rw-r--r-- | app/views/refinery/blog/posts/_comments.html.erb | 2 |
4 files changed, 7 insertions, 8 deletions
diff --git a/app/controllers/refinery/blog/posts_controller.rb b/app/controllers/refinery/blog/posts_controller.rb index aa7d45e..3041439 100644 --- a/app/controllers/refinery/blog/posts_controller.rb +++ b/app/controllers/refinery/blog/posts_controller.rb @@ -3,7 +3,6 @@ module Refinery class PostsController < BlogController caches_page :index - # cache_sweeper Refinery::BlogSweeper, :only => [:comment] before_filter :find_all_blog_posts, :except => [:archive] before_filter :find_blog_post, :only => [:show, :comment, :update_nav] @@ -40,10 +39,10 @@ module Refinery end if Refinery::BlogComment::Moderation.enabled? - flash[:notice] = t('thank_you_moderated', :scope => 'blog.posts.comments') + flash[:notice] = t('thank_you_moderated', :scope => 'refinery.blog.posts.comments') redirect_to main_app.blog_post_url(params[:id]) else - flash[:notice] = t('thank_you', :scope => 'blog.posts.comments') + flash[:notice] = t('thank_you', :scope => 'refinery.blog.posts.comments') redirect_to main_app.blog_post_url(params[:id], :anchor => "comment-#{@blog_comment.to_param}") end diff --git a/app/sweepers/refinery/blog_sweeper.rb b/app/sweepers/refinery/blog_sweeper.rb index adf97fc..57a98d8 100644 --- a/app/sweepers/refinery/blog_sweeper.rb +++ b/app/sweepers/refinery/blog_sweeper.rb @@ -17,8 +17,8 @@ module Refinery private def expire_cache_for(record) - expire_page '/blog' - expire_page '/blog/feed.rss' + expire_page main_app.blog_root_path + expire_page main_app.blog_rss_feed_path end end diff --git a/app/views/refinery/blog/posts/_comment.html.erb b/app/views/refinery/blog/posts/_comment.html.erb index 5503826..659f433 100644 --- a/app/views/refinery/blog/posts/_comment.html.erb +++ b/app/views/refinery/blog/posts/_comment.html.erb @@ -3,8 +3,8 @@ <%= simple_format auto_link(comment.message.to_s) %> <footer class='blog_comment_author'> <p> - <%= t('by', :scope => 'blog.posts.comments', :who => comment.name) %>, - <%= t('time_ago', :scope => 'blog.posts.comments', :time => time_ago_in_words(comment.created_at)) %> + <%= t('by', :scope => 'refinery.blog.posts.comments', :who => comment.name) %>, + <%= t('time_ago', :scope => 'refinery.blog.posts.comments', :time => time_ago_in_words(comment.created_at)) %> </p> </footer> </article> diff --git a/app/views/refinery/blog/posts/_comments.html.erb b/app/views/refinery/blog/posts/_comments.html.erb index b177389..9bc0a13 100644 --- a/app/views/refinery/blog/posts/_comments.html.erb +++ b/app/views/refinery/blog/posts/_comments.html.erb @@ -34,7 +34,7 @@ <%= f.text_area :message, :rows => 6 %> </div> <div class='field form-actions'> - <%= f.submit t('.submit') %> + <%= f.submit t('submit', :scope => 'refinery.blog.posts.show') %> </div> <% end %> </aside> |