Merge branch 'master' into P398-main-block-should-not-be-invible

Leandro Santos
2 parents 0da26356 f25e4c1b
Showing 19 changed files with 475 additions and 322 deletions Show diff stats
app/controllers/public/content_viewer_controller.rb
app/models/article.rb
app/models/person.rb
plugins/container_block/public/container_block.js
plugins/custom_forms/controllers/custom_forms_plugin_profile_controller.rb
plugins/custom_forms/po/pt/custom_forms.po
plugins/custom_forms/test/functional/custom_forms_plugin_profile_controller_test.rb
plugins/display_content/po/pt/display_content.po
plugins/metadata/lib/ext/profile.rb
plugins/people_block/po/pt/people_block.po
plugins/remote_user/lib/remote_user_plugin.rb
plugins/statistics/po/pt/statistics.po
plugins/work_assignment/po/pt/work_assignment.po
po/fr/noosfero.po
po/pt/noosfero.po
script/noosfero-plugins
script/production
test/unit/article_test.rb
test/unit/person_test.rb
@@ -221,7 +221,7 @@ class ContentViewerController &lt; ApplicationController
       #      relation.
       posts = posts.native_translations if blog_with_translation?(@page)
-      @posts = posts.paginate({ :page => params[:npage], :per_page => @page.posts_per_page }.merge(Article.display_filter(user, profile))).to_a
+      @posts = posts.display_filter(user, profile).paginate({ :page => params[:npage], :per_page => @page.posts_per_page }).to_a
       if blog_with_translation?(@page)
         @posts.replace @posts.map{ |p| p.get_translation_to(FastGettext.locale) }.compact
@@ -486,15 +486,18 @@ class Article &lt; ActiveRecord::Base
   scope :more_comments, :order => "comments_count DESC"
   scope :more_recent, :order => "created_at DESC"
-  def self.display_filter(user, profile)
-    return {:conditions => ['articles.published = ?', true]} if !user
-    {:conditions => ["  articles.published = ? OR
-                        articles.last_changed_by_id = ? OR
-                        articles.profile_id = ? OR
-                        ? OR  articles.show_to_followers = ? AND ?",
-                        true, user.id, user.id, user.has_permission?(:view_private_content, profile),
-                        true, user.follows?(profile)]}
-  end
+  scope :display_filter, lambda {|user, profile|
+    return published if (user.nil? && profile && profile.public?)
+    return [] if user.nil? || (profile && !profile.public? && !user.follows?(profile))
+    where(
+      [
+       "published = ? OR last_changed_by_id = ? OR profile_id = ? OR ? 
+        OR  (show_to_followers = ? AND ?)", true, user.id, user.id, 
+        profile.nil? ?  false : user.has_permission?(:view_private_content, profile),
+        true, user.follows?(profile)
+      ] 
+    )
+  }
   def display_unpublished_article_to?(user)
@@ -435,6 +435,7 @@ roles] }
   end
   def follows?(profile)
+    return false if profile.nil?
     profile.followed_by?(self)
   end
 function enableMoveContainerChildren(container, box) {
   var div = jQuery('#box-'+box+' > .block-outer > .block');
   if(!div.is('.ui-resizable')) {
+    div.removeClass('ui-draggable');
     div.resizable({
       handles: 'e, w',
       containment: '#block-'+container+' .block-inner-2',
@@ -14,6 +15,7 @@ function enableMoveContainerChildren(container, box) {
 function disableMoveContainerChildren(container, box) {
   var div = jQuery('#box-'+box+' > .block-outer > .block');
   if(div.is('.ui-resizable')) {
+    div.addClass('ui-draggable');
     div.resizable('destroy');
   }
 }
@@ -9,7 +9,7 @@ class CustomFormsPluginProfileController &lt; ProfileController
       @submission = CustomFormsPlugin::Submission.find_by_form_id_and_profile_id(@form.id,user.id)
       @submission ||= CustomFormsPlugin::Submission.new(:form => @form, :profile => user)
     else
-      @submission = CustomFormsPlugin::Submission.new(:form => @for)
+      @submission = CustomFormsPlugin::Submission.new(:form => @form)
     end
     # build the answers
@@ -13,8 +13,8 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: 1.0-690-gcb6e853\n"
 "POT-Creation-Date: 2015-03-05 12:10-0300\n"
-"PO-Revision-Date: 2015-03-09 09:51+0200\n"
-"Last-Translator: Michal Čihař <michal@cihar.com>\n"
+"PO-Revision-Date: 2015-03-12 15:13+0200\n"
+"Last-Translator: daniel <dtygel@eita.org.br>\n"
 "Language-Team: Portuguese <https://hosted.weblate.org/projects/noosfero"
 "/plugin-custom-forms/pt/>\n"
 "Language: pt\n"
@@ -133,11 +133,11 @@ msgstr &quot;Gerenciar Formulários&quot;
 #: plugins/custom_forms/controllers/custom_forms_plugin_myprofile_controller.rb:26
 msgid "Custom form %s was successfully created."
-msgstr "\"O formulário %s foi criado com sucesso.\""
+msgstr "O formulário %s foi criado com sucesso."
 #: plugins/custom_forms/controllers/custom_forms_plugin_myprofile_controller.rb:46
 msgid "Custom form %s was successfully updated."
-msgstr "O formulário personalizado %s foi atualizado com sucesso"
+msgstr "O formulário personalizado %s foi atualizado com sucesso."
 #: plugins/custom_forms/controllers/custom_forms_plugin_myprofile_controller.rb:49
 msgid "Form could not be updated"
@@ -29,6 +29,17 @@ class CustomFormsPluginProfileControllerTest &lt; ActionController::TestCase
     assert_redirected_to :action => 'show'
   end
+  should 'save submission if fields are ok and user is not logged in' do
+    logout
+    form = CustomFormsPlugin::Form.create!(:profile => profile, :name => 'Free Software')
+    field = CustomFormsPlugin::TextField.create(:name => 'Name', :form => form)
+
+    assert_difference 'CustomFormsPlugin::Submission.count', 1 do
+      post :show, :profile => profile.identifier, :id => form.id, :author_name => "john", :author_email => 'john@example.com', :submission => {field.id.to_s => 'Noosfero'}
+    end
+    assert_redirected_to :action => 'show'
+  end
+
   should 'disable fields if form expired' do
     form = CustomFormsPlugin::Form.create!(:profile => profile, :name => 'Free Software', :begining => Time.now + 1.day)
     form.fields << CustomFormsPlugin::TextField.create(:name => 'Field Name', :form => form, :default_value => "First Field")
@@ -13,8 +13,8 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: 1.0-690-gcb6e853\n"
 "POT-Creation-Date: 2015-03-05 12:09-0300\n"
-"PO-Revision-Date: 2015-02-23 11:38+0200\n"
-"Last-Translator: Michal Čihař <michal@cihar.com>\n"
+"PO-Revision-Date: 2015-03-12 15:14+0200\n"
+"Last-Translator: daniel <dtygel@eita.org.br>\n"
 "Language-Team: Portuguese <https://hosted.weblate.org/projects/noosfero"
 "/plugin-display-content/pt/>\n"
 "Language: pt\n"
@@ -91,15 +91,15 @@ msgstr &quot;Escolha pelo Tipo de conteúdo&quot;
 #: plugins/display_content/views/box_organizer/_display_content_block.html.erb:28
 msgid "Order by:"
-msgstr ""
+msgstr "Ordenar por:"
 #: plugins/display_content/views/box_organizer/_display_content_block.html.erb:29
 msgid "Most recent"
-msgstr ""
+msgstr "Mais recentes"
 #: plugins/display_content/views/box_organizer/_display_content_block.html.erb:30
 msgid "Most oldest"
-msgstr ""
+msgstr "Mais antigas"
 #: plugins/display_content/views/box_organizer/_choose_by_content_type.html.erb:1
 msgid "Display content types:"
@@ -115,4 +115,4 @@ msgstr &quot;Carregar dinamicamente filhos das pastas selecionadas&quot;
 #: plugins/display_content/views/box_organizer/_choose_directly.html.erb:9
 msgid "Limit:"
-msgstr ""
+msgstr "Limite:"
@@ -5,7 +5,7 @@ class Profile
   metadata_spec namespace: :og, tags: {
     type: MetadataPlugin.og_types[:profile] || :profile,
     image: proc{ |p, plugin| "#{p.environment.top_url}#{p.image.public_filename}" if p.image },
-    title: proc{ |p, plugin| p.nickname || p.name },
+    title: proc{ |p, plugin| if p.nickname.present? then p.nickname else p.name end },
     url: proc do |p, plugin|
       #force profile identifier for custom domains and fixed host. see og_url_for
       plugin.og_url_for p.url.merge(profile: p.identifier)
@@ -13,16 +13,16 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: 1.0-690-gcb6e853\n"
 "POT-Creation-Date: 2015-03-05 12:09-0300\n"
-"PO-Revision-Date: 2014-12-18 18:40-0200\n"
-"Last-Translator: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>\n"
-"Language-Team: Portuguese <https://hosted.weblate.org/projects/noosfero/"
-"noosfero/pt/>\n"
+"PO-Revision-Date: 2015-03-12 14:41+0200\n"
+"Last-Translator: daniel <dtygel@eita.org.br>\n"
+"Language-Team: Portuguese <https://hosted.weblate.org/projects/noosfero"
+"/plugin-people-block/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=2; plural=n != 1;\n"
-"X-Generator: Weblate 2.0\n"
+"X-Generator: Weblate 2.3-dev\n"
 #: plugins/people_block/lib/friends_block.rb:8
 msgid "Clicking a friend takes you to his/her homepage"
@@ -77,8 +77,8 @@ msgstr &quot;Ver todos&quot;
 #: plugins/people_block/views/blocks/friends.html.erb:5
 msgid "Some suggestions for you"
-msgstr ""
+msgstr "Algumas sugestões para você"
 #: plugins/people_block/views/blocks/friends.html.erb:10
 msgid "See all suggestions"
-msgstr ""
+msgstr "Veja todas as sugestões"
@@ -16,10 +16,7 @@ class RemoteUserPlugin &lt; Noosfero::Plugin
         user_data = request.env['HTTP_REMOTE_USER_DATA']
         if remote_user.blank?
-          if logged_in?
-            self.current_user.forget_me
-            reset_session
-          end
+          self.current_user = nil
         else
           if user_data.blank?
             remote_user_email = remote_user + '@remote.user'
@@ -13,16 +13,16 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: 1.0-690-gcb6e853\n"
 "POT-Creation-Date: 2015-03-05 12:09-0300\n"
-"PO-Revision-Date: 2014-12-18 18:40-0200\n"
-"Last-Translator: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>\n"
-"Language-Team: Portuguese <https://hosted.weblate.org/projects/noosfero/"
-"noosfero/pt/>\n"
+"PO-Revision-Date: 2015-03-12 15:11+0200\n"
+"Last-Translator: daniel <dtygel@eita.org.br>\n"
+"Language-Team: Portuguese <https://hosted.weblate.org/projects/noosfero"
+"/plugin-statistics/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=2; plural=n != 1;\n"
-"X-Generator: Weblate 2.0\n"
+"X-Generator: Weblate 2.3-dev\n"
 #: plugins/statistics/lib/statistics_block.rb:24
 msgid "Statistics for %s"
@@ -30,51 +30,50 @@ msgstr &quot;Estatísticas para %s&quot;
 #: plugins/statistics/lib/statistics_block.rb:46
 msgid "This block presents some statistics about your context."
-msgstr "Este bloco apresenta algumas estatísticas sobre seu contexto."
+msgstr "Este bloco apresenta algumas estatísticas sobre seu portal."
 #: plugins/statistics/lib/statistics_plugin.rb:10
 msgid ""
 "A plugin that adds a block where you can see statistics of it's context."
 msgstr ""
 "Um plugin que adiciona um bloco onde você pode ver estatísticas do seu "
-"contexto."
+"portal."
 #: plugins/statistics/views/box_organizer/_statistics_block.html.erb:1
 msgid "Show user counter"
-msgstr "Mostrar contador de usuário"
+msgstr "Mostrar quantidade de usuários"
 #: plugins/statistics/views/box_organizer/_statistics_block.html.erb:4
 msgid "Show community counter"
-msgstr "Mostrar contador de comunidade"
+msgstr "Mostrar quantidade de comunidades"
 #: plugins/statistics/views/box_organizer/_statistics_block.html.erb:8
 msgid "Show enterprise counter"
-msgstr "Mostrar contador de empreendimento"
+msgstr "Mostrar quantidade de empreendimentos solidários"
 #: plugins/statistics/views/box_organizer/_statistics_block.html.erb:12
-#, fuzzy
 msgid "Show product counter"
-msgstr "Mostrar contador de acesso"
+msgstr "Mostrar quantidade de produtos"
 #: plugins/statistics/views/box_organizer/_statistics_block.html.erb:16
 msgid "Show category counter"
-msgstr "Mostrar contador de categoria"
+msgstr "Mostrar quantidade de categorias"
 #: plugins/statistics/views/box_organizer/_statistics_block.html.erb:20
 msgid "Show tag counter"
-msgstr "Mostrar contador de tag"
+msgstr "Mostrar quantidade de tags"
 #: plugins/statistics/views/box_organizer/_statistics_block.html.erb:24
 msgid "Show comment counter"
-msgstr "Mostrar contador de comentário"
+msgstr "Mostrar quantidade de comentários"
 #: plugins/statistics/views/box_organizer/_statistics_block.html.erb:28
 msgid "Show hit counter"
-msgstr "Mostrar contador de acesso"
+msgstr "Mostrar quantidade de acessos"
 #: plugins/statistics/views/box_organizer/_statistics_block.html.erb:34
 msgid "Show counter for communities with template %s"
-msgstr "Mostrar contador para comunidades com template %s"
+msgstr "Mostrar quantidade de comunidades com tema %s"
 #: plugins/statistics/views/statistics_block.html.erb:7
 msgid "users"
@@ -86,7 +85,7 @@ msgstr &quot;empreendimentos&quot;
 #: plugins/statistics/views/statistics_block.html.erb:13
 msgid "products"
-msgstr ""
+msgstr "produtos"
 #: plugins/statistics/views/statistics_block.html.erb:16
 msgid "communities"
@@ -13,8 +13,8 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: 1.0-690-gcb6e853\n"
 "POT-Creation-Date: 2015-03-05 12:09-0300\n"
-"PO-Revision-Date: 2015-02-23 11:34+0200\n"
-"Last-Translator: Michal Čihař <michal@cihar.com>\n"
+"PO-Revision-Date: 2015-03-12 15:18+0200\n"
+"Last-Translator: daniel <dtygel@eita.org.br>\n"
 "Language-Team: Portuguese <https://hosted.weblate.org/projects/noosfero"
 "/plugin-work-assignment/pt/>\n"
 "Language: pt\n"
@@ -30,11 +30,11 @@ msgstr &quot;Novo tipo de conteúdo para organizações.&quot;
 #: plugins/work_assignment/lib/work_assignment_plugin.rb:62
 msgid "Notification successfully sent"
-msgstr ""
+msgstr "Notificação enviada com sucesso"
 #: plugins/work_assignment/lib/work_assignment_plugin.rb:64
 msgid "Notification not sent"
-msgstr ""
+msgstr "Notificação não enviada"
 #: plugins/work_assignment/lib/work_assignment_plugin/work_assignment.rb:16
 msgid "Work Assignment"
@@ -94,7 +94,7 @@ msgstr &quot;Cancelar&quot;
 #: plugins/work_assignment/views/cms/work_assignment_plugin/_work_assignment.html.erb:3
 msgid "Default email message:"
-msgstr ""
+msgstr "Mensagem de e-mail padrão:"
 #: plugins/work_assignment/views/cms/work_assignment_plugin/_work_assignment.html.erb:5
 msgid "Publish submissions"
@@ -102,14 +102,16 @@ msgstr &quot;Publicar submissões&quot;
 #: plugins/work_assignment/views/cms/work_assignment_plugin/_work_assignment.html.erb:7
 msgid "Allow users change submissions privacy?"
-msgstr ""
+msgstr "Permitir que usuários alterem o nível de privacidade de submissões?"
 #: plugins/work_assignment/views/cms/_notify_text_field.html.erb:1
 msgid ""
 "If you want to notify someone about this action, fill the field below with "
 "the emails of the destinies, separated by comma."
 msgstr ""
+"Se você quiser notificar alguém sobre esta ação, preenha o campo abaixo com "
+"os e-mails dos destinatários, separados por vírgula."
 #: plugins/work_assignment/views/cms/_notify_text_field.html.erb:3
 msgid "Send notification to: "
-msgstr ""
+msgstr "Enviar notificação para: "
@@ -7,8 +7,8 @@ msgstr &quot;&quot;
 "Project-Id-Version: 1.0-690-gcb6e853\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-03-05 12:10-0300\n"
-"PO-Revision-Date: 2015-03-08 20:40+0200\n"
-"Last-Translator: M for Momo <mo@rtnp.org>\n"
+"PO-Revision-Date: 2015-03-12 16:11+0200\n"
+"Last-Translator: Tuux <tuxa@galaxie.eu.org>\n"
 "Language-Team: French "
 "<https://hosted.weblate.org/projects/noosfero/noosfero/fr/>\n"
 "Language: fr\n"
@@ -61,16 +61,12 @@ msgid &quot;&quot;
 msgstr ""
 #: app/models/approve_comment.rb:96
-#, fuzzy
 msgid "Your request for comment the article \"%{article}\" was approved."
-msgstr ""
-"%{author} veut publier l'article «%{article}» sur le groupe %{community}"
+msgstr "Votre demande pour commenter l'article \"% {article}\" a été approuvée."
 #: app/models/approve_comment.rb:101
-#, fuzzy
 msgid "Your request for commenting the article \"%{article}\" was rejected."
-msgstr ""
-"%{author} veut publier l'article «%{article}» sur le groupe %{community}"
+msgstr "Votre demande de commenter l'article \"% {article}\" a été rejetée."
 #: app/models/approve_comment.rb:103
 msgid ""
@@ -120,19 +116,17 @@ msgstr &quot;Nom&quot;
 #: app/models/comment.rb:6 app/models/article.rb:18 app/models/article.rb:38
 #: app/models/scrap.rb:6
-#, fuzzy
 msgid "Content"
-msgstr "Type de contenu"
+msgstr "Contenu"
 #: app/models/comment.rb:32
-#, fuzzy
 msgid "{fn} can only be informed for unauthenticated authors"
-msgstr "%{fn} peut seulement être renseigné pour les auteurs non authentifiés"
+msgstr "{fn} est informé uniquement pour les auteurs non authentifiés"
 #: app/models/comment.rb:71
 #, fuzzy
 msgid "(removed user)"
-msgstr "Pour ôter %s"
+msgstr "(supprimé par l'utilisateur)"
 #: app/models/comment.rb:71
 msgid "(unauthenticated user)"
@@ -173,33 +167,30 @@ msgid &quot;100%&quot;
 msgstr ""
 #: app/models/invite_member.rb:20
-#, fuzzy
 msgid "Community invitation"
-msgstr "Calculs informatisés"
+msgstr "Invitation de la communauté"
 #: app/models/invite_member.rb:28
-#, fuzzy
 msgid "%{requestor} invited you to join %{linked_subject}."
-msgstr "%s veut être membre de %s."
+msgstr "%{requestor} vous invite à rejoindre ce sujet % {linked_subject}."
 #: app/models/invite_member.rb:40
-#, fuzzy
 msgid "%{requestor} invited you to join %{community}."
-msgstr "%s veut être membre de %s."
+msgstr "%{requestor} vous invite à rejoindre la comunautée %{community}."
 #: app/models/invite_member.rb:45
-#, fuzzy
 msgid "%{requestor} is inviting you to join \"%{community}\" on %{system}."
-msgstr "%s veut être membre de %s."
+msgstr ""
+"%{requestor} vous invite à rejoindre la communautée \"%{community}\" sur le "
+"système %{system}."
 #: app/models/invite_member.rb:57 app/models/invite_friend.rb:37
 msgid "Hello <friend>,"
 msgstr "Bonjour <contact>,"
 #: app/models/invite_member.rb:58
-#, fuzzy
 msgid "<user> is inviting you to join \"<community>\" on <environment>."
-msgstr "<utilisateur> vous invite à participer à %{environment}."
+msgstr "<user> vous invite à rejoindre la « <community>» sur <environment>."
 #: app/models/invite_member.rb:59 app/models/invite_friend.rb:39
 msgid "To accept the invitation, please follow this link:"
@@ -214,14 +205,12 @@ msgid &quot;This block displays some info about your networking.&quot;
 msgstr "Ce bloc affiche de l'information sur votre réseau."
 #: app/models/sellers_search_block.rb:6
-#, fuzzy
 msgid "Search for enterprises and products"
-msgstr "Une recherche d'entreprises par produits"
+msgstr "Recherche de produits et d'entreprises"
 #: app/models/sellers_search_block.rb:10
-#, fuzzy
 msgid "Products/Enterprises search"
-msgstr "Produit|Entrprise"
+msgstr "Recherche de produits ou d'entreprises"
 #: app/models/sellers_search_block.rb:14
 msgid "Search for sellers"
@@ -232,9 +221,8 @@ msgid &quot;This block presents a search engine for products.&quot;
 msgstr "Ce bloc présente un moteur de recherche pour les produits."
 #: app/models/categories_block.rb:4
-#, fuzzy
 msgid "Generic category"
-msgstr "Catégorie générale"
+msgstr "Catégorie générique"
 #: app/models/categories_block.rb:5 app/helpers/categories_helper.rb:6
 #: app/views/enterprise_registration/basic_information.html.erb:25
@@ -246,23 +234,20 @@ msgid &quot;Product&quot;
 msgstr "Produit"
 #: app/models/categories_block.rb:14 app/models/categories_block.rb:18
-#, fuzzy
 msgid "Categories Menu"
-msgstr "Catégories"
+msgstr "Menu catégories"
 #: app/models/categories_block.rb:22
-#, fuzzy
 msgid "This block presents the categories like a web site menu."
-msgstr "Ce bloc présente l'image du profil."
+msgstr "Ce bloc présente les catégories comme un menu de site web."
 #: app/models/contact_list.rb:18
-#, fuzzy
 msgid ""
 "There was an error while authenticating. Did you enter correct login and "
 "password?"
 msgstr ""
-"Une erreur s'est produite lors de la recherche de votre liste de contacts. "
-"Avez-vous entré un identifiant et un mot de passe corrects ?"
+"Il y a eu une erreur lors de l'authentification. Utilisez vous un mot de "
+"passe et un login correcte ?"
 #: app/models/contact_list.rb:25
 #, fuzzy
@@ -13,16 +13,16 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: 1.0-690-gcb6e853\n"
 "POT-Creation-Date: 2015-03-05 12:10-0300\n"
-"PO-Revision-Date: 2014-12-18 18:40-0200\n"
-"Last-Translator: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>\n"
-"Language-Team: Portuguese <https://hosted.weblate.org/projects/noosfero/"
-"noosfero/pt/>\n"
+"PO-Revision-Date: 2015-03-14 22:06+0200\n"
+"Last-Translator: daniel <dtygel@eita.org.br>\n"
+"Language-Team: Portuguese "
+"<https://hosted.weblate.org/projects/noosfero/noosfero/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=2; plural=n != 1;\n"
-"X-Generator: Weblate 2.0\n"
+"X-Generator: Weblate 2.3-dev\n"
 #: app/models/approve_comment.rb:17
 msgid "Anonymous"
@@ -194,10 +194,8 @@ msgstr &quot;&quot;
 "%{requestor} convidou você para ser integrante da comunidade %{community}."
 #: app/models/invite_member.rb:45
-#, fuzzy
 msgid "%{requestor} is inviting you to join \"%{community}\" on %{system}."
-msgstr ""
-"%{requestor} convidou você para ser integrante da comunidade %{community}."
+msgstr "%{requestor} convidou você para ingressar na comunidade %{community}."
 #: app/models/invite_member.rb:57 app/models/invite_friend.rb:37
 msgid "Hello <friend>,"
@@ -336,13 +334,12 @@ msgid &quot;Acronym&quot;
 msgstr "Sigla"
 #: app/models/category.rb:8
-#, fuzzy
 msgid "Abbreviation"
-msgstr "Convite"
+msgstr "Abreviação"
 #: app/models/category.rb:9 app/models/article.rb:19
 msgid "Slug"
-msgstr ""
+msgstr "Texto curto"
 #: app/models/category.rb:12
 msgid "{fn} cannot be like that."
@@ -608,7 +605,6 @@ msgid &quot;Stays on the same page the user was before signup.&quot;
 msgstr "Permanece na mesma página que o usuário estava antes do cadastro."
 #: app/models/environment.rb:162
-#, fuzzy
 msgid "Redirects the user to the environment welcome page."
 msgstr "Redireciona o usuário para a página inicial do ambiente."
@@ -769,18 +765,16 @@ msgid &quot;{fn} of uploaded file was larger than the maximum size of 5.0 MB&quot;
 msgstr "{fn} do arquivo enviado é maior que o máximo permitido de 5.0 MB"
 #: app/models/profile_suggestion.rb:35 app/models/profile_suggestion.rb:38
-#, fuzzy
 msgid "Friends in common"
-msgstr "Convite de amizade"
+msgstr "Amigas/os em comum"
 #: app/models/profile_suggestion.rb:36
-#, fuzzy
 msgid "Communities in common"
-msgstr "Menu de comunidades"
+msgstr "Comunidades em comum"
 #: app/models/profile_suggestion.rb:37 app/models/profile_suggestion.rb:39
 msgid "Tags in common"
-msgstr ""
+msgstr "Palavras-chave (tags) em comum"
 #: app/models/person.rb:13 app/models/link_list_block.rb:29
 #: app/views/templates/index.html.erb:5
@@ -1002,9 +996,8 @@ msgid &quot;Raw HTML&quot;
 msgstr "HTML puro"
 #: app/models/person_notifier.rb:102
-#, fuzzy
 msgid "[%s] Notifications"
-msgstr "Opções de notificação"
+msgstr "[%s] notificações"
 #: app/models/moderate_user_registration.rb:29
 #: app/views/account/login.html.erb:29
@@ -1169,12 +1162,10 @@ msgid &quot;Article not selected yet.&quot;
 msgstr "Nenhum artigo selecionado ainda."
 #: app/models/article.rb:17
-#, fuzzy
 msgid "Abstract"
 msgstr "Resumo"
 #: app/models/article.rb:20
-#, fuzzy
 msgid "Filename"
 msgstr "Nome do arquivo"
@@ -2012,9 +2003,8 @@ msgid &quot;CreateEnterprise|Identifier&quot;
 msgstr "Identificador"
 #: app/models/license.rb:7
-#, fuzzy
 msgid "URL"
-msgstr "URL:"
+msgstr "Endereço na internet"
 #: app/models/enterprise_homepage.rb:4 app/models/enterprise_homepage.rb:16
 #: app/views/blocks/profile_info.html.erb:18
@@ -2234,9 +2224,8 @@ msgid &quot;None&quot;
 msgstr "Nenhum(a)"
 #: app/models/certifier.rb:8
-#, fuzzy
 msgid "Link"
-msgstr "Links"
+msgstr "Link"
 #: app/models/products_block.rb:19
 msgid "This block presents a list of your products."
@@ -2255,9 +2244,8 @@ msgid &quot;Subscribe RSS Feed&quot;
 msgstr "Assinar feed RSS"
 #: app/models/national_region.rb:5
-#, fuzzy
 msgid "Region Code"
-msgstr "Região"
+msgstr "Código de região"
 #: app/models/national_region.rb:72
 msgid "Invalid city or state name."
@@ -2791,9 +2779,8 @@ msgid &quot;The contents in this profile is available to members only.&quot;
 msgstr "O conteúdo deste perfil está disponível apenas para os seus membros."
 #: app/helpers/application_helper.rb:1459
-#, fuzzy
 msgid "See all connections"
-msgstr "Buscar todo o conteúdo"
+msgstr "Ver todas as conexões"
 #: app/helpers/manage_products_helper.rb:156
 #: app/views/manage_products/_display_category.html.erb:3
@@ -2882,7 +2869,7 @@ msgstr &quot;%{currency} %{production_cost} de %{currency} %{product_price}&quot;
 #: app/helpers/search_helper.rb:9
 msgid "Order"
-msgstr ""
+msgstr "Ordenação"
 #: app/helpers/search_helper.rb:10 app/helpers/search_helper.rb:117
 msgid "Display"
@@ -3079,14 +3066,12 @@ msgid &quot;Private&quot;
 msgstr "Privado"
 #: app/helpers/article_helper.rb:100
-#, fuzzy
 msgid "For all community members"
-msgstr "Criar um modelos de comunidade"
+msgstr "Para todos os integrantes da comunidade"
 #: app/helpers/article_helper.rb:100
-#, fuzzy
 msgid "For all your friends"
-msgstr "Convide seus amigos"
+msgstr "Para todos os seus amigos"
 #: app/helpers/article_helper.rb:118
 msgid "Fill in the search field to add the exception users to see this content"
@@ -4063,25 +4048,22 @@ msgid &quot;Name has already been taken&quot;
 msgstr "O nome já está sendo utilizado"
 #: app/controllers/admin/templates_controller.rb:47
-#, fuzzy
 msgid "Community not found. The template could no be changed."
-msgstr "O modelo não pode ser salvo"
+msgstr "Comunidade não encontrada. O modelo não pôde ser alterado."
 #: app/controllers/admin/templates_controller.rb:51
 #: app/controllers/admin/templates_controller.rb:65
 #: app/controllers/admin/templates_controller.rb:79
 msgid "%s defined as default"
-msgstr ""
+msgstr "%s definido como padrão"
 #: app/controllers/admin/templates_controller.rb:61
-#, fuzzy
 msgid "Person not found. The template could no be changed."
-msgstr "O modelo não pode ser salvo"
+msgstr "Pessoa não encontrada. O modelo não pôde ser alterado."
 #: app/controllers/admin/templates_controller.rb:75
-#, fuzzy
 msgid "Enterprise not found. The template could no be changed."
-msgstr "O modelo não pode ser salvo"
+msgstr "Empreendimento não encontrado. O modelo não pôde ser alterado."
 #: app/controllers/admin/plugins_controller.rb:12
 msgid "Plugins updated successfully."
@@ -4173,9 +4155,8 @@ msgid &quot;Please enter a valid email address.&quot;
 msgstr "Por favor entre um endereço de e-mail válido."
 #: app/controllers/public/invite_controller.rb:77
-#, fuzzy
 msgid "Please enter a valid profile."
-msgstr "Por favor entre um endereço de e-mail válido."
+msgstr "Por favor entre com um perfil válido."
 #: app/controllers/public/search_controller.rb:52
 msgid "Upcoming events"
@@ -4408,9 +4389,8 @@ msgid &quot;\&quot;%s\&quot; configured as homepage.&quot;
 msgstr "\"%s\" configurado como página inicial."
 #: app/controllers/my_profile/cms_controller.rb:223
-#, fuzzy
 msgid "File(s) successfully uploaded"
-msgstr "Papéis alterado com sucesso"
+msgstr "Arquivo(s) enviado(s) com sucesso"
 #: app/controllers/my_profile/cms_controller.rb:239
 msgid "\"%s\" was removed."
@@ -4427,9 +4407,8 @@ msgid &quot;Select some group to publish your article&quot;
 msgstr "Selecione os grupos onde você quer publicar seu artigo"
 #: app/controllers/my_profile/cms_controller.rb:322
-#, fuzzy
 msgid "Some of your publish requests couldn't be sent."
-msgstr "Sua requisição de publicação não pode ser enviada."
+msgstr "Alguns dos seus pedidos de publicação não puderam ser enviados."
 #: app/controllers/my_profile/cms_controller.rb:337
 msgid "Your publish request couldn't be sent."
@@ -4455,9 +4434,8 @@ msgid &quot;Images&quot;
 msgstr "Imagens"
 #: app/controllers/my_profile/cms_controller.rb:495
-#, fuzzy
 msgid "Files"
-msgstr "File"
+msgstr "Arquivos"
 #: app/controllers/my_profile/tasks_controller.rb:39
 msgid "All decisions were applied successfully."
@@ -4500,33 +4478,28 @@ msgid &quot;Could not delete profile&quot;
 msgstr "Não foi possível remover o perfil"
 #: app/controllers/my_profile/profile_editor_controller.rb:99
-#, fuzzy
 msgid "Welcome page saved successfully."
-msgstr "e-Mail desabilitado com sucesso."
+msgstr "Página de boas vindas salva com sucesso."
 #: app/controllers/my_profile/profile_editor_controller.rb:102
-#, fuzzy
 msgid "Welcome page could not be saved."
-msgstr "O modelo não pode ser salvo"
+msgstr "A página de boas vindas não pôde ser salva."
 #: app/controllers/my_profile/profile_editor_controller.rb:112
-#, fuzzy
 msgid "\"The profile '#{profile.name}' was deactivated.\""
-msgstr "O perfil foi removido."
+msgstr "\"O perfil '#{profile.name}' foi desativado.\""
 #: app/controllers/my_profile/profile_editor_controller.rb:114
-#, fuzzy
 msgid "Could not deactivate profile."
-msgstr "Não foi possível remover o perfil"
+msgstr "Não foi possível desativar o perfil."
 #: app/controllers/my_profile/profile_editor_controller.rb:126
 msgid "\"The profile '#{profile.name}' was activated.\""
-msgstr ""
+msgstr "\"O perfil '#{profile.name}' foi ativado.\""
 #: app/controllers/my_profile/profile_editor_controller.rb:128
-#, fuzzy
 msgid "Could not activate the profile."
-msgstr "Não foi possível remover o perfil"
+msgstr "Não foi possível ativar o perfil."
 #: app/controllers/my_profile/profile_members_controller.rb:78
 msgid "Member succesfully unassociated"
@@ -4597,7 +4570,7 @@ msgstr &quot;Bem-vindo ao ambiente %s&quot;
 #: app/mailers/user_mailer.rb:57
 msgid "[%s] What about grow up your network?"
-msgstr ""
+msgstr "[%s] Que tal ampliar sua rede?"
 #: app/mailers/pending_task_notifier.rb:15
 msgid "[%s] Pending tasks"
@@ -5332,9 +5305,8 @@ msgid &quot;Title: &quot;
 msgstr "Título: "
 #: app/views/tasks/_approve_article_accept_details.html.erb:3
-#, fuzzy
 msgid "Create a link"
-msgstr "Criado em: "
+msgstr "Criar um link"
 #: app/views/tasks/_approve_article_accept_details.html.erb:5
 msgid "Name for publishing"
@@ -5522,7 +5494,7 @@ msgstr &quot;Título personalizado para este bloco: &quot;
 #: app/views/box_organizer/edit.html.erb:10
 msgid "Fixed"
-msgstr ""
+msgstr "Fixo"
 #: app/views/box_organizer/edit.html.erb:17
 msgid "Display this block:"
@@ -5610,7 +5582,7 @@ msgstr &quot;Código HTML&quot;
 #: app/views/box_organizer/index.html.erb:1
 msgid "Editing sideboxes"
-msgstr "Editando blocos laterais"
+msgstr "Editar blocos laterais"
 #: app/views/box_organizer/index.html.erb:4
 msgid "Add a block"
@@ -5621,15 +5593,13 @@ msgid &quot;Limit of posts to display&quot;
 msgstr "Limite de postagens para exibir"
 #: app/views/friends/suggest.html.erb:1
-#, fuzzy
 msgid "Friends suggestions for %s"
-msgstr "Configurações do perfil para %s"
+msgstr "Sugestões de amigas/os para %s"
 #: app/views/friends/suggest.html.erb:4
 #: app/views/friends/connections.html.erb:4
-#, fuzzy
 msgid "Go to friends list"
-msgstr "Você não tem amigos ainda."
+msgstr "Ir para a lista de amigas/os"
 #: app/views/friends/_profile_list.html.erb:7
 #: app/views/friends/_profile_list.html.erb:9
@@ -5681,14 +5651,12 @@ msgstr &quot;Não&quot;
 #: app/views/friends/connections.html.erb:1
 #: app/views/memberships/connections.html.erb:1
-#, fuzzy
 msgid "Connections with %s"
-msgstr "Conteúdo marcado com \"%s\""
+msgstr "Conexões com \"%s\""
 #: app/views/friends/remove_suggestion.html.erb:2
-#, fuzzy
 msgid "Removing suggestion for friend: %s"
-msgstr "Removendo amigo: %s"
+msgstr "Removendo sugestão para amiga/o: %s"
 #: app/views/friends/index.html.erb:3 app/views/profile/friends.html.erb:3
 msgid "%s's friends"
@@ -5709,14 +5677,12 @@ msgstr &quot;Buscar pessoas&quot;
 #: app/views/friends/index.html.erb:19
 #: app/views/invite/select_friends.html.erb:4
 #: app/views/profile/friends.html.erb:21
-#, fuzzy
 msgid "Invite people"
-msgstr "Convidar membros"
+msgstr "Convidar pessoas"
 #: app/views/friends/index.html.erb:31
-#, fuzzy
 msgid "Friends suggestions"
-msgstr "Sugestão de artigo"
+msgstr "Sugestões de amigas/os"
 #: app/views/search/search_page.html.erb:1
 #: app/views/search/communities.html.erb:1
@@ -6006,13 +5972,12 @@ msgstr &quot;&quot;
 "automaticamente"
 #: app/views/profile_editor/edit.html.erb:55
-#, fuzzy
 msgid "Suggestions"
-msgstr "Sugestões: %s"
+msgstr "Sugestões"
 #: app/views/profile_editor/edit.html.erb:57
 msgid "Send me relationship suggestions by email"
-msgstr ""
+msgstr "Envie-me por e-mail sugestões de novos relacionamentos"
 #: app/views/profile_editor/edit.html.erb:67
 msgid "Select the categories of your interest"
@@ -6023,20 +5988,17 @@ msgid &quot;Delete profile&quot;
 msgstr "Remover perfil"
 #: app/views/profile_editor/edit.html.erb:81
-#, fuzzy
 msgid "Deactivate profile"
-msgstr "Perfil privado"
+msgstr "Desativar perfil"
 #: app/views/profile_editor/edit.html.erb:81
 #: app/views/profile_editor/edit.html.erb:83
-#, fuzzy
 msgid "Are you sure you want to deactivate this profile?"
-msgstr "Tem certeza que quer remover este perfil?"
+msgstr "Tem certeza que deseja desativar este perfil?"
 #: app/views/profile_editor/edit.html.erb:83
-#, fuzzy
 msgid "Activate profile"
-msgstr "Perfil privado"
+msgstr "Ativar perfil"
 #: app/views/profile_editor/disable.html.erb:1
 msgid "Disabling '%s' enterprise"
@@ -6072,35 +6034,39 @@ msgstr &quot;Sim, quero habilitar.&quot;
 #: app/views/profile_editor/welcome_page.html.erb:1
 #: app/views/profile_editor/index.html.erb:71
 #: app/views/templates/index.html.erb:32
-#, fuzzy
 msgid "Edit welcome page"
-msgstr "Texto de boas vindas no registro"
+msgstr "Editar página de boas vindas"
 #: app/views/profile_editor/welcome_page.html.erb:8
 msgid "Your welcome page will only be displayed if this options is selected."
 msgstr ""
+"Sua página de boas vindas será exibida apenas se esta opção estiver "
+"selecionada."
 #: app/views/profile_editor/welcome_page.html.erb:13
 msgid ""
 "This page will be displayed to the user after his signup with this template."
 msgstr ""
+"Esta página será exibida assim que o novo usuário se registrar com este tema."
 #: app/views/profile_editor/_moderation.html.erb:1
 msgid "Moderation options"
 msgstr "Opções de moderação"
 #: app/views/profile_editor/_moderation.html.erb:4
-#, fuzzy
 msgid "Invitation moderation:"
-msgstr "Texto do convite:"
+msgstr "Moderação de convite:"
 #: app/views/profile_editor/_moderation.html.erb:9
 msgid "Allow all members to send invitation (Default: only administrator)"
 msgstr ""
+"Permitir que todos os integrantes enviem convite (Padrão: apenas "
+"administrador)"
 #: app/views/profile_editor/_moderation.html.erb:15
 msgid "Allow members to invite only friends (Default: all users)"
 msgstr ""
+"Permitir que integrantes convidem apenas amigos (Padrão: todos os usuários)"
 #: app/views/profile_editor/_moderation.html.erb:22
 #: app/views/memberships/new_community.html.erb:32
@@ -6303,23 +6269,20 @@ msgid &quot;Offline&quot;
 msgstr "Desconectado"
 #: app/views/shared/logged_in/xmpp_chat.html.erb:60
-#, fuzzy
 msgid "Join room"
-msgstr "Entrar"
+msgstr "Entrar na sala de bate-papo"
 #: app/views/shared/logged_in/xmpp_chat.html.erb:61
-#, fuzzy
 msgid "Leave room"
-msgstr "Deixe seu comentário"
+msgstr "Sair da sala de bate-papo"
 #: app/views/shared/_profile_connections.html.erb:2
-#, fuzzy
 msgid "Profiles in common:"
-msgstr "Informações do perfil"
+msgstr "Perfis em comum:"
 #: app/views/shared/_profile_connections.html.erb:17
 msgid "Tags in common:"
-msgstr ""
+msgstr "Palavras-chave (tags) em comum:"
 #: app/views/shared/access_denied.html.erb:3 lib/authenticated_system.rb:79
 msgid "Access denied"
@@ -6445,27 +6408,23 @@ msgid &quot;Admin&quot;
 msgstr "Administrador"
 #: app/views/shared/_profile_suggestions_list.html.erb:6
-#, fuzzy
 msgid "You have no more suggestions :("
-msgstr "Você tem solicitações pendentes"
+msgstr "Não há nenhuma outra sugestão para você :("
 #: app/views/shared/_profile_suggestions_list.html.erb:19
 #: app/views/shared/_profile_suggestions_list.html.erb:26
-#, fuzzy
 msgid "Add suggestion"
-msgstr "Sugestão de artigo"
+msgstr "Adicionar sugestão"
 #: app/views/shared/_profile_suggestions_list.html.erb:39
 #: app/views/shared/_profile_suggestions_list.html.erb:47
-#, fuzzy
 msgid "Remove suggestion"
-msgstr "Sugestão de artigo"
+msgstr "Remover sugestão"
 #: app/views/shared/_profile_suggestions_list.html.erb:40
 #: app/views/shared/_profile_suggestions_list.html.erb:48
-#, fuzzy
 msgid "Are you sure you want to remove this suggestion?"
-msgstr "Tem certeza de que deseja excluir esta sugestão de artigo?"
+msgstr "Tem certeza que deseja remover esta sugestão?"
 #: app/views/shared/_profile_search_form.html.erb:4
 #: app/views/shared/_profile_search_form.html.erb:8
@@ -6481,14 +6440,12 @@ msgid &quot;Search all content&quot;
 msgstr "Buscar todo o conteúdo"
 #: app/views/shared/_remove_suggestion.html.erb:4
-#, fuzzy
 msgid "Are you sure you want to remove %s from your suggestions list?"
-msgstr "Tem certeza que quer remover %s da sua lista de amigos?"
+msgstr "Tem certeza que quer remover %s da sua lista de sugestões?"
 #: app/views/shared/_remove_suggestion.html.erb:8
-#, fuzzy
 msgid "Yes, I want to remove %s"
-msgstr "Sim, quero sair."
+msgstr "Sim, quero remover %s"
 #: app/views/shared/_lead_and_body.html.erb:18
 msgid "Used when a short version of your text is needed."
@@ -6622,42 +6579,36 @@ msgid &quot;Create a new template for %s&quot;
 msgstr "Criar um novo modelo para %s"
 #: app/views/templates/index.html.erb:16
-#, fuzzy
 msgid "Template"
-msgstr "Editar Modelos"
+msgstr "Tema"
 #: app/views/templates/index.html.erb:23
 msgid "Edit template \"%s\""
 msgstr "Editar modelo \"%s\""
 #: app/views/templates/index.html.erb:25
-#, fuzzy
 msgid "is the default template"
-msgstr "Usar o tema padrão"
+msgstr "é o modelo padrão"
 #: app/views/templates/index.html.erb:27
 msgid "Set as default"
-msgstr ""
+msgstr "Definir como padrão"
 #: app/views/templates/index.html.erb:27
-#, fuzzy
 msgid "Set %s template as default"
-msgstr "O novo modelo foi criado"
+msgstr "Definir o modelo %s como padrão"
 #: app/views/templates/index.html.erb:31
-#, fuzzy
 msgid "Edit settings"
-msgstr "Configurações de e-mail"
+msgstr "Editar configurações"
 #: app/views/templates/index.html.erb:33
-#, fuzzy
 msgid "Edit sideblocks"
 msgstr "Editar blocos laterais"
 #: app/views/templates/index.html.erb:35
-#, fuzzy
 msgid "Edit header/footer"
-msgstr "Editando cabeçalho e rodapé"
+msgstr "Editar cabeçalho/rodapé"
 #: app/views/doc/_path.html.erb:2
 msgid "You are here:"
@@ -6723,17 +6674,19 @@ msgstr &quot;O que fazer agora?&quot;
 #: app/views/home/welcome.html.erb:20
 msgid "Access your %s and see your face on the network!"
-msgstr ""
+msgstr "Acesse seu %s e veja sua cara na rede!"
 #: app/views/home/welcome.html.erb:22
 msgid ""
 "You can also explore your %s to customize your profile. Here are some %s on "
 "what you can do there."
 msgstr ""
+"Você pode também explorar seu %s para customizar seu perfil. Aqui há algumas "
+"%s sobre o que você pode fazer."
 #: app/views/home/welcome.html.erb:24
 msgid "tips"
-msgstr ""
+msgstr "dicas"
 #: app/views/home/welcome.html.erb:25
 msgid "%s your Gmail, Yahoo and Hotmail contacts!"
@@ -6761,7 +6714,7 @@ msgstr &quot;Comece a explorar e divirta-se!&quot;
 #: app/views/home/welcome.html.erb:29
 msgid "What can I do as a %s?"
-msgstr ""
+msgstr "O que posso fazer como %s?"
 #: app/views/home/index.html.erb:2
 msgid "News"
@@ -6988,9 +6941,8 @@ msgstr &quot;Adicionar integrantes&quot;
 #: app/views/invite/select_friends.html.erb:6
 #: app/views/invite/invite_friends.html.erb:5
 #: app/views/profile/members.html.erb:21
-#, fuzzy
 msgid "Invite people to join"
-msgstr "Convide seus amigos para entrar em %s"
+msgstr "Convide seus amigos para entrar"
 #: app/views/profile_members/_index_buttons.html.erb:8
 #: app/views/profile/send_mail.html.erb:3
@@ -7106,35 +7058,30 @@ msgid &quot;Regions&quot;
 msgstr "Regiões"
 #: app/views/memberships/welcome.html.erb:1
-#, fuzzy
 msgid "Community created"
-msgstr "Comunidade"
+msgstr "Comunidade criada"
 #: app/views/memberships/welcome.html.erb:2
-#, fuzzy
 msgid "Your community (%s) was successfully created."
-msgstr "Seu empreendimento (%s) foi registrado com sucesso."
+msgstr "Sua comunidade (%s) foi criada com sucesso."
 #: app/views/memberships/welcome.html.erb:3
-#, fuzzy
 msgid "You can manage your community now."
-msgstr "Você pode gerenciar seu empreendimento agora."
+msgstr "Agora você já pode gerenciar sua comunidade."
 #: app/views/memberships/welcome.html.erb:5
 #: app/views/enterprise_registration/creation.html.erb:5
 msgid "What can I do with a %s?"
-msgstr ""
+msgstr "O que posso fazer com um %s?"
 #: app/views/memberships/suggest.html.erb:1
-#, fuzzy
 msgid "Communities suggestions for %s"
-msgstr "Configurações do perfil para %s"
+msgstr "Sugestões de comunidades para %s"
 #: app/views/memberships/suggest.html.erb:4
 #: app/views/memberships/connections.html.erb:4
-#, fuzzy
 msgid "Go to groups list"
-msgstr "Nenhum grupo para listar"
+msgstr "Ir para a lista de grupos"
 #: app/views/memberships/new_community.html.erb:1
 msgid "Creating new community"
@@ -7153,7 +7100,7 @@ msgstr &quot;&quot;
 #: app/views/memberships/remove_suggestion.html.erb:2
 msgid "Removing suggestion for community: %s"
-msgstr ""
+msgstr "Removendo sugestão para a comunidade %s"
 #: app/views/memberships/index.html.erb:6
 #: app/views/profile/communities.html.erb:19
@@ -7166,9 +7113,8 @@ msgid &quot;Register a new enterprise&quot;
 msgstr "Registrar um novo empreendimento"
 #: app/views/memberships/index.html.erb:19
-#, fuzzy
 msgid "See some suggestions of communities..."
-msgstr "Administrador tem que aprovar a criação de comunidades"
+msgstr "Veja algumas sugestões de comunidades..."
 #: app/views/memberships/index.html.erb:23
 msgid "No groups to list"
@@ -7574,9 +7520,8 @@ msgid &quot;Drag images to add them to the text.&quot;
 msgstr "Arraste as imagens para adicioná-las ao texto."
 #: app/views/cms/_drag_and_drop_note.html.erb:4
-#, fuzzy
 msgid "Click on file names to add links to the text."
-msgstr "Arraste as imagens para adicioná-las ao texto."
+msgstr "Clique no nome dos arquivos para adicionar links ao texto."
 #: app/views/cms/upload_files.html.erb:3
 msgid "This file couldn't be saved"
@@ -7609,34 +7554,28 @@ msgid &quot;Insert media&quot;
 msgstr "Adicionar mídia"
 #: app/views/cms/_text_editor_sidebar.html.erb:8
-#, fuzzy
 msgid "Show/Hide"
-msgstr "Mostrar"
+msgstr "Mostrar/Ocultar"
 #: app/views/cms/_text_editor_sidebar.html.erb:21
-#, fuzzy
 msgid "New folder"
-msgstr "pasta superior"
+msgstr "Nova pasta"
 #: app/views/cms/_text_editor_sidebar.html.erb:26
-#, fuzzy
 msgid "Hide all uploads"
-msgstr "Ver todos os produtos"
+msgstr "Ocultar todos os envios"
 #: app/views/cms/_text_editor_sidebar.html.erb:27
-#, fuzzy
 msgid "Show all uploads"
-msgstr "Ver todos os produtos"
+msgstr "Mostrar todos os envios"
 #: app/views/cms/_text_editor_sidebar.html.erb:33
-#, fuzzy
 msgid "Recent media"
-msgstr "Adicionar mídia"
+msgstr "Imagens e arquivos recentes"
 #: app/views/cms/_link_article.html.erb:3
-#, fuzzy
 msgid "Reference"
-msgstr "Url de referência"
+msgstr "Referência"
 #: app/views/cms/select_article_type.html.erb:3
 msgid "Choose the type of content:"
@@ -7647,46 +7586,48 @@ msgid &quot;This is a republication of \&quot;%s\&quot;, by %s.&quot;
 msgstr "Esta é uma republicação de \"%s\", por %s."
 #: app/views/cms/publish.html.erb:3
-#, fuzzy
 msgid "Where do you want to publish this article?"
-msgstr "Selecione os grupos onde você quer publicar seu artigo"
+msgstr "Onde você deseja publicar este artigo?"
 #: app/views/cms/publish.html.erb:7
 msgid "There were errors with the following communities: "
 msgstr "Houve problemas com as seguintes comunidades: "
 #: app/views/cms/publish.html.erb:22
-#, fuzzy
 msgid "Publish this article on your profile"
-msgstr "Publicar seu artigo na comunidade portal"
+msgstr "Publicar este artigo no seu perfil"
 #: app/views/cms/publish.html.erb:23
 msgid ""
 "You can publish this article on your profile where your friends and "
 "followers will see."
 msgstr ""
+"Você pode publicar este artigo no seu perfil, para seus amigos e seguidores "
+"poderem ver."
 #: app/views/cms/publish.html.erb:37
-#, fuzzy
 msgid "Publish this article on communities you are part of"
-msgstr "Publicar seu artigo na comunidade portal"
+msgstr "Publicar este artigo em comunidades que você faz parte"
 #: app/views/cms/publish.html.erb:38
 msgid ""
 "You can submit this article to one or more communities you are a member of, "
 "just search for the community below."
 msgstr ""
+"Você pode enviar este artigo para uma ou mais comunidades das quais você faz "
+"parte. Basta buscar a(s) comunidade(s) abaixo."
 #: app/views/cms/publish.html.erb:42
-#, fuzzy
 msgid "Type in a search for your community"
-msgstr "Digite um termo de pesquisa para os usuários"
+msgstr "Digite um termo de busca para a(s) comunidade(s)"
 #: app/views/cms/publish.html.erb:55
 msgid ""
 "You can suggest this article to the portal community, where it can show up "
 "on the homepage."
 msgstr ""
+"Você pode sugerir este artigo para a comunidade do portal, de modo que ele "
+"apareça na página inicial."
 #: app/views/cms/destroy.html.erb:1
 msgid "Delete: %s"
@@ -7709,14 +7650,12 @@ msgid &quot;Yes, I want.&quot;
 msgstr "Sim, eu quero."
 #: app/views/cms/_media_new_folder.html.erb:1
-#, fuzzy
 msgid "Create new folder"
-msgstr "Criar um novo papel"
+msgstr "Criar nova pasta"
 #: app/views/cms/_media_new_folder.html.erb:3
-#, fuzzy
 msgid "Choose parent folder:"
-msgstr "pasta superior"
+msgstr "Escolha a pasta-mãe:"
 #: app/views/cms/_media_new_folder.html.erb:11
 #: app/views/manage_products/_form.html.erb:6
@@ -7826,14 +7765,12 @@ msgid &quot;You can manage your enterprise now.&quot;
 msgstr "Você pode gerenciar seu empreendimento agora."
 #: app/views/person_notifier/mailer/content_summary.html.erb:8
-#, fuzzy
 msgid "%s's Notifications"
-msgstr "Opções de notificação"
+msgstr "Notificações de %s"
 #: app/views/person_notifier/mailer/content_summary.html.erb:23
-#, fuzzy
 msgid "Network Activity"
-msgstr "[%s] Atividade da Rede"
+msgstr "Atividade da rede"
 #: app/views/person_notifier/mailer/_profile_comments.html.erb:6
 msgid "View all %s comments"
@@ -7859,14 +7796,12 @@ msgid &quot;communities|View all&quot;
 msgstr "Ver todas"
 #: app/views/blocks/communities.html.erb:9
-#, fuzzy
 msgid "Some suggestions for you"
-msgstr "Sugestões: %s"
+msgstr "Algumas sugestões para você"
 #: app/views/blocks/communities.html.erb:14
-#, fuzzy
 msgid "See all suggestions"
-msgstr "Sugestão de artigo"
+msgstr "Veja todas as sugestões"
 #: app/views/blocks/profile_info.html.erb:19
 #: app/views/blocks/my_network.html.erb:5
@@ -8495,14 +8430,12 @@ msgid &quot;Do you want to remove this user?&quot;
 msgstr "Você quer remover esse usuário?"
 #: app/views/invite/select_friends.html.erb:10
-#, fuzzy
 msgid "Step 2 of 2: Selecting People"
-msgstr "Passo 2 de 2: Selecionando Amigos"
+msgstr "Passo 2 de 2: Selecionando amigos"
 #: app/views/invite/select_friends.html.erb:15
-#, fuzzy
 msgid "Indicate which people you want to invite."
-msgstr "Indique quais amigos você quer convidar."
+msgstr "Indique quais pessoas você quer convidar."
 #: app/views/invite/select_friends.html.erb:23
 msgid "Enter one e-mail address per line:"
@@ -8518,34 +8451,31 @@ msgstr &quot;Desmarcar todos&quot;
 #: app/views/invite/select_friends.html.erb:36
 msgid "Invite!"
-msgstr ""
+msgstr "Convidar!"
 #: app/views/invite/invite_friends.html.erb:2
-#, fuzzy
 msgid "Ask for friendship"
-msgstr "%s amigos"
+msgstr "Solicite amizade"
 #: app/views/invite/invite_friends.html.erb:3
 msgid "You can search for user profiles and ask them to become your friends."
-msgstr ""
+msgstr "Você pode procurar pessoas e pedir que elas se tornem suas amigas."
 #: app/views/invite/invite_friends.html.erb:6
 msgid "You can search for user profiles and invite them to join this group."
-msgstr ""
+msgstr "Você pode procurar pessoas e convidá-las a entrar neste grupo."
 #: app/views/invite/invite_friends.html.erb:10
-#, fuzzy
 msgid "Choose person by:"
-msgstr "Escolha um blog:"
+msgstr "Escolha a pessoa por:"
 #: app/views/invite/invite_friends.html.erb:24
 msgid "Type in the person's %{search_fields}"
-msgstr ""
+msgstr "Digite os campos %{search_fields} da pessoa"
 #: app/views/invite/invite_friends.html.erb:28
-#, fuzzy
 msgid "Invite"
-msgstr "Convite"
+msgstr "Convidar"
 #: app/views/invite/invite_friends.html.erb:35
 msgid "Invite people from my e-mail contacts"
@@ -8728,29 +8658,29 @@ msgstr &quot;Ver lista validações de empreendimentos processados&quot;
 #: app/views/user_mailer/profiles_suggestions_email.html.erb:3
 msgid "We want to give you some suggestions to grow up your network."
-msgstr ""
+msgstr "Nós queremos fornecer a você algumas sugestões para ampliar sua rede."
 #: app/views/user_mailer/profiles_suggestions_email.html.erb:4
 msgid "Check it out!"
-msgstr ""
+msgstr "Confira!"
 #: app/views/user_mailer/profiles_suggestions_email.html.erb:7
-#, fuzzy
 msgid "Friends suggestions:"
-msgstr "Sugestão de artigo"
+msgstr "Sugestões de amizades:"
 #: app/views/user_mailer/profiles_suggestions_email.html.erb:14
 msgid "To see the full list of friends suggestions, follow the link: %s"
 msgstr ""
+"Para ver a lista completa de sugestões de amizade, clique neste link: %s"
 #: app/views/user_mailer/profiles_suggestions_email.html.erb:18
-#, fuzzy
 msgid "Communities suggestions:"
-msgstr "Menu de comunidades"
+msgstr "Sugestões de comunidades:"
 #: app/views/user_mailer/profiles_suggestions_email.html.erb:25
 msgid "To see the full list of communities suggestions, follow the link: %s"
 msgstr ""
+"Para ver a lista completa de sugestões de comunidades, clique neste link: %s"
 #: app/views/user_mailer/activation_code.text.erb:3
 #: app/views/user/mailer/activation_code.html.erb:3
@@ -9295,52 +9225,50 @@ msgid &quot;Select Portal Folders&quot;
 msgstr "Selecionar Pastas do Portal"
 #: app/views/admin_panel/set_portal_community.html.erb:21
-#, fuzzy
 msgid "Define news amount on portal"
-msgstr "Definir Quantidade por Pasta"
+msgstr "Definir a quantidade de notícias no portal"
 #: app/views/admin_panel/_signup_welcome_screen.html.erb:2
 msgid ""
 "If you enable this feature on the \"Features\" section of the Administration "
 "Panel, this text will be shown as a welcome message to users after signup."
 msgstr ""
+"Se você ativar esta funcionalidade na seção \"Funcionalidades\" do painel de "
+"administração, este texto será exibido como uma mensagem de boas vindas ao "
+"usuário após se registrar."
 #: app/views/admin_panel/_signup_welcome_screen.html.erb:7
 msgid ""
 "If this content is left blank, the following page will be displayed to the "
 "user:"
 msgstr ""
+"Se este conteúdo ficar em branco, a seguinte página será exibida ao novo "
+"usuário:"
 #: app/views/admin_panel/manage_organizations_status.html.erb:1
-#, fuzzy
 msgid "Manage organizations"
-msgstr "Organização do perfil"
+msgstr "Gerenciar organizações"
 #: app/views/admin_panel/manage_organizations_status.html.erb:7
-#, fuzzy
 msgid "Find profiles"
-msgstr "Perfis aleatórios"
+msgstr "Buscar perfis"
 #: app/views/admin_panel/manage_organizations_status.html.erb:17
-#, fuzzy
 msgid "Filter by: "
-msgstr "Filtro"
+msgstr "Filtrar por: "
 #: app/views/admin_panel/manage_organizations_status.html.erb:44
-#, fuzzy
 msgid "Deactivate"
-msgstr "Desativar usuário"
+msgstr "Desativar"
 #: app/views/admin_panel/manage_organizations_status.html.erb:44
 #: app/views/admin_panel/manage_organizations_status.html.erb:48
-#, fuzzy
 msgid "Do you want to deactivate this profile ?"
-msgstr "Você quer desativar esse usuário?"
+msgstr "Você deseja desativar esse perfil?"
 #: app/views/admin_panel/manage_organizations_status.html.erb:46
-#, fuzzy
 msgid "Do you want to activate this profile ?"
-msgstr "Você quer ativar esse usuário?"
+msgstr "Você deseja ativar esse perfil?"
 #: app/views/admin_panel/set_portal_folders.html.erb:1
 msgid "Select folders"
@@ -9424,34 +9352,28 @@ msgid &quot;Terms of use&quot;
 msgstr "Termos de Uso"
 #: app/views/admin_panel/site_info.html.erb:16
-#, fuzzy
 msgid "Signup welcome email"
-msgstr "Texto de boas vindas no registro"
+msgstr "E-mail de boas vindas após o registro"
 #: app/views/admin_panel/site_info.html.erb:18
-#, fuzzy
 msgid "Signup welcome page"
-msgstr "Texto de boas vindas no registro"
+msgstr "Página de boas vindas após o registro"
 #: app/views/admin_panel/set_portal_news_amount.html.erb:1
-#, fuzzy
 msgid "News amount on portal"
-msgstr "Quantidade de notícias por pasta"
+msgstr "Quantidade de notícias no portal"
 #: app/views/admin_panel/set_portal_news_amount.html.erb:5
-#, fuzzy
 msgid "Number of highlighted news"
-msgstr "Número de notícias"
+msgstr "Quantidade de notícias destacadas"
 #: app/views/admin_panel/set_portal_news_amount.html.erb:6
-#, fuzzy
 msgid "Number of portal news"
-msgstr "Número de notícias"
+msgstr "Quantidade de notícias do portal"
 #: app/views/admin_panel/set_portal_news_amount.html.erb:7
-#, fuzzy
 msgid "Number of news by folder"
-msgstr "Número de notícias"
+msgstr "Quantidade de notícias por pasta"
 #: app/views/admin_panel/index.html.erb:1
 msgid "Administrator Panel"
@@ -9507,9 +9429,8 @@ msgid &quot;Fields&quot;
 msgstr "Campos"
 #: app/views/admin_panel/index.html.erb:23
-#, fuzzy
 msgid "Manage organizations status"
-msgstr "Gerenciar suas tarefas pendentes"
+msgstr "Gerenciar a situação das organizações"
 #: app/views/admin_panel/index.html.erb:39
 msgid "Enterprise-related settings"
@@ -82,7 +82,6 @@ _enable(){
   if [ -d "$available_plugins_dir/$plugin" ]; then
     source="$available_plugins_dir/$plugin"
-    linksource="../../plugins/$plugin"
   else
     if [ ! -d "$plugin" ]; then
       echo "E: $plugin not found (needs to be an existing directory)"
@@ -91,7 +90,6 @@ _enable(){
     # out-of-tree plugins
     source="$plugin"
-    linksource="$source"
     plugin=$(basename "$plugin")
   fi
@@ -114,7 +112,7 @@ _enable(){
       dependencies_file="$source/dependencies.rb"
       if [ -e $source/Gemfile ]; then
         gemfile=$(mktemp --tmpdir=.)
-        cat Gemfile $source/Gemfile > $gemfile
+        cat $NOOSFERO_DIR/Gemfile $source/Gemfile > $gemfile
         if ! RUBYOPT='' BUNDLE_GEMFILE="$gemfile" bundle --local --quiet; then
           dependencies_ok=false
         fi
@@ -125,7 +123,7 @@ _enable(){
       fi
     fi
     if [ "$installation_ok" = true ] && [ "$dependencies_ok" = true ]; then
-      ln -s "$linksource" "$target"
+      ln -s "$source" "$target"
       plugins_public_dir="$NOOSFERO_DIR/public/plugins"
       plugins_features_dir="$NOOSFERO_DIR/features/plugins"
       test -d "$target/public" && ln -s "$target/public" "$plugins_public_dir/$plugin"
@@ -71,11 +71,11 @@ stop_via_pid_file() {
 environments_loop() {
   action="$1"
-  environments=$(find ./config/environments -name *_$RAILS_ENV.rb)
+  environments=$(find ./config/environments -name "*_${RAILS_ENV}.rb")
   if [ "$environments" ]; then
     for environment in $environments; do
       env=$(basename $environment | cut -d. -f1)
-      RAILS_ENV=$env ./script/delayed_job -i $env "$action"
+      RAILS_ENV=$env bundle exec ./script/delayed_job -i $env "$action"
       RAILS_ENV=$env bundle exec ./script/feed-updater "$action" -i $env
     done
   else
@@ -1892,4 +1892,233 @@ class ArticleTest &lt; ActiveSupport::TestCase
     assert_equal p3, article.author_by_version(3)
   end
+  should 'display_filter display only public articles if there is no user' do
+    p = fast_create(Person) 
+    Article.delete_all
+    a = fast_create(Article, :published => true, :profile_id => p.id)
+    fast_create(Article, :published => false, :profile_id => p.id)
+    fast_create(Article, :published => false, :profile_id => p.id)
+    assert_equal [a], Article.display_filter(nil, p)
+  end
+
+  should 'display_filter display public articles for users' do
+    user = create_user('someuser').person
+    p = fast_create(Person) 
+    user.stubs(:has_permission?).with(:view_private_content, p).returns(false)
+    Article.delete_all
+    a = fast_create(Article, :published => true, :profile_id => p.id)
+    fast_create(Article, :published => false, :profile_id => p.id)
+    fast_create(Article, :published => false, :profile_id => p.id)
+    assert_equal [a], Article.display_filter(user, p)
+  end
+
+  should 'display_filter display private article last changed by user' do
+    user = create_user('someuser').person
+    p = fast_create(Person) 
+    user.stubs(:has_permission?).with(:view_private_content, p).returns(false)
+    Article.delete_all
+    a = fast_create(Article, :published => false, :last_changed_by_id => user.id, :profile_id => p.id)
+    fast_create(Article, :published => false, :profile_id => p.id)
+    fast_create(Article, :published => false, :profile_id => p.id)
+    assert_equal [a], Article.display_filter(user, p)
+  end
+
+  should 'display_filter display user private article of his own profile' do
+    user = create_user('someuser').person
+    user.stubs(:has_permission?).with(:view_private_content, user).returns(false)
+    p = fast_create(Person) 
+    Article.delete_all
+    a = fast_create(Article, :published => false, :profile_id => user.id)
+    fast_create(Article, :published => false, :profile_id => p.id)
+    fast_create(Article, :published => false, :profile_id => p.id)
+    assert_equal [a], Article.display_filter(user, user)
+  end
+
+  should 'display_filter show profile private content if the user has view_private_content permission' do
+    user = create_user('someuser').person
+    p = fast_create(Person) 
+    Article.delete_all
+    user.stubs(:has_permission?).with(:view_private_content, p).returns(false)
+    a = fast_create(Article, :published => false, :profile_id => p.id)
+    assert_equal [], Article.display_filter(user, p)
+
+    user.stubs(:has_permission?).with(:view_private_content, p).returns(true)
+    assert_equal [a], Article.display_filter(user, p)
+  end
+
+  should 'display_filter show person private content to friends' do
+    user = create_user('someuser').person
+    p = fast_create(Person)
+    p.add_friend(user)
+    user.stubs(:has_permission?).with(:view_private_content, p).returns(false)
+    Article.delete_all
+    a = fast_create(Article, :published => false, :show_to_followers => true, :profile_id => p.id)
+    fast_create(Article, :published => false, :profile_id => p.id)
+    fast_create(Article, :published => false, :profile_id => p.id)
+    assert_equal [a], Article.display_filter(user, p)
+  end
+
+  should 'display_filter show community private content to members' do
+    user = create_user('someuser').person
+    p = fast_create(Community)
+    p.add_member(user)
+    user.stubs(:has_permission?).with(:view_private_content, p).returns(false)
+    Article.delete_all
+    a = fast_create(Article, :published => false, :show_to_followers => true, :profile_id => p.id)
+    fast_create(Article, :published => false, :profile_id => p.id)
+    fast_create(Article, :published => false, :profile_id => p.id)
+    assert_equal [a], Article.display_filter(user, p)
+  end
+
+  should 'display_filter do not show person private content to non friends' do
+    user = create_user('someuser').person
+    p = fast_create(Person)
+    assert !p.is_a_friend?(user)
+    user.stubs(:has_permission?).with(:view_private_content, p).returns(false)
+    Article.delete_all
+    a = fast_create(Article, :published => false, :show_to_followers => true, :profile_id => p.id)
+    fast_create(Article, :published => false, :profile_id => p.id)
+    fast_create(Article, :published => false, :profile_id => p.id)
+    assert_equal [], Article.display_filter(user, p)
+  end
+
+  should 'display_filter do not show community private content to non members' do
+    user = create_user('someuser').person
+    p = fast_create(Community)
+    assert !user.is_member_of?(p)
+    user.stubs(:has_permission?).with(:view_private_content, p).returns(false)
+    Article.delete_all
+    a = fast_create(Article, :published => false, :show_to_followers => true, :profile_id => p.id)
+    fast_create(Article, :published => false, :profile_id => p.id)
+    fast_create(Article, :published => false, :profile_id => p.id)
+    assert_equal [], Article.display_filter(user, p)
+  end
+
+  should 'display_filter show community public content even it has no followers defined' do
+    user = create_user('someuser').person
+    p = fast_create(Community)
+    assert !user.is_member_of?(p)
+    user.stubs(:has_permission?).with(:view_private_content, p).returns(false)
+    Article.delete_all
+    a = fast_create(Article, :published => true, :show_to_followers => true, :profile_id => p.id)
+    fast_create(Article, :published => false, :profile_id => p.id)
+    fast_create(Article, :published => false, :profile_id => p.id)
+    assert_equal [a], Article.display_filter(user, p)
+  end
+
+  should 'display_filter show person public content even it has no followers defined' do
+    user = create_user('someuser').person
+    p = fast_create(Community)
+    assert !user.is_a_friend?(p)
+    user.stubs(:has_permission?).with(:view_private_content, p).returns(false)
+    Article.delete_all
+    a = fast_create(Article, :published => true, :show_to_followers => true, :profile_id => p.id)
+    fast_create(Article, :published => false, :profile_id => p.id)
+    fast_create(Article, :published => false, :profile_id => p.id)
+    assert_equal [a], Article.display_filter(user, p)
+  end
+
+  should 'display_filter do not show person private content to non friends passing nil as profile parameter' do
+    user = create_user('someuser').person
+    p = fast_create(Person)
+    assert !p.is_a_friend?(user)
+    assert !user.is_admin?
+    Article.delete_all
+    fast_create(Article, :published => false, :profile_id => p.id)
+    assert_equal [], Article.display_filter(user, nil)
+  end
+
+  should 'display_filter do not show community private content to non members passing nil as profile parameter' do
+    user = create_user('someuser').person
+    p = fast_create(Community)
+    assert !user.is_member_of?(p)
+    Article.delete_all
+    fast_create(Article, :published => false, :profile_id => p.id)
+    assert_equal [], Article.display_filter(user, nil)
+  end
+
+  should 'display_filter show community public content of private community for user members' do
+    user = create_user('someuser').person
+    p = fast_create(Community, :public_profile => false)
+    p.add_member(user)
+    assert user.is_member_of?(p)
+    user.stubs(:has_permission?).with(:view_private_content, p).returns(false)
+    Article.delete_all
+    a = fast_create(Article, :published => true, :profile_id => p.id)
+    fast_create(Article, :published => false, :profile_id => p.id)
+    fast_create(Article, :published => false, :profile_id => p.id)
+    assert_equal [a], Article.display_filter(user, p)
+  end
+
+  should 'display_filter not show public content of private community for non members' do
+    user = create_user('someuser').person
+    p = fast_create(Community, :public_profile => false)
+    assert !user.is_member_of?(p)
+    user.stubs(:has_permission?).with(:view_private_content, p).returns(false)
+    Article.delete_all
+    a = fast_create(Article, :published => true, :profile_id => p.id)
+    fast_create(Article, :published => false, :profile_id => p.id)
+    assert_equal [], Article.display_filter(user, p)
+  end
+
+  should 'display_filter not show public content of private community for non members when user is nil' do
+    p = fast_create(Community, :public_profile => false)
+    Article.delete_all
+    a = fast_create(Article, :published => true, :profile_id => p.id)
+    fast_create(Article, :published => false, :profile_id => p.id)
+    assert_equal [], Article.display_filter(nil, p)
+  end
+
+  should 'display_filter show public content for non members when profile is nil' do
+    user = create_user('someuser').person
+    p = fast_create(Community, :public_profile => true)
+    Article.delete_all
+    a1 = fast_create(Article, :published => true, :profile_id => user.id)
+    a2 = fast_create(Article, :published => true, :profile_id => p.id)
+    fast_create(Article, :published => false, :profile_id => p.id)
+    assert_equivalent [a1,a2], Article.display_filter(user, nil)
+  end
+
+  should 'display_filter show person public content of private person profile for user friends' do
+    user = create_user('someuser').person
+    p = fast_create(Person, :public_profile => false)
+    p.add_friend(user)
+    assert p.is_a_friend?(user)
+    user.stubs(:has_permission?).with(:view_private_content, p).returns(false)
+    Article.delete_all
+    a = fast_create(Article, :published => true, :profile_id => p.id)
+    fast_create(Article, :published => false, :profile_id => p.id)
+    fast_create(Article, :published => false, :profile_id => p.id)
+    assert_equal [a], Article.display_filter(user, p)
+  end
+
+  should 'display_filter not show public content of private person for non friends' do
+    user = create_user('someuser').person
+    p = fast_create(Person, :public_profile => false)
+    assert !user.is_a_friend?(p)
+    user.stubs(:has_permission?).with(:view_private_content, p).returns(false)
+    Article.delete_all
+    a = fast_create(Article, :published => true, :profile_id => p.id)
+    fast_create(Article, :published => false, :profile_id => p.id)
+    assert_equal [], Article.display_filter(user, p)
+  end
+
+  should 'display_filter not show public content of private person for non friends when user is nil' do
+    p = fast_create(Person, :public_profile => false)
+    Article.delete_all
+    a = fast_create(Article, :published => true, :profile_id => p.id)
+    fast_create(Article, :published => false, :profile_id => p.id)
+    assert_equal [], Article.display_filter(nil, p)
+  end
+
+  should 'display_filter show public content for non friends when profile is nil' do
+    user = create_user('someuser').person
+    p = fast_create(Person, :public_profile => true)
+    Article.delete_all
+    a1 = fast_create(Article, :published => true, :profile_id => user.id)
+    a2 = fast_create(Article, :published => true, :profile_id => p.id)
+    fast_create(Article, :published => false, :profile_id => p.id)
+    assert_equivalent [a1,a2], Article.display_filter(user, nil)
+  end
+
 end
@@ -1631,4 +1631,9 @@ class PersonTest &lt; ActiveSupport::TestCase
     assert person.can_change_homepage?
   end
+  should 'follow? return false when no profile is passed as parameter' do
+    person = Person.new
+    assert_equal false, person.follows?(nil)
+  end
+
 end
	@@ -221,7 +221,7 @@ class ContentViewerController < ApplicationController		@@ -221,7 +221,7 @@ class ContentViewerController < ApplicationController
221	# relation.	221	# relation.
222	posts = posts.native_translations if blog_with_translation?(@page)	222	posts = posts.native_translations if blog_with_translation?(@page)
223		223
224	- @posts = posts.paginate({ :page => params[:npage], :per_page => @page.posts_per_page }.merge(Article.display_filter(user, profile))).to_a	224	+ @posts = posts.display_filter(user, profile).paginate({ :page => params[:npage], :per_page => @page.posts_per_page }).to_a
225		225
226	if blog_with_translation?(@page)	226	if blog_with_translation?(@page)
227	@posts.replace @posts.map{ \|p\| p.get_translation_to(FastGettext.locale) }.compact	227	@posts.replace @posts.map{ \|p\| p.get_translation_to(FastGettext.locale) }.compact
	@@ -435,6 +435,7 @@ roles] }		@@ -435,6 +435,7 @@ roles] }
435	end	435	end
436		436
437	def follows?(profile)	437	def follows?(profile)
		438	+ return false if profile.nil?
438	profile.followed_by?(self)	439	profile.followed_by?(self)
439	end	440	end
440		441
	@@ -9,7 +9,7 @@ class CustomFormsPluginProfileController < ProfileController		@@ -9,7 +9,7 @@ class CustomFormsPluginProfileController < ProfileController
9	@submission = CustomFormsPlugin::Submission.find_by_form_id_and_profile_id(@form.id,user.id)	9	@submission = CustomFormsPlugin::Submission.find_by_form_id_and_profile_id(@form.id,user.id)
10	@submission \|\|= CustomFormsPlugin::Submission.new(:form => @form, :profile => user)	10	@submission \|\|= CustomFormsPlugin::Submission.new(:form => @form, :profile => user)
11	else	11	else
12	- @submission = CustomFormsPlugin::Submission.new(:form => @for)	12	+ @submission = CustomFormsPlugin::Submission.new(:form => @form)
13	end	13	end
14		14
15	# build the answers	15	# build the answers
	@@ -29,6 +29,17 @@ class CustomFormsPluginProfileControllerTest < ActionController::TestCase		@@ -29,6 +29,17 @@ class CustomFormsPluginProfileControllerTest < ActionController::TestCase
29	assert_redirected_to :action => 'show'	29	assert_redirected_to :action => 'show'
30	end	30	end
31		31
		32	+ should 'save submission if fields are ok and user is not logged in' do
		33	+ logout
		34	+ form = CustomFormsPlugin::Form.create!(:profile => profile, :name => 'Free Software')
		35	+ field = CustomFormsPlugin::TextField.create(:name => 'Name', :form => form)
		36	+
		37	+ assert_difference 'CustomFormsPlugin::Submission.count', 1 do
		38	+ post :show, :profile => profile.identifier, :id => form.id, :author_name => "john", :author_email => 'john@example.com', :submission => {field.id.to_s => 'Noosfero'}
		39	+ end
		40	+ assert_redirected_to :action => 'show'
		41	+ end
		42	+
32	should 'disable fields if form expired' do	43	should 'disable fields if form expired' do
33	form = CustomFormsPlugin::Form.create!(:profile => profile, :name => 'Free Software', :begining => Time.now + 1.day)	44	form = CustomFormsPlugin::Form.create!(:profile => profile, :name => 'Free Software', :begining => Time.now + 1.day)
34	form.fields << CustomFormsPlugin::TextField.create(:name => 'Field Name', :form => form, :default_value => "First Field")	45	form.fields << CustomFormsPlugin::TextField.create(:name => 'Field Name', :form => form, :default_value => "First Field")
	@@ -5,7 +5,7 @@ class Profile		@@ -5,7 +5,7 @@ class Profile
5	metadata_spec namespace: :og, tags: {	5	metadata_spec namespace: :og, tags: {
6	type: MetadataPlugin.og_types[:profile] \|\| :profile,	6	type: MetadataPlugin.og_types[:profile] \|\| :profile,
7	image: proc{ \|p, plugin\| "#{p.environment.top_url}#{p.image.public_filename}" if p.image },	7	image: proc{ \|p, plugin\| "#{p.environment.top_url}#{p.image.public_filename}" if p.image },
8	- title: proc{ \|p, plugin\| p.nickname \|\| p.name },	8	+ title: proc{ \|p, plugin\| if p.nickname.present? then p.nickname else p.name end },
9	url: proc do \|p, plugin\|	9	url: proc do \|p, plugin\|
10	#force profile identifier for custom domains and fixed host. see og_url_for	10	#force profile identifier for custom domains and fixed host. see og_url_for
11	plugin.og_url_for p.url.merge(profile: p.identifier)	11	plugin.og_url_for p.url.merge(profile: p.identifier)
	@@ -71,11 +71,11 @@ stop_via_pid_file() {		@@ -71,11 +71,11 @@ stop_via_pid_file() {
71		71
72	environments_loop() {	72	environments_loop() {
73	action="$1"	73	action="$1"
74	- environments=$(find ./config/environments -name *_$RAILS_ENV.rb)	74	+ environments=$(find ./config/environments -name "*_${RAILS_ENV}.rb")
75	if [ "$environments" ]; then	75	if [ "$environments" ]; then
76	for environment in $environments; do	76	for environment in $environments; do
77	env=$(basename $environment \| cut -d. -f1)	77	env=$(basename $environment \| cut -d. -f1)
78	- RAILS_ENV=$env ./script/delayed_job -i $env "$action"	78	+ RAILS_ENV=$env bundle exec ./script/delayed_job -i $env "$action"
79	RAILS_ENV=$env bundle exec ./script/feed-updater "$action" -i $env	79	RAILS_ENV=$env bundle exec ./script/feed-updater "$action" -i $env
80	done	80	done
81	else	81	else
	@@ -1892,4 +1892,233 @@ class ArticleTest < ActiveSupport::TestCase		@@ -1892,4 +1892,233 @@ class ArticleTest < ActiveSupport::TestCase
1892	assert_equal p3, article.author_by_version(3)	1892	assert_equal p3, article.author_by_version(3)
1893	end	1893	end
1894		1894
		1895	+ should 'display_filter display only public articles if there is no user' do
		1896	+ p = fast_create(Person)
		1897	+ Article.delete_all
		1898	+ a = fast_create(Article, :published => true, :profile_id => p.id)
		1899	+ fast_create(Article, :published => false, :profile_id => p.id)
		1900	+ fast_create(Article, :published => false, :profile_id => p.id)
		1901	+ assert_equal [a], Article.display_filter(nil, p)
		1902	+ end
		1903	+
		1904	+ should 'display_filter display public articles for users' do
		1905	+ user = create_user('someuser').person
		1906	+ p = fast_create(Person)
		1907	+ user.stubs(:has_permission?).with(:view_private_content, p).returns(false)
		1908	+ Article.delete_all
		1909	+ a = fast_create(Article, :published => true, :profile_id => p.id)
		1910	+ fast_create(Article, :published => false, :profile_id => p.id)
		1911	+ fast_create(Article, :published => false, :profile_id => p.id)
		1912	+ assert_equal [a], Article.display_filter(user, p)
		1913	+ end
		1914	+
		1915	+ should 'display_filter display private article last changed by user' do
		1916	+ user = create_user('someuser').person
		1917	+ p = fast_create(Person)
		1918	+ user.stubs(:has_permission?).with(:view_private_content, p).returns(false)
		1919	+ Article.delete_all
		1920	+ a = fast_create(Article, :published => false, :last_changed_by_id => user.id, :profile_id => p.id)
		1921	+ fast_create(Article, :published => false, :profile_id => p.id)
		1922	+ fast_create(Article, :published => false, :profile_id => p.id)
		1923	+ assert_equal [a], Article.display_filter(user, p)
		1924	+ end
		1925	+
		1926	+ should 'display_filter display user private article of his own profile' do
		1927	+ user = create_user('someuser').person
		1928	+ user.stubs(:has_permission?).with(:view_private_content, user).returns(false)
		1929	+ p = fast_create(Person)
		1930	+ Article.delete_all
		1931	+ a = fast_create(Article, :published => false, :profile_id => user.id)
		1932	+ fast_create(Article, :published => false, :profile_id => p.id)
		1933	+ fast_create(Article, :published => false, :profile_id => p.id)
		1934	+ assert_equal [a], Article.display_filter(user, user)
		1935	+ end
		1936	+
		1937	+ should 'display_filter show profile private content if the user has view_private_content permission' do
		1938	+ user = create_user('someuser').person
		1939	+ p = fast_create(Person)
		1940	+ Article.delete_all
		1941	+ user.stubs(:has_permission?).with(:view_private_content, p).returns(false)
		1942	+ a = fast_create(Article, :published => false, :profile_id => p.id)
		1943	+ assert_equal [], Article.display_filter(user, p)
		1944	+
		1945	+ user.stubs(:has_permission?).with(:view_private_content, p).returns(true)
		1946	+ assert_equal [a], Article.display_filter(user, p)
		1947	+ end
		1948	+
		1949	+ should 'display_filter show person private content to friends' do
		1950	+ user = create_user('someuser').person
		1951	+ p = fast_create(Person)
		1952	+ p.add_friend(user)
		1953	+ user.stubs(:has_permission?).with(:view_private_content, p).returns(false)
		1954	+ Article.delete_all
		1955	+ a = fast_create(Article, :published => false, :show_to_followers => true, :profile_id => p.id)
		1956	+ fast_create(Article, :published => false, :profile_id => p.id)
		1957	+ fast_create(Article, :published => false, :profile_id => p.id)
		1958	+ assert_equal [a], Article.display_filter(user, p)
		1959	+ end
		1960	+
		1961	+ should 'display_filter show community private content to members' do
		1962	+ user = create_user('someuser').person
		1963	+ p = fast_create(Community)
		1964	+ p.add_member(user)
		1965	+ user.stubs(:has_permission?).with(:view_private_content, p).returns(false)
		1966	+ Article.delete_all
		1967	+ a = fast_create(Article, :published => false, :show_to_followers => true, :profile_id => p.id)
		1968	+ fast_create(Article, :published => false, :profile_id => p.id)
		1969	+ fast_create(Article, :published => false, :profile_id => p.id)
		1970	+ assert_equal [a], Article.display_filter(user, p)
		1971	+ end
		1972	+
		1973	+ should 'display_filter do not show person private content to non friends' do
		1974	+ user = create_user('someuser').person
		1975	+ p = fast_create(Person)
		1976	+ assert !p.is_a_friend?(user)
		1977	+ user.stubs(:has_permission?).with(:view_private_content, p).returns(false)
		1978	+ Article.delete_all
		1979	+ a = fast_create(Article, :published => false, :show_to_followers => true, :profile_id => p.id)
		1980	+ fast_create(Article, :published => false, :profile_id => p.id)
		1981	+ fast_create(Article, :published => false, :profile_id => p.id)
		1982	+ assert_equal [], Article.display_filter(user, p)
		1983	+ end
		1984	+
		1985	+ should 'display_filter do not show community private content to non members' do
		1986	+ user = create_user('someuser').person
		1987	+ p = fast_create(Community)
		1988	+ assert !user.is_member_of?(p)
		1989	+ user.stubs(:has_permission?).with(:view_private_content, p).returns(false)
		1990	+ Article.delete_all
		1991	+ a = fast_create(Article, :published => false, :show_to_followers => true, :profile_id => p.id)
		1992	+ fast_create(Article, :published => false, :profile_id => p.id)
		1993	+ fast_create(Article, :published => false, :profile_id => p.id)
		1994	+ assert_equal [], Article.display_filter(user, p)
		1995	+ end
		1996	+
		1997	+ should 'display_filter show community public content even it has no followers defined' do
		1998	+ user = create_user('someuser').person
		1999	+ p = fast_create(Community)
		2000	+ assert !user.is_member_of?(p)
		2001	+ user.stubs(:has_permission?).with(:view_private_content, p).returns(false)
		2002	+ Article.delete_all
		2003	+ a = fast_create(Article, :published => true, :show_to_followers => true, :profile_id => p.id)
		2004	+ fast_create(Article, :published => false, :profile_id => p.id)
		2005	+ fast_create(Article, :published => false, :profile_id => p.id)
		2006	+ assert_equal [a], Article.display_filter(user, p)
		2007	+ end
		2008	+
		2009	+ should 'display_filter show person public content even it has no followers defined' do
		2010	+ user = create_user('someuser').person
		2011	+ p = fast_create(Community)
		2012	+ assert !user.is_a_friend?(p)
		2013	+ user.stubs(:has_permission?).with(:view_private_content, p).returns(false)
		2014	+ Article.delete_all
		2015	+ a = fast_create(Article, :published => true, :show_to_followers => true, :profile_id => p.id)
		2016	+ fast_create(Article, :published => false, :profile_id => p.id)
		2017	+ fast_create(Article, :published => false, :profile_id => p.id)
		2018	+ assert_equal [a], Article.display_filter(user, p)
		2019	+ end
		2020	+
		2021	+ should 'display_filter do not show person private content to non friends passing nil as profile parameter' do
		2022	+ user = create_user('someuser').person
		2023	+ p = fast_create(Person)
		2024	+ assert !p.is_a_friend?(user)
		2025	+ assert !user.is_admin?
		2026	+ Article.delete_all
		2027	+ fast_create(Article, :published => false, :profile_id => p.id)
		2028	+ assert_equal [], Article.display_filter(user, nil)
		2029	+ end
		2030	+
		2031	+ should 'display_filter do not show community private content to non members passing nil as profile parameter' do
		2032	+ user = create_user('someuser').person
		2033	+ p = fast_create(Community)
		2034	+ assert !user.is_member_of?(p)
		2035	+ Article.delete_all
		2036	+ fast_create(Article, :published => false, :profile_id => p.id)
		2037	+ assert_equal [], Article.display_filter(user, nil)
		2038	+ end
		2039	+
		2040	+ should 'display_filter show community public content of private community for user members' do
		2041	+ user = create_user('someuser').person
		2042	+ p = fast_create(Community, :public_profile => false)
		2043	+ p.add_member(user)
		2044	+ assert user.is_member_of?(p)
		2045	+ user.stubs(:has_permission?).with(:view_private_content, p).returns(false)
		2046	+ Article.delete_all
		2047	+ a = fast_create(Article, :published => true, :profile_id => p.id)
		2048	+ fast_create(Article, :published => false, :profile_id => p.id)
		2049	+ fast_create(Article, :published => false, :profile_id => p.id)
		2050	+ assert_equal [a], Article.display_filter(user, p)
		2051	+ end
		2052	+
		2053	+ should 'display_filter not show public content of private community for non members' do
		2054	+ user = create_user('someuser').person
		2055	+ p = fast_create(Community, :public_profile => false)
		2056	+ assert !user.is_member_of?(p)
		2057	+ user.stubs(:has_permission?).with(:view_private_content, p).returns(false)
		2058	+ Article.delete_all
		2059	+ a = fast_create(Article, :published => true, :profile_id => p.id)
		2060	+ fast_create(Article, :published => false, :profile_id => p.id)
		2061	+ assert_equal [], Article.display_filter(user, p)
		2062	+ end
		2063	+
		2064	+ should 'display_filter not show public content of private community for non members when user is nil' do
		2065	+ p = fast_create(Community, :public_profile => false)
		2066	+ Article.delete_all
		2067	+ a = fast_create(Article, :published => true, :profile_id => p.id)
		2068	+ fast_create(Article, :published => false, :profile_id => p.id)
		2069	+ assert_equal [], Article.display_filter(nil, p)
		2070	+ end
		2071	+
		2072	+ should 'display_filter show public content for non members when profile is nil' do
		2073	+ user = create_user('someuser').person
		2074	+ p = fast_create(Community, :public_profile => true)
		2075	+ Article.delete_all
		2076	+ a1 = fast_create(Article, :published => true, :profile_id => user.id)
		2077	+ a2 = fast_create(Article, :published => true, :profile_id => p.id)
		2078	+ fast_create(Article, :published => false, :profile_id => p.id)
		2079	+ assert_equivalent [a1,a2], Article.display_filter(user, nil)
		2080	+ end
		2081	+
		2082	+ should 'display_filter show person public content of private person profile for user friends' do
		2083	+ user = create_user('someuser').person
		2084	+ p = fast_create(Person, :public_profile => false)
		2085	+ p.add_friend(user)
		2086	+ assert p.is_a_friend?(user)
		2087	+ user.stubs(:has_permission?).with(:view_private_content, p).returns(false)
		2088	+ Article.delete_all
		2089	+ a = fast_create(Article, :published => true, :profile_id => p.id)
		2090	+ fast_create(Article, :published => false, :profile_id => p.id)
		2091	+ fast_create(Article, :published => false, :profile_id => p.id)
		2092	+ assert_equal [a], Article.display_filter(user, p)
		2093	+ end
		2094	+
		2095	+ should 'display_filter not show public content of private person for non friends' do
		2096	+ user = create_user('someuser').person
		2097	+ p = fast_create(Person, :public_profile => false)
		2098	+ assert !user.is_a_friend?(p)
		2099	+ user.stubs(:has_permission?).with(:view_private_content, p).returns(false)
		2100	+ Article.delete_all
		2101	+ a = fast_create(Article, :published => true, :profile_id => p.id)
		2102	+ fast_create(Article, :published => false, :profile_id => p.id)
		2103	+ assert_equal [], Article.display_filter(user, p)
		2104	+ end
		2105	+
		2106	+ should 'display_filter not show public content of private person for non friends when user is nil' do
		2107	+ p = fast_create(Person, :public_profile => false)
		2108	+ Article.delete_all
		2109	+ a = fast_create(Article, :published => true, :profile_id => p.id)
		2110	+ fast_create(Article, :published => false, :profile_id => p.id)
		2111	+ assert_equal [], Article.display_filter(nil, p)
		2112	+ end
		2113	+
		2114	+ should 'display_filter show public content for non friends when profile is nil' do
		2115	+ user = create_user('someuser').person
		2116	+ p = fast_create(Person, :public_profile => true)
		2117	+ Article.delete_all
		2118	+ a1 = fast_create(Article, :published => true, :profile_id => user.id)
		2119	+ a2 = fast_create(Article, :published => true, :profile_id => p.id)
		2120	+ fast_create(Article, :published => false, :profile_id => p.id)
		2121	+ assert_equivalent [a1,a2], Article.display_filter(user, nil)
		2122	+ end
		2123	+
1895	end	2124	end
	@@ -1631,4 +1631,9 @@ class PersonTest < ActiveSupport::TestCase		@@ -1631,4 +1631,9 @@ class PersonTest < ActiveSupport::TestCase
1631	assert person.can_change_homepage?	1631	assert person.can_change_homepage?
1632	end	1632	end
1633		1633
		1634	+ should 'follow? return false when no profile is passed as parameter' do
		1635	+ person = Person.new
		1636	+ assert_equal false, person.follows?(nil)
		1637	+ end
		1638	+
1634	end	1639	end