Download as
Browse Code »

Commit fe317a30d9f77307630ac18dfad6a202e79aafd8

Authored by Victor Costa
2 parents b76c20a5 baa2faf8
Exists in staging and in 1 other branch api-homepage

Merge branch 'master' into staging

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