Download as
Browse Code »

Commit 5e1975c666d75074c959824214b3ad6a17fe46f4

Authored by Daniela Feitosa
1 parent 84d46551
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

Added locale on caches 

- Environment homepage cache

(ActionItem2336)
Showing 3 changed files with 6 additions and 4 deletions   Show diff stats
app/controllers/public/home_controller.rb
  Diff comments   View file @5e1975c
@@ -4,7 +4,7 @@ class HomeController < PublicController @@ -4,7 +4,7 @@ class HomeController < PublicController
4 @has_news = false 4 @has_news = false
5 if environment.enabled?('use_portal_community') && environment.portal_community 5 if environment.enabled?('use_portal_community') && environment.portal_community
6 @has_news = true 6 @has_news = true
7 - @news_cache_key = environment.portal_news_cache_key 7 + @news_cache_key = environment.portal_news_cache_key(FastGettext.locale)
8 if !read_fragment(@news_cache_key) 8 if !read_fragment(@news_cache_key)
9 portal_community = environment.portal_community 9 portal_community = environment.portal_community
10 @highlighted_news = portal_community.news(2, true) 10 @highlighted_news = portal_community.news(2, true)
app/models/environment.rb
  Diff comments   View file @5e1975c
@@ -696,8 +696,8 @@ class Environment < ActiveRecord::Base @@ -696,8 +696,8 @@ class Environment < ActiveRecord::Base
696 settings[:portal_folders] = folders ? folders.map(&:id) : nil 696 settings[:portal_folders] = folders ? folders.map(&:id) : nil
697 end 697 end
698 698
699 - def portal_news_cache_key  
700 - "home-page-news/#{cache_key}" 699 + def portal_news_cache_key(language='en')
  700 + "home-page-news/#{cache_key}-#{language}"
701 end 701 end
702 702
703 def notification_emails 703 def notification_emails
app/sweepers/article_sweeper.rb
  Diff comments   View file @5e1975c
@@ -20,7 +20,9 @@ protected @@ -20,7 +20,9 @@ protected
20 BlockSweeper.expire_blocks(blocks) 20 BlockSweeper.expire_blocks(blocks)
21 env = article.profile.environment 21 env = article.profile.environment
22 if env && (env.portal_community == article.profile) 22 if env && (env.portal_community == article.profile)
23 - expire_fragment(env.portal_news_cache_key) 23 + Noosfero.locales.keys.each do |locale|
  24 + expire_fragment(env.portal_news_cache_key(locale))
  25 + end
24 end 26 end
25 end 27 end
26 28