Merge branch 'master' into staging

Victor Costa
2 parents b76c20a5 baa2faf8
Showing 6 changed files with 20 additions and 14 deletions Show diff stats
app/helpers/application_helper.rb
app/models/block.rb
plugins/event/lib/event_plugin/event_block.rb
plugins/organization_ratings/po/pt/organization_ratings.po
plugins/site_tour/po/pt/site_tour.po
po/pt/noosfero.po
@@ -1244,7 +1244,7 @@ module ApplicationHelper
   end
   def cache_timeout(key, timeout, &block)
-    cache(key, { :expires_in => timeout }, &block)
+    cache(key, { :expires_in => timeout, :skip_digest => true }, &block)
   end
   def is_cache_expired?(key)
@@ -235,7 +235,7 @@ class Block &lt; ActiveRecord::Base
   alias :active_record_cache_key :cache_key
   def cache_key(language='en', user=nil)
-    active_record_cache_key+'-'+language
+    active_record_cache_key + '-' + language
   end
   def timeout
@@ -81,4 +81,8 @@ class EventPlugin::EventBlock &lt; Block
     content_tag(:span, date.year.to_s, :class => 'year')
   end
+  def self.expire_on
+      { :profile => [:article], :environment => [:article] }
+  end
+
 end
@@ -7,8 +7,8 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: 1.3~rc2-1-ga15645d\n"
 "POT-Creation-Date: 2015-10-30 16:35-0300\n"
-"PO-Revision-Date: 2016-01-21 15:50+0000\n"
-"Last-Translator: Dylan Guedes <djmgguedes@gmail.com>\n"
+"PO-Revision-Date: 2016-02-18 14:44+0000\n"
+"Last-Translator: Eduardo Vital <vitaldu@gmail.com>\n"
 "Language-Team: Portuguese <https://hosted.weblate.org/projects/noosfero"
 "/plugin-organization-ratings/pt/>\n"
 "Language: pt\n"
@@ -261,7 +261,7 @@ msgstr &quot;para esta %s.&quot;
 #: plugins/organization_ratings/views/organization_ratings_plugin_profile/_new_rating_fields.html.erb:70
 msgid "Hi, %s! The administrators set the minimum time of"
-msgstr "Olá, %s! Os administradores configuraram o tempo mínimo de "
+msgstr "Olá, %s! Os administradores configuraram o tempo mínimo de"
 #: plugins/organization_ratings/views/organization_ratings_plugin_profile/_new_rating_fields.html.erb:71
 msgid "%d hour(s)"
@@ -2,14 +2,16 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: 1.3~rc2-1-ga15645d\n"
 "POT-Creation-Date: 2015-10-30 16:35-0300\n"
-"PO-Revision-Date: 2015-02-03 17:27-0300\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"PO-Revision-Date: 2016-02-18 14:44+0000\n"
+"Last-Translator: Eduardo Vital <vitaldu@gmail.com>\n"
+"Language-Team: Portuguese <https://hosted.weblate.org/projects/noosfero"
+"/plugin-site-tour/pt/>\n"
+"Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 2.5-dev\n"
 #: plugins/site_tour/lib/site_tour_plugin/tour_block.rb:3
 msgid "Click to start tour!"
@@ -88,7 +90,7 @@ msgstr &quot;Próximo&quot;
 #: plugins/site_tour/views/tour_actions.html.erb:17
 msgid "Back"
-msgstr "Anterior"
+msgstr "Voltar"
 #: plugins/site_tour/views/tour_actions.html.erb:18
 msgid "Skip"
@@ -13,8 +13,8 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: 1.3~rc2-8-g01ea9f7\n"
 "POT-Creation-Date: 2015-11-04 12:36-0300\n"
-"PO-Revision-Date: 2016-01-21 16:56+0000\n"
-"Last-Translator: Dylan Guedes <djmgguedes@gmail.com>\n"
+"PO-Revision-Date: 2016-02-18 14:44+0000\n"
+"Last-Translator: Eduardo Vital <vitaldu@gmail.com>\n"
 "Language-Team: Portuguese "
 "<https://hosted.weblate.org/projects/noosfero/noosfero/pt/>\n"
 "Language: pt\n"
@@ -9262,7 +9262,7 @@ msgstr &quot;Fãs de %s&quot;
 #: app/views/profile/_create_article.html.erb:12
 msgid "See more"
-msgstr "Ver mais"
+msgstr "Veja mais"
 #: app/views/profile/index.html.erb:32
 msgid "Network"
	@@ -1244,7 +1244,7 @@ module ApplicationHelper		@@ -1244,7 +1244,7 @@ module ApplicationHelper
1244	end	1244	end
1245		1245
1246	def cache_timeout(key, timeout, &block)	1246	def cache_timeout(key, timeout, &block)
1247	- cache(key, { :expires_in => timeout }, &block)	1247	+ cache(key, { :expires_in => timeout, :skip_digest => true }, &block)
1248	end	1248	end
1249		1249
1250	def is_cache_expired?(key)	1250	def is_cache_expired?(key)
	@@ -235,7 +235,7 @@ class Block < ActiveRecord::Base		@@ -235,7 +235,7 @@ class Block < ActiveRecord::Base
235		235
236	alias :active_record_cache_key :cache_key	236	alias :active_record_cache_key :cache_key
237	def cache_key(language='en', user=nil)	237	def cache_key(language='en', user=nil)
238	- active_record_cache_key+'-'+language	238	+ active_record_cache_key + '-' + language
239	end	239	end
240		240
241	def timeout	241	def timeout
	@@ -81,4 +81,8 @@ class EventPlugin::EventBlock < Block		@@ -81,4 +81,8 @@ class EventPlugin::EventBlock < Block
81	content_tag(:span, date.year.to_s, :class => 'year')	81	content_tag(:span, date.year.to_s, :class => 'year')
82	end	82	end
83		83
		84	+ def self.expire_on
		85	+ { :profile => [:article], :environment => [:article] }
		86	+ end
		87	+
84	end	88	end