Commit 54002230194b306ec1419556e6d2e96713ea5b18
Exists in
master
and in
29 other branches
Merge branch 'master' into P398-main-block-should-not-be-invible
Showing
19 changed files
with
475 additions
and
322 deletions
Show diff stats
app/controllers/public/content_viewer_controller.rb
... | ... | @@ -221,7 +221,7 @@ class ContentViewerController < ApplicationController |
221 | 221 | # relation. |
222 | 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 | 226 | if blog_with_translation?(@page) |
227 | 227 | @posts.replace @posts.map{ |p| p.get_translation_to(FastGettext.locale) }.compact | ... | ... |
app/models/article.rb
... | ... | @@ -486,15 +486,18 @@ class Article < ActiveRecord::Base |
486 | 486 | scope :more_comments, :order => "comments_count DESC" |
487 | 487 | scope :more_recent, :order => "created_at DESC" |
488 | 488 | |
489 | - def self.display_filter(user, profile) | |
490 | - return {:conditions => ['articles.published = ?', true]} if !user | |
491 | - {:conditions => [" articles.published = ? OR | |
492 | - articles.last_changed_by_id = ? OR | |
493 | - articles.profile_id = ? OR | |
494 | - ? OR articles.show_to_followers = ? AND ?", | |
495 | - true, user.id, user.id, user.has_permission?(:view_private_content, profile), | |
496 | - true, user.follows?(profile)]} | |
497 | - end | |
489 | + scope :display_filter, lambda {|user, profile| | |
490 | + return published if (user.nil? && profile && profile.public?) | |
491 | + return [] if user.nil? || (profile && !profile.public? && !user.follows?(profile)) | |
492 | + where( | |
493 | + [ | |
494 | + "published = ? OR last_changed_by_id = ? OR profile_id = ? OR ? | |
495 | + OR (show_to_followers = ? AND ?)", true, user.id, user.id, | |
496 | + profile.nil? ? false : user.has_permission?(:view_private_content, profile), | |
497 | + true, user.follows?(profile) | |
498 | + ] | |
499 | + ) | |
500 | + } | |
498 | 501 | |
499 | 502 | |
500 | 503 | def display_unpublished_article_to?(user) | ... | ... |
app/models/person.rb
plugins/container_block/public/container_block.js
1 | 1 | function enableMoveContainerChildren(container, box) { |
2 | 2 | var div = jQuery('#box-'+box+' > .block-outer > .block'); |
3 | 3 | if(!div.is('.ui-resizable')) { |
4 | + div.removeClass('ui-draggable'); | |
4 | 5 | div.resizable({ |
5 | 6 | handles: 'e, w', |
6 | 7 | containment: '#block-'+container+' .block-inner-2', |
... | ... | @@ -14,6 +15,7 @@ function enableMoveContainerChildren(container, box) { |
14 | 15 | function disableMoveContainerChildren(container, box) { |
15 | 16 | var div = jQuery('#box-'+box+' > .block-outer > .block'); |
16 | 17 | if(div.is('.ui-resizable')) { |
18 | + div.addClass('ui-draggable'); | |
17 | 19 | div.resizable('destroy'); |
18 | 20 | } |
19 | 21 | } | ... | ... |
plugins/custom_forms/controllers/custom_forms_plugin_profile_controller.rb
... | ... | @@ -9,7 +9,7 @@ class CustomFormsPluginProfileController < ProfileController |
9 | 9 | @submission = CustomFormsPlugin::Submission.find_by_form_id_and_profile_id(@form.id,user.id) |
10 | 10 | @submission ||= CustomFormsPlugin::Submission.new(:form => @form, :profile => user) |
11 | 11 | else |
12 | - @submission = CustomFormsPlugin::Submission.new(:form => @for) | |
12 | + @submission = CustomFormsPlugin::Submission.new(:form => @form) | |
13 | 13 | end |
14 | 14 | |
15 | 15 | # build the answers | ... | ... |
plugins/custom_forms/po/pt/custom_forms.po
... | ... | @@ -13,8 +13,8 @@ msgid "" |
13 | 13 | msgstr "" |
14 | 14 | "Project-Id-Version: 1.0-690-gcb6e853\n" |
15 | 15 | "POT-Creation-Date: 2015-03-05 12:10-0300\n" |
16 | -"PO-Revision-Date: 2015-03-09 09:51+0200\n" | |
17 | -"Last-Translator: Michal Čihař <michal@cihar.com>\n" | |
16 | +"PO-Revision-Date: 2015-03-12 15:13+0200\n" | |
17 | +"Last-Translator: daniel <dtygel@eita.org.br>\n" | |
18 | 18 | "Language-Team: Portuguese <https://hosted.weblate.org/projects/noosfero" |
19 | 19 | "/plugin-custom-forms/pt/>\n" |
20 | 20 | "Language: pt\n" |
... | ... | @@ -133,11 +133,11 @@ msgstr "Gerenciar Formulários" |
133 | 133 | |
134 | 134 | #: plugins/custom_forms/controllers/custom_forms_plugin_myprofile_controller.rb:26 |
135 | 135 | msgid "Custom form %s was successfully created." |
136 | -msgstr "\"O formulário %s foi criado com sucesso.\"" | |
136 | +msgstr "O formulário %s foi criado com sucesso." | |
137 | 137 | |
138 | 138 | #: plugins/custom_forms/controllers/custom_forms_plugin_myprofile_controller.rb:46 |
139 | 139 | msgid "Custom form %s was successfully updated." |
140 | -msgstr "O formulário personalizado %s foi atualizado com sucesso" | |
140 | +msgstr "O formulário personalizado %s foi atualizado com sucesso." | |
141 | 141 | |
142 | 142 | #: plugins/custom_forms/controllers/custom_forms_plugin_myprofile_controller.rb:49 |
143 | 143 | msgid "Form could not be updated" | ... | ... |
plugins/custom_forms/test/functional/custom_forms_plugin_profile_controller_test.rb
... | ... | @@ -29,6 +29,17 @@ class CustomFormsPluginProfileControllerTest < ActionController::TestCase |
29 | 29 | assert_redirected_to :action => 'show' |
30 | 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 | 43 | should 'disable fields if form expired' do |
33 | 44 | form = CustomFormsPlugin::Form.create!(:profile => profile, :name => 'Free Software', :begining => Time.now + 1.day) |
34 | 45 | form.fields << CustomFormsPlugin::TextField.create(:name => 'Field Name', :form => form, :default_value => "First Field") | ... | ... |
plugins/display_content/po/pt/display_content.po
... | ... | @@ -13,8 +13,8 @@ msgid "" |
13 | 13 | msgstr "" |
14 | 14 | "Project-Id-Version: 1.0-690-gcb6e853\n" |
15 | 15 | "POT-Creation-Date: 2015-03-05 12:09-0300\n" |
16 | -"PO-Revision-Date: 2015-02-23 11:38+0200\n" | |
17 | -"Last-Translator: Michal Čihař <michal@cihar.com>\n" | |
16 | +"PO-Revision-Date: 2015-03-12 15:14+0200\n" | |
17 | +"Last-Translator: daniel <dtygel@eita.org.br>\n" | |
18 | 18 | "Language-Team: Portuguese <https://hosted.weblate.org/projects/noosfero" |
19 | 19 | "/plugin-display-content/pt/>\n" |
20 | 20 | "Language: pt\n" |
... | ... | @@ -91,15 +91,15 @@ msgstr "Escolha pelo Tipo de conteúdo" |
91 | 91 | |
92 | 92 | #: plugins/display_content/views/box_organizer/_display_content_block.html.erb:28 |
93 | 93 | msgid "Order by:" |
94 | -msgstr "" | |
94 | +msgstr "Ordenar por:" | |
95 | 95 | |
96 | 96 | #: plugins/display_content/views/box_organizer/_display_content_block.html.erb:29 |
97 | 97 | msgid "Most recent" |
98 | -msgstr "" | |
98 | +msgstr "Mais recentes" | |
99 | 99 | |
100 | 100 | #: plugins/display_content/views/box_organizer/_display_content_block.html.erb:30 |
101 | 101 | msgid "Most oldest" |
102 | -msgstr "" | |
102 | +msgstr "Mais antigas" | |
103 | 103 | |
104 | 104 | #: plugins/display_content/views/box_organizer/_choose_by_content_type.html.erb:1 |
105 | 105 | msgid "Display content types:" |
... | ... | @@ -115,4 +115,4 @@ msgstr "Carregar dinamicamente filhos das pastas selecionadas" |
115 | 115 | |
116 | 116 | #: plugins/display_content/views/box_organizer/_choose_directly.html.erb:9 |
117 | 117 | msgid "Limit:" |
118 | -msgstr "" | |
118 | +msgstr "Limite:" | ... | ... |
plugins/metadata/lib/ext/profile.rb
... | ... | @@ -5,7 +5,7 @@ class Profile |
5 | 5 | metadata_spec namespace: :og, tags: { |
6 | 6 | type: MetadataPlugin.og_types[:profile] || :profile, |
7 | 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 | 9 | url: proc do |p, plugin| |
10 | 10 | #force profile identifier for custom domains and fixed host. see og_url_for |
11 | 11 | plugin.og_url_for p.url.merge(profile: p.identifier) | ... | ... |
plugins/people_block/po/pt/people_block.po
... | ... | @@ -13,16 +13,16 @@ msgid "" |
13 | 13 | msgstr "" |
14 | 14 | "Project-Id-Version: 1.0-690-gcb6e853\n" |
15 | 15 | "POT-Creation-Date: 2015-03-05 12:09-0300\n" |
16 | -"PO-Revision-Date: 2014-12-18 18:40-0200\n" | |
17 | -"Last-Translator: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>\n" | |
18 | -"Language-Team: Portuguese <https://hosted.weblate.org/projects/noosfero/" | |
19 | -"noosfero/pt/>\n" | |
16 | +"PO-Revision-Date: 2015-03-12 14:41+0200\n" | |
17 | +"Last-Translator: daniel <dtygel@eita.org.br>\n" | |
18 | +"Language-Team: Portuguese <https://hosted.weblate.org/projects/noosfero" | |
19 | +"/plugin-people-block/pt/>\n" | |
20 | 20 | "Language: pt\n" |
21 | 21 | "MIME-Version: 1.0\n" |
22 | 22 | "Content-Type: text/plain; charset=UTF-8\n" |
23 | 23 | "Content-Transfer-Encoding: 8bit\n" |
24 | 24 | "Plural-Forms: nplurals=2; plural=n != 1;\n" |
25 | -"X-Generator: Weblate 2.0\n" | |
25 | +"X-Generator: Weblate 2.3-dev\n" | |
26 | 26 | |
27 | 27 | #: plugins/people_block/lib/friends_block.rb:8 |
28 | 28 | msgid "Clicking a friend takes you to his/her homepage" |
... | ... | @@ -77,8 +77,8 @@ msgstr "Ver todos" |
77 | 77 | |
78 | 78 | #: plugins/people_block/views/blocks/friends.html.erb:5 |
79 | 79 | msgid "Some suggestions for you" |
80 | -msgstr "" | |
80 | +msgstr "Algumas sugestões para você" | |
81 | 81 | |
82 | 82 | #: plugins/people_block/views/blocks/friends.html.erb:10 |
83 | 83 | msgid "See all suggestions" |
84 | -msgstr "" | |
84 | +msgstr "Veja todas as sugestões" | ... | ... |
plugins/remote_user/lib/remote_user_plugin.rb
... | ... | @@ -16,10 +16,7 @@ class RemoteUserPlugin < Noosfero::Plugin |
16 | 16 | user_data = request.env['HTTP_REMOTE_USER_DATA'] |
17 | 17 | |
18 | 18 | if remote_user.blank? |
19 | - if logged_in? | |
20 | - self.current_user.forget_me | |
21 | - reset_session | |
22 | - end | |
19 | + self.current_user = nil | |
23 | 20 | else |
24 | 21 | if user_data.blank? |
25 | 22 | remote_user_email = remote_user + '@remote.user' | ... | ... |
plugins/statistics/po/pt/statistics.po
... | ... | @@ -13,16 +13,16 @@ msgid "" |
13 | 13 | msgstr "" |
14 | 14 | "Project-Id-Version: 1.0-690-gcb6e853\n" |
15 | 15 | "POT-Creation-Date: 2015-03-05 12:09-0300\n" |
16 | -"PO-Revision-Date: 2014-12-18 18:40-0200\n" | |
17 | -"Last-Translator: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>\n" | |
18 | -"Language-Team: Portuguese <https://hosted.weblate.org/projects/noosfero/" | |
19 | -"noosfero/pt/>\n" | |
16 | +"PO-Revision-Date: 2015-03-12 15:11+0200\n" | |
17 | +"Last-Translator: daniel <dtygel@eita.org.br>\n" | |
18 | +"Language-Team: Portuguese <https://hosted.weblate.org/projects/noosfero" | |
19 | +"/plugin-statistics/pt/>\n" | |
20 | 20 | "Language: pt\n" |
21 | 21 | "MIME-Version: 1.0\n" |
22 | 22 | "Content-Type: text/plain; charset=UTF-8\n" |
23 | 23 | "Content-Transfer-Encoding: 8bit\n" |
24 | 24 | "Plural-Forms: nplurals=2; plural=n != 1;\n" |
25 | -"X-Generator: Weblate 2.0\n" | |
25 | +"X-Generator: Weblate 2.3-dev\n" | |
26 | 26 | |
27 | 27 | #: plugins/statistics/lib/statistics_block.rb:24 |
28 | 28 | msgid "Statistics for %s" |
... | ... | @@ -30,51 +30,50 @@ msgstr "Estatísticas para %s" |
30 | 30 | |
31 | 31 | #: plugins/statistics/lib/statistics_block.rb:46 |
32 | 32 | msgid "This block presents some statistics about your context." |
33 | -msgstr "Este bloco apresenta algumas estatísticas sobre seu contexto." | |
33 | +msgstr "Este bloco apresenta algumas estatísticas sobre seu portal." | |
34 | 34 | |
35 | 35 | #: plugins/statistics/lib/statistics_plugin.rb:10 |
36 | 36 | msgid "" |
37 | 37 | "A plugin that adds a block where you can see statistics of it's context." |
38 | 38 | msgstr "" |
39 | 39 | "Um plugin que adiciona um bloco onde você pode ver estatísticas do seu " |
40 | -"contexto." | |
40 | +"portal." | |
41 | 41 | |
42 | 42 | #: plugins/statistics/views/box_organizer/_statistics_block.html.erb:1 |
43 | 43 | msgid "Show user counter" |
44 | -msgstr "Mostrar contador de usuário" | |
44 | +msgstr "Mostrar quantidade de usuários" | |
45 | 45 | |
46 | 46 | #: plugins/statistics/views/box_organizer/_statistics_block.html.erb:4 |
47 | 47 | msgid "Show community counter" |
48 | -msgstr "Mostrar contador de comunidade" | |
48 | +msgstr "Mostrar quantidade de comunidades" | |
49 | 49 | |
50 | 50 | #: plugins/statistics/views/box_organizer/_statistics_block.html.erb:8 |
51 | 51 | msgid "Show enterprise counter" |
52 | -msgstr "Mostrar contador de empreendimento" | |
52 | +msgstr "Mostrar quantidade de empreendimentos solidários" | |
53 | 53 | |
54 | 54 | #: plugins/statistics/views/box_organizer/_statistics_block.html.erb:12 |
55 | -#, fuzzy | |
56 | 55 | msgid "Show product counter" |
57 | -msgstr "Mostrar contador de acesso" | |
56 | +msgstr "Mostrar quantidade de produtos" | |
58 | 57 | |
59 | 58 | #: plugins/statistics/views/box_organizer/_statistics_block.html.erb:16 |
60 | 59 | msgid "Show category counter" |
61 | -msgstr "Mostrar contador de categoria" | |
60 | +msgstr "Mostrar quantidade de categorias" | |
62 | 61 | |
63 | 62 | #: plugins/statistics/views/box_organizer/_statistics_block.html.erb:20 |
64 | 63 | msgid "Show tag counter" |
65 | -msgstr "Mostrar contador de tag" | |
64 | +msgstr "Mostrar quantidade de tags" | |
66 | 65 | |
67 | 66 | #: plugins/statistics/views/box_organizer/_statistics_block.html.erb:24 |
68 | 67 | msgid "Show comment counter" |
69 | -msgstr "Mostrar contador de comentário" | |
68 | +msgstr "Mostrar quantidade de comentários" | |
70 | 69 | |
71 | 70 | #: plugins/statistics/views/box_organizer/_statistics_block.html.erb:28 |
72 | 71 | msgid "Show hit counter" |
73 | -msgstr "Mostrar contador de acesso" | |
72 | +msgstr "Mostrar quantidade de acessos" | |
74 | 73 | |
75 | 74 | #: plugins/statistics/views/box_organizer/_statistics_block.html.erb:34 |
76 | 75 | msgid "Show counter for communities with template %s" |
77 | -msgstr "Mostrar contador para comunidades com template %s" | |
76 | +msgstr "Mostrar quantidade de comunidades com tema %s" | |
78 | 77 | |
79 | 78 | #: plugins/statistics/views/statistics_block.html.erb:7 |
80 | 79 | msgid "users" |
... | ... | @@ -86,7 +85,7 @@ msgstr "empreendimentos" |
86 | 85 | |
87 | 86 | #: plugins/statistics/views/statistics_block.html.erb:13 |
88 | 87 | msgid "products" |
89 | -msgstr "" | |
88 | +msgstr "produtos" | |
90 | 89 | |
91 | 90 | #: plugins/statistics/views/statistics_block.html.erb:16 |
92 | 91 | msgid "communities" | ... | ... |
plugins/work_assignment/po/pt/work_assignment.po
... | ... | @@ -13,8 +13,8 @@ msgid "" |
13 | 13 | msgstr "" |
14 | 14 | "Project-Id-Version: 1.0-690-gcb6e853\n" |
15 | 15 | "POT-Creation-Date: 2015-03-05 12:09-0300\n" |
16 | -"PO-Revision-Date: 2015-02-23 11:34+0200\n" | |
17 | -"Last-Translator: Michal Čihař <michal@cihar.com>\n" | |
16 | +"PO-Revision-Date: 2015-03-12 15:18+0200\n" | |
17 | +"Last-Translator: daniel <dtygel@eita.org.br>\n" | |
18 | 18 | "Language-Team: Portuguese <https://hosted.weblate.org/projects/noosfero" |
19 | 19 | "/plugin-work-assignment/pt/>\n" |
20 | 20 | "Language: pt\n" |
... | ... | @@ -30,11 +30,11 @@ msgstr "Novo tipo de conteúdo para organizações." |
30 | 30 | |
31 | 31 | #: plugins/work_assignment/lib/work_assignment_plugin.rb:62 |
32 | 32 | msgid "Notification successfully sent" |
33 | -msgstr "" | |
33 | +msgstr "Notificação enviada com sucesso" | |
34 | 34 | |
35 | 35 | #: plugins/work_assignment/lib/work_assignment_plugin.rb:64 |
36 | 36 | msgid "Notification not sent" |
37 | -msgstr "" | |
37 | +msgstr "Notificação não enviada" | |
38 | 38 | |
39 | 39 | #: plugins/work_assignment/lib/work_assignment_plugin/work_assignment.rb:16 |
40 | 40 | msgid "Work Assignment" |
... | ... | @@ -94,7 +94,7 @@ msgstr "Cancelar" |
94 | 94 | |
95 | 95 | #: plugins/work_assignment/views/cms/work_assignment_plugin/_work_assignment.html.erb:3 |
96 | 96 | msgid "Default email message:" |
97 | -msgstr "" | |
97 | +msgstr "Mensagem de e-mail padrão:" | |
98 | 98 | |
99 | 99 | #: plugins/work_assignment/views/cms/work_assignment_plugin/_work_assignment.html.erb:5 |
100 | 100 | msgid "Publish submissions" |
... | ... | @@ -102,14 +102,16 @@ msgstr "Publicar submissões" |
102 | 102 | |
103 | 103 | #: plugins/work_assignment/views/cms/work_assignment_plugin/_work_assignment.html.erb:7 |
104 | 104 | msgid "Allow users change submissions privacy?" |
105 | -msgstr "" | |
105 | +msgstr "Permitir que usuários alterem o nível de privacidade de submissões?" | |
106 | 106 | |
107 | 107 | #: plugins/work_assignment/views/cms/_notify_text_field.html.erb:1 |
108 | 108 | msgid "" |
109 | 109 | "If you want to notify someone about this action, fill the field below with " |
110 | 110 | "the emails of the destinies, separated by comma." |
111 | 111 | msgstr "" |
112 | +"Se você quiser notificar alguém sobre esta ação, preenha o campo abaixo com " | |
113 | +"os e-mails dos destinatários, separados por vírgula." | |
112 | 114 | |
113 | 115 | #: plugins/work_assignment/views/cms/_notify_text_field.html.erb:3 |
114 | 116 | msgid "Send notification to: " |
115 | -msgstr "" | |
117 | +msgstr "Enviar notificação para: " | ... | ... |
po/fr/noosfero.po
... | ... | @@ -7,8 +7,8 @@ msgstr "" |
7 | 7 | "Project-Id-Version: 1.0-690-gcb6e853\n" |
8 | 8 | "Report-Msgid-Bugs-To: \n" |
9 | 9 | "POT-Creation-Date: 2015-03-05 12:10-0300\n" |
10 | -"PO-Revision-Date: 2015-03-08 20:40+0200\n" | |
11 | -"Last-Translator: M for Momo <mo@rtnp.org>\n" | |
10 | +"PO-Revision-Date: 2015-03-12 16:11+0200\n" | |
11 | +"Last-Translator: Tuux <tuxa@galaxie.eu.org>\n" | |
12 | 12 | "Language-Team: French " |
13 | 13 | "<https://hosted.weblate.org/projects/noosfero/noosfero/fr/>\n" |
14 | 14 | "Language: fr\n" |
... | ... | @@ -61,16 +61,12 @@ msgid "" |
61 | 61 | msgstr "" |
62 | 62 | |
63 | 63 | #: app/models/approve_comment.rb:96 |
64 | -#, fuzzy | |
65 | 64 | msgid "Your request for comment the article \"%{article}\" was approved." |
66 | -msgstr "" | |
67 | -"%{author} veut publier l'article «%{article}» sur le groupe %{community}" | |
65 | +msgstr "Votre demande pour commenter l'article \"% {article}\" a été approuvée." | |
68 | 66 | |
69 | 67 | #: app/models/approve_comment.rb:101 |
70 | -#, fuzzy | |
71 | 68 | msgid "Your request for commenting the article \"%{article}\" was rejected." |
72 | -msgstr "" | |
73 | -"%{author} veut publier l'article «%{article}» sur le groupe %{community}" | |
69 | +msgstr "Votre demande de commenter l'article \"% {article}\" a été rejetée." | |
74 | 70 | |
75 | 71 | #: app/models/approve_comment.rb:103 |
76 | 72 | msgid "" |
... | ... | @@ -120,19 +116,17 @@ msgstr "Nom" |
120 | 116 | |
121 | 117 | #: app/models/comment.rb:6 app/models/article.rb:18 app/models/article.rb:38 |
122 | 118 | #: app/models/scrap.rb:6 |
123 | -#, fuzzy | |
124 | 119 | msgid "Content" |
125 | -msgstr "Type de contenu" | |
120 | +msgstr "Contenu" | |
126 | 121 | |
127 | 122 | #: app/models/comment.rb:32 |
128 | -#, fuzzy | |
129 | 123 | msgid "{fn} can only be informed for unauthenticated authors" |
130 | -msgstr "%{fn} peut seulement être renseigné pour les auteurs non authentifiés" | |
124 | +msgstr "{fn} est informé uniquement pour les auteurs non authentifiés" | |
131 | 125 | |
132 | 126 | #: app/models/comment.rb:71 |
133 | 127 | #, fuzzy |
134 | 128 | msgid "(removed user)" |
135 | -msgstr "Pour ôter %s" | |
129 | +msgstr "(supprimé par l'utilisateur)" | |
136 | 130 | |
137 | 131 | #: app/models/comment.rb:71 |
138 | 132 | msgid "(unauthenticated user)" |
... | ... | @@ -173,33 +167,30 @@ msgid "100%" |
173 | 167 | msgstr "" |
174 | 168 | |
175 | 169 | #: app/models/invite_member.rb:20 |
176 | -#, fuzzy | |
177 | 170 | msgid "Community invitation" |
178 | -msgstr "Calculs informatisés" | |
171 | +msgstr "Invitation de la communauté" | |
179 | 172 | |
180 | 173 | #: app/models/invite_member.rb:28 |
181 | -#, fuzzy | |
182 | 174 | msgid "%{requestor} invited you to join %{linked_subject}." |
183 | -msgstr "%s veut être membre de %s." | |
175 | +msgstr "%{requestor} vous invite à rejoindre ce sujet % {linked_subject}." | |
184 | 176 | |
185 | 177 | #: app/models/invite_member.rb:40 |
186 | -#, fuzzy | |
187 | 178 | msgid "%{requestor} invited you to join %{community}." |
188 | -msgstr "%s veut être membre de %s." | |
179 | +msgstr "%{requestor} vous invite à rejoindre la comunautée %{community}." | |
189 | 180 | |
190 | 181 | #: app/models/invite_member.rb:45 |
191 | -#, fuzzy | |
192 | 182 | msgid "%{requestor} is inviting you to join \"%{community}\" on %{system}." |
193 | -msgstr "%s veut être membre de %s." | |
183 | +msgstr "" | |
184 | +"%{requestor} vous invite à rejoindre la communautée \"%{community}\" sur le " | |
185 | +"système %{system}." | |
194 | 186 | |
195 | 187 | #: app/models/invite_member.rb:57 app/models/invite_friend.rb:37 |
196 | 188 | msgid "Hello <friend>," |
197 | 189 | msgstr "Bonjour <contact>," |
198 | 190 | |
199 | 191 | #: app/models/invite_member.rb:58 |
200 | -#, fuzzy | |
201 | 192 | msgid "<user> is inviting you to join \"<community>\" on <environment>." |
202 | -msgstr "<utilisateur> vous invite à participer à %{environment}." | |
193 | +msgstr "<user> vous invite à rejoindre la « <community>» sur <environment>." | |
203 | 194 | |
204 | 195 | #: app/models/invite_member.rb:59 app/models/invite_friend.rb:39 |
205 | 196 | msgid "To accept the invitation, please follow this link:" |
... | ... | @@ -214,14 +205,12 @@ msgid "This block displays some info about your networking." |
214 | 205 | msgstr "Ce bloc affiche de l'information sur votre réseau." |
215 | 206 | |
216 | 207 | #: app/models/sellers_search_block.rb:6 |
217 | -#, fuzzy | |
218 | 208 | msgid "Search for enterprises and products" |
219 | -msgstr "Une recherche d'entreprises par produits" | |
209 | +msgstr "Recherche de produits et d'entreprises" | |
220 | 210 | |
221 | 211 | #: app/models/sellers_search_block.rb:10 |
222 | -#, fuzzy | |
223 | 212 | msgid "Products/Enterprises search" |
224 | -msgstr "Produit|Entrprise" | |
213 | +msgstr "Recherche de produits ou d'entreprises" | |
225 | 214 | |
226 | 215 | #: app/models/sellers_search_block.rb:14 |
227 | 216 | msgid "Search for sellers" |
... | ... | @@ -232,9 +221,8 @@ msgid "This block presents a search engine for products." |
232 | 221 | msgstr "Ce bloc présente un moteur de recherche pour les produits." |
233 | 222 | |
234 | 223 | #: app/models/categories_block.rb:4 |
235 | -#, fuzzy | |
236 | 224 | msgid "Generic category" |
237 | -msgstr "Catégorie générale" | |
225 | +msgstr "Catégorie générique" | |
238 | 226 | |
239 | 227 | #: app/models/categories_block.rb:5 app/helpers/categories_helper.rb:6 |
240 | 228 | #: app/views/enterprise_registration/basic_information.html.erb:25 |
... | ... | @@ -246,23 +234,20 @@ msgid "Product" |
246 | 234 | msgstr "Produit" |
247 | 235 | |
248 | 236 | #: app/models/categories_block.rb:14 app/models/categories_block.rb:18 |
249 | -#, fuzzy | |
250 | 237 | msgid "Categories Menu" |
251 | -msgstr "Catégories" | |
238 | +msgstr "Menu catégories" | |
252 | 239 | |
253 | 240 | #: app/models/categories_block.rb:22 |
254 | -#, fuzzy | |
255 | 241 | msgid "This block presents the categories like a web site menu." |
256 | -msgstr "Ce bloc présente l'image du profil." | |
242 | +msgstr "Ce bloc présente les catégories comme un menu de site web." | |
257 | 243 | |
258 | 244 | #: app/models/contact_list.rb:18 |
259 | -#, fuzzy | |
260 | 245 | msgid "" |
261 | 246 | "There was an error while authenticating. Did you enter correct login and " |
262 | 247 | "password?" |
263 | 248 | msgstr "" |
264 | -"Une erreur s'est produite lors de la recherche de votre liste de contacts. " | |
265 | -"Avez-vous entré un identifiant et un mot de passe corrects ?" | |
249 | +"Il y a eu une erreur lors de l'authentification. Utilisez vous un mot de " | |
250 | +"passe et un login correcte ?" | |
266 | 251 | |
267 | 252 | #: app/models/contact_list.rb:25 |
268 | 253 | #, fuzzy | ... | ... |
po/pt/noosfero.po
... | ... | @@ -13,16 +13,16 @@ msgid "" |
13 | 13 | msgstr "" |
14 | 14 | "Project-Id-Version: 1.0-690-gcb6e853\n" |
15 | 15 | "POT-Creation-Date: 2015-03-05 12:10-0300\n" |
16 | -"PO-Revision-Date: 2014-12-18 18:40-0200\n" | |
17 | -"Last-Translator: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>\n" | |
18 | -"Language-Team: Portuguese <https://hosted.weblate.org/projects/noosfero/" | |
19 | -"noosfero/pt/>\n" | |
16 | +"PO-Revision-Date: 2015-03-14 22:06+0200\n" | |
17 | +"Last-Translator: daniel <dtygel@eita.org.br>\n" | |
18 | +"Language-Team: Portuguese " | |
19 | +"<https://hosted.weblate.org/projects/noosfero/noosfero/pt/>\n" | |
20 | 20 | "Language: pt\n" |
21 | 21 | "MIME-Version: 1.0\n" |
22 | 22 | "Content-Type: text/plain; charset=UTF-8\n" |
23 | 23 | "Content-Transfer-Encoding: 8bit\n" |
24 | 24 | "Plural-Forms: nplurals=2; plural=n != 1;\n" |
25 | -"X-Generator: Weblate 2.0\n" | |
25 | +"X-Generator: Weblate 2.3-dev\n" | |
26 | 26 | |
27 | 27 | #: app/models/approve_comment.rb:17 |
28 | 28 | msgid "Anonymous" |
... | ... | @@ -194,10 +194,8 @@ msgstr "" |
194 | 194 | "%{requestor} convidou você para ser integrante da comunidade %{community}." |
195 | 195 | |
196 | 196 | #: app/models/invite_member.rb:45 |
197 | -#, fuzzy | |
198 | 197 | msgid "%{requestor} is inviting you to join \"%{community}\" on %{system}." |
199 | -msgstr "" | |
200 | -"%{requestor} convidou você para ser integrante da comunidade %{community}." | |
198 | +msgstr "%{requestor} convidou você para ingressar na comunidade %{community}." | |
201 | 199 | |
202 | 200 | #: app/models/invite_member.rb:57 app/models/invite_friend.rb:37 |
203 | 201 | msgid "Hello <friend>," |
... | ... | @@ -336,13 +334,12 @@ msgid "Acronym" |
336 | 334 | msgstr "Sigla" |
337 | 335 | |
338 | 336 | #: app/models/category.rb:8 |
339 | -#, fuzzy | |
340 | 337 | msgid "Abbreviation" |
341 | -msgstr "Convite" | |
338 | +msgstr "Abreviação" | |
342 | 339 | |
343 | 340 | #: app/models/category.rb:9 app/models/article.rb:19 |
344 | 341 | msgid "Slug" |
345 | -msgstr "" | |
342 | +msgstr "Texto curto" | |
346 | 343 | |
347 | 344 | #: app/models/category.rb:12 |
348 | 345 | msgid "{fn} cannot be like that." |
... | ... | @@ -608,7 +605,6 @@ msgid "Stays on the same page the user was before signup." |
608 | 605 | msgstr "Permanece na mesma página que o usuário estava antes do cadastro." |
609 | 606 | |
610 | 607 | #: app/models/environment.rb:162 |
611 | -#, fuzzy | |
612 | 608 | msgid "Redirects the user to the environment welcome page." |
613 | 609 | msgstr "Redireciona o usuário para a página inicial do ambiente." |
614 | 610 | |
... | ... | @@ -769,18 +765,16 @@ msgid "{fn} of uploaded file was larger than the maximum size of 5.0 MB" |
769 | 765 | msgstr "{fn} do arquivo enviado é maior que o máximo permitido de 5.0 MB" |
770 | 766 | |
771 | 767 | #: app/models/profile_suggestion.rb:35 app/models/profile_suggestion.rb:38 |
772 | -#, fuzzy | |
773 | 768 | msgid "Friends in common" |
774 | -msgstr "Convite de amizade" | |
769 | +msgstr "Amigas/os em comum" | |
775 | 770 | |
776 | 771 | #: app/models/profile_suggestion.rb:36 |
777 | -#, fuzzy | |
778 | 772 | msgid "Communities in common" |
779 | -msgstr "Menu de comunidades" | |
773 | +msgstr "Comunidades em comum" | |
780 | 774 | |
781 | 775 | #: app/models/profile_suggestion.rb:37 app/models/profile_suggestion.rb:39 |
782 | 776 | msgid "Tags in common" |
783 | -msgstr "" | |
777 | +msgstr "Palavras-chave (tags) em comum" | |
784 | 778 | |
785 | 779 | #: app/models/person.rb:13 app/models/link_list_block.rb:29 |
786 | 780 | #: app/views/templates/index.html.erb:5 |
... | ... | @@ -1002,9 +996,8 @@ msgid "Raw HTML" |
1002 | 996 | msgstr "HTML puro" |
1003 | 997 | |
1004 | 998 | #: app/models/person_notifier.rb:102 |
1005 | -#, fuzzy | |
1006 | 999 | msgid "[%s] Notifications" |
1007 | -msgstr "Opções de notificação" | |
1000 | +msgstr "[%s] notificações" | |
1008 | 1001 | |
1009 | 1002 | #: app/models/moderate_user_registration.rb:29 |
1010 | 1003 | #: app/views/account/login.html.erb:29 |
... | ... | @@ -1169,12 +1162,10 @@ msgid "Article not selected yet." |
1169 | 1162 | msgstr "Nenhum artigo selecionado ainda." |
1170 | 1163 | |
1171 | 1164 | #: app/models/article.rb:17 |
1172 | -#, fuzzy | |
1173 | 1165 | msgid "Abstract" |
1174 | 1166 | msgstr "Resumo" |
1175 | 1167 | |
1176 | 1168 | #: app/models/article.rb:20 |
1177 | -#, fuzzy | |
1178 | 1169 | msgid "Filename" |
1179 | 1170 | msgstr "Nome do arquivo" |
1180 | 1171 | |
... | ... | @@ -2012,9 +2003,8 @@ msgid "CreateEnterprise|Identifier" |
2012 | 2003 | msgstr "Identificador" |
2013 | 2004 | |
2014 | 2005 | #: app/models/license.rb:7 |
2015 | -#, fuzzy | |
2016 | 2006 | msgid "URL" |
2017 | -msgstr "URL:" | |
2007 | +msgstr "Endereço na internet" | |
2018 | 2008 | |
2019 | 2009 | #: app/models/enterprise_homepage.rb:4 app/models/enterprise_homepage.rb:16 |
2020 | 2010 | #: app/views/blocks/profile_info.html.erb:18 |
... | ... | @@ -2234,9 +2224,8 @@ msgid "None" |
2234 | 2224 | msgstr "Nenhum(a)" |
2235 | 2225 | |
2236 | 2226 | #: app/models/certifier.rb:8 |
2237 | -#, fuzzy | |
2238 | 2227 | msgid "Link" |
2239 | -msgstr "Links" | |
2228 | +msgstr "Link" | |
2240 | 2229 | |
2241 | 2230 | #: app/models/products_block.rb:19 |
2242 | 2231 | msgid "This block presents a list of your products." |
... | ... | @@ -2255,9 +2244,8 @@ msgid "Subscribe RSS Feed" |
2255 | 2244 | msgstr "Assinar feed RSS" |
2256 | 2245 | |
2257 | 2246 | #: app/models/national_region.rb:5 |
2258 | -#, fuzzy | |
2259 | 2247 | msgid "Region Code" |
2260 | -msgstr "Região" | |
2248 | +msgstr "Código de região" | |
2261 | 2249 | |
2262 | 2250 | #: app/models/national_region.rb:72 |
2263 | 2251 | msgid "Invalid city or state name." |
... | ... | @@ -2791,9 +2779,8 @@ msgid "The contents in this profile is available to members only." |
2791 | 2779 | msgstr "O conteúdo deste perfil está disponível apenas para os seus membros." |
2792 | 2780 | |
2793 | 2781 | #: app/helpers/application_helper.rb:1459 |
2794 | -#, fuzzy | |
2795 | 2782 | msgid "See all connections" |
2796 | -msgstr "Buscar todo o conteúdo" | |
2783 | +msgstr "Ver todas as conexões" | |
2797 | 2784 | |
2798 | 2785 | #: app/helpers/manage_products_helper.rb:156 |
2799 | 2786 | #: app/views/manage_products/_display_category.html.erb:3 |
... | ... | @@ -2882,7 +2869,7 @@ msgstr "%{currency} %{production_cost} de %{currency} %{product_price}" |
2882 | 2869 | |
2883 | 2870 | #: app/helpers/search_helper.rb:9 |
2884 | 2871 | msgid "Order" |
2885 | -msgstr "" | |
2872 | +msgstr "Ordenação" | |
2886 | 2873 | |
2887 | 2874 | #: app/helpers/search_helper.rb:10 app/helpers/search_helper.rb:117 |
2888 | 2875 | msgid "Display" |
... | ... | @@ -3079,14 +3066,12 @@ msgid "Private" |
3079 | 3066 | msgstr "Privado" |
3080 | 3067 | |
3081 | 3068 | #: app/helpers/article_helper.rb:100 |
3082 | -#, fuzzy | |
3083 | 3069 | msgid "For all community members" |
3084 | -msgstr "Criar um modelos de comunidade" | |
3070 | +msgstr "Para todos os integrantes da comunidade" | |
3085 | 3071 | |
3086 | 3072 | #: app/helpers/article_helper.rb:100 |
3087 | -#, fuzzy | |
3088 | 3073 | msgid "For all your friends" |
3089 | -msgstr "Convide seus amigos" | |
3074 | +msgstr "Para todos os seus amigos" | |
3090 | 3075 | |
3091 | 3076 | #: app/helpers/article_helper.rb:118 |
3092 | 3077 | msgid "Fill in the search field to add the exception users to see this content" |
... | ... | @@ -4063,25 +4048,22 @@ msgid "Name has already been taken" |
4063 | 4048 | msgstr "O nome já está sendo utilizado" |
4064 | 4049 | |
4065 | 4050 | #: app/controllers/admin/templates_controller.rb:47 |
4066 | -#, fuzzy | |
4067 | 4051 | msgid "Community not found. The template could no be changed." |
4068 | -msgstr "O modelo não pode ser salvo" | |
4052 | +msgstr "Comunidade não encontrada. O modelo não pôde ser alterado." | |
4069 | 4053 | |
4070 | 4054 | #: app/controllers/admin/templates_controller.rb:51 |
4071 | 4055 | #: app/controllers/admin/templates_controller.rb:65 |
4072 | 4056 | #: app/controllers/admin/templates_controller.rb:79 |
4073 | 4057 | msgid "%s defined as default" |
4074 | -msgstr "" | |
4058 | +msgstr "%s definido como padrão" | |
4075 | 4059 | |
4076 | 4060 | #: app/controllers/admin/templates_controller.rb:61 |
4077 | -#, fuzzy | |
4078 | 4061 | msgid "Person not found. The template could no be changed." |
4079 | -msgstr "O modelo não pode ser salvo" | |
4062 | +msgstr "Pessoa não encontrada. O modelo não pôde ser alterado." | |
4080 | 4063 | |
4081 | 4064 | #: app/controllers/admin/templates_controller.rb:75 |
4082 | -#, fuzzy | |
4083 | 4065 | msgid "Enterprise not found. The template could no be changed." |
4084 | -msgstr "O modelo não pode ser salvo" | |
4066 | +msgstr "Empreendimento não encontrado. O modelo não pôde ser alterado." | |
4085 | 4067 | |
4086 | 4068 | #: app/controllers/admin/plugins_controller.rb:12 |
4087 | 4069 | msgid "Plugins updated successfully." |
... | ... | @@ -4173,9 +4155,8 @@ msgid "Please enter a valid email address." |
4173 | 4155 | msgstr "Por favor entre um endereço de e-mail válido." |
4174 | 4156 | |
4175 | 4157 | #: app/controllers/public/invite_controller.rb:77 |
4176 | -#, fuzzy | |
4177 | 4158 | msgid "Please enter a valid profile." |
4178 | -msgstr "Por favor entre um endereço de e-mail válido." | |
4159 | +msgstr "Por favor entre com um perfil válido." | |
4179 | 4160 | |
4180 | 4161 | #: app/controllers/public/search_controller.rb:52 |
4181 | 4162 | msgid "Upcoming events" |
... | ... | @@ -4408,9 +4389,8 @@ msgid "\"%s\" configured as homepage." |
4408 | 4389 | msgstr "\"%s\" configurado como página inicial." |
4409 | 4390 | |
4410 | 4391 | #: app/controllers/my_profile/cms_controller.rb:223 |
4411 | -#, fuzzy | |
4412 | 4392 | msgid "File(s) successfully uploaded" |
4413 | -msgstr "Papéis alterado com sucesso" | |
4393 | +msgstr "Arquivo(s) enviado(s) com sucesso" | |
4414 | 4394 | |
4415 | 4395 | #: app/controllers/my_profile/cms_controller.rb:239 |
4416 | 4396 | msgid "\"%s\" was removed." |
... | ... | @@ -4427,9 +4407,8 @@ msgid "Select some group to publish your article" |
4427 | 4407 | msgstr "Selecione os grupos onde você quer publicar seu artigo" |
4428 | 4408 | |
4429 | 4409 | #: app/controllers/my_profile/cms_controller.rb:322 |
4430 | -#, fuzzy | |
4431 | 4410 | msgid "Some of your publish requests couldn't be sent." |
4432 | -msgstr "Sua requisição de publicação não pode ser enviada." | |
4411 | +msgstr "Alguns dos seus pedidos de publicação não puderam ser enviados." | |
4433 | 4412 | |
4434 | 4413 | #: app/controllers/my_profile/cms_controller.rb:337 |
4435 | 4414 | msgid "Your publish request couldn't be sent." |
... | ... | @@ -4455,9 +4434,8 @@ msgid "Images" |
4455 | 4434 | msgstr "Imagens" |
4456 | 4435 | |
4457 | 4436 | #: app/controllers/my_profile/cms_controller.rb:495 |
4458 | -#, fuzzy | |
4459 | 4437 | msgid "Files" |
4460 | -msgstr "File" | |
4438 | +msgstr "Arquivos" | |
4461 | 4439 | |
4462 | 4440 | #: app/controllers/my_profile/tasks_controller.rb:39 |
4463 | 4441 | msgid "All decisions were applied successfully." |
... | ... | @@ -4500,33 +4478,28 @@ msgid "Could not delete profile" |
4500 | 4478 | msgstr "Não foi possível remover o perfil" |
4501 | 4479 | |
4502 | 4480 | #: app/controllers/my_profile/profile_editor_controller.rb:99 |
4503 | -#, fuzzy | |
4504 | 4481 | msgid "Welcome page saved successfully." |
4505 | -msgstr "e-Mail desabilitado com sucesso." | |
4482 | +msgstr "Página de boas vindas salva com sucesso." | |
4506 | 4483 | |
4507 | 4484 | #: app/controllers/my_profile/profile_editor_controller.rb:102 |
4508 | -#, fuzzy | |
4509 | 4485 | msgid "Welcome page could not be saved." |
4510 | -msgstr "O modelo não pode ser salvo" | |
4486 | +msgstr "A página de boas vindas não pôde ser salva." | |
4511 | 4487 | |
4512 | 4488 | #: app/controllers/my_profile/profile_editor_controller.rb:112 |
4513 | -#, fuzzy | |
4514 | 4489 | msgid "\"The profile '#{profile.name}' was deactivated.\"" |
4515 | -msgstr "O perfil foi removido." | |
4490 | +msgstr "\"O perfil '#{profile.name}' foi desativado.\"" | |
4516 | 4491 | |
4517 | 4492 | #: app/controllers/my_profile/profile_editor_controller.rb:114 |
4518 | -#, fuzzy | |
4519 | 4493 | msgid "Could not deactivate profile." |
4520 | -msgstr "Não foi possível remover o perfil" | |
4494 | +msgstr "Não foi possível desativar o perfil." | |
4521 | 4495 | |
4522 | 4496 | #: app/controllers/my_profile/profile_editor_controller.rb:126 |
4523 | 4497 | msgid "\"The profile '#{profile.name}' was activated.\"" |
4524 | -msgstr "" | |
4498 | +msgstr "\"O perfil '#{profile.name}' foi ativado.\"" | |
4525 | 4499 | |
4526 | 4500 | #: app/controllers/my_profile/profile_editor_controller.rb:128 |
4527 | -#, fuzzy | |
4528 | 4501 | msgid "Could not activate the profile." |
4529 | -msgstr "Não foi possível remover o perfil" | |
4502 | +msgstr "Não foi possível ativar o perfil." | |
4530 | 4503 | |
4531 | 4504 | #: app/controllers/my_profile/profile_members_controller.rb:78 |
4532 | 4505 | msgid "Member succesfully unassociated" |
... | ... | @@ -4597,7 +4570,7 @@ msgstr "Bem-vindo ao ambiente %s" |
4597 | 4570 | |
4598 | 4571 | #: app/mailers/user_mailer.rb:57 |
4599 | 4572 | msgid "[%s] What about grow up your network?" |
4600 | -msgstr "" | |
4573 | +msgstr "[%s] Que tal ampliar sua rede?" | |
4601 | 4574 | |
4602 | 4575 | #: app/mailers/pending_task_notifier.rb:15 |
4603 | 4576 | msgid "[%s] Pending tasks" |
... | ... | @@ -5332,9 +5305,8 @@ msgid "Title: " |
5332 | 5305 | msgstr "Título: " |
5333 | 5306 | |
5334 | 5307 | #: app/views/tasks/_approve_article_accept_details.html.erb:3 |
5335 | -#, fuzzy | |
5336 | 5308 | msgid "Create a link" |
5337 | -msgstr "Criado em: " | |
5309 | +msgstr "Criar um link" | |
5338 | 5310 | |
5339 | 5311 | #: app/views/tasks/_approve_article_accept_details.html.erb:5 |
5340 | 5312 | msgid "Name for publishing" |
... | ... | @@ -5522,7 +5494,7 @@ msgstr "Título personalizado para este bloco: " |
5522 | 5494 | |
5523 | 5495 | #: app/views/box_organizer/edit.html.erb:10 |
5524 | 5496 | msgid "Fixed" |
5525 | -msgstr "" | |
5497 | +msgstr "Fixo" | |
5526 | 5498 | |
5527 | 5499 | #: app/views/box_organizer/edit.html.erb:17 |
5528 | 5500 | msgid "Display this block:" |
... | ... | @@ -5610,7 +5582,7 @@ msgstr "Código HTML" |
5610 | 5582 | |
5611 | 5583 | #: app/views/box_organizer/index.html.erb:1 |
5612 | 5584 | msgid "Editing sideboxes" |
5613 | -msgstr "Editando blocos laterais" | |
5585 | +msgstr "Editar blocos laterais" | |
5614 | 5586 | |
5615 | 5587 | #: app/views/box_organizer/index.html.erb:4 |
5616 | 5588 | msgid "Add a block" |
... | ... | @@ -5621,15 +5593,13 @@ msgid "Limit of posts to display" |
5621 | 5593 | msgstr "Limite de postagens para exibir" |
5622 | 5594 | |
5623 | 5595 | #: app/views/friends/suggest.html.erb:1 |
5624 | -#, fuzzy | |
5625 | 5596 | msgid "Friends suggestions for %s" |
5626 | -msgstr "Configurações do perfil para %s" | |
5597 | +msgstr "Sugestões de amigas/os para %s" | |
5627 | 5598 | |
5628 | 5599 | #: app/views/friends/suggest.html.erb:4 |
5629 | 5600 | #: app/views/friends/connections.html.erb:4 |
5630 | -#, fuzzy | |
5631 | 5601 | msgid "Go to friends list" |
5632 | -msgstr "Você não tem amigos ainda." | |
5602 | +msgstr "Ir para a lista de amigas/os" | |
5633 | 5603 | |
5634 | 5604 | #: app/views/friends/_profile_list.html.erb:7 |
5635 | 5605 | #: app/views/friends/_profile_list.html.erb:9 |
... | ... | @@ -5681,14 +5651,12 @@ msgstr "Não" |
5681 | 5651 | |
5682 | 5652 | #: app/views/friends/connections.html.erb:1 |
5683 | 5653 | #: app/views/memberships/connections.html.erb:1 |
5684 | -#, fuzzy | |
5685 | 5654 | msgid "Connections with %s" |
5686 | -msgstr "Conteúdo marcado com \"%s\"" | |
5655 | +msgstr "Conexões com \"%s\"" | |
5687 | 5656 | |
5688 | 5657 | #: app/views/friends/remove_suggestion.html.erb:2 |
5689 | -#, fuzzy | |
5690 | 5658 | msgid "Removing suggestion for friend: %s" |
5691 | -msgstr "Removendo amigo: %s" | |
5659 | +msgstr "Removendo sugestão para amiga/o: %s" | |
5692 | 5660 | |
5693 | 5661 | #: app/views/friends/index.html.erb:3 app/views/profile/friends.html.erb:3 |
5694 | 5662 | msgid "%s's friends" |
... | ... | @@ -5709,14 +5677,12 @@ msgstr "Buscar pessoas" |
5709 | 5677 | #: app/views/friends/index.html.erb:19 |
5710 | 5678 | #: app/views/invite/select_friends.html.erb:4 |
5711 | 5679 | #: app/views/profile/friends.html.erb:21 |
5712 | -#, fuzzy | |
5713 | 5680 | msgid "Invite people" |
5714 | -msgstr "Convidar membros" | |
5681 | +msgstr "Convidar pessoas" | |
5715 | 5682 | |
5716 | 5683 | #: app/views/friends/index.html.erb:31 |
5717 | -#, fuzzy | |
5718 | 5684 | msgid "Friends suggestions" |
5719 | -msgstr "Sugestão de artigo" | |
5685 | +msgstr "Sugestões de amigas/os" | |
5720 | 5686 | |
5721 | 5687 | #: app/views/search/search_page.html.erb:1 |
5722 | 5688 | #: app/views/search/communities.html.erb:1 |
... | ... | @@ -6006,13 +5972,12 @@ msgstr "" |
6006 | 5972 | "automaticamente" |
6007 | 5973 | |
6008 | 5974 | #: app/views/profile_editor/edit.html.erb:55 |
6009 | -#, fuzzy | |
6010 | 5975 | msgid "Suggestions" |
6011 | -msgstr "Sugestões: %s" | |
5976 | +msgstr "Sugestões" | |
6012 | 5977 | |
6013 | 5978 | #: app/views/profile_editor/edit.html.erb:57 |
6014 | 5979 | msgid "Send me relationship suggestions by email" |
6015 | -msgstr "" | |
5980 | +msgstr "Envie-me por e-mail sugestões de novos relacionamentos" | |
6016 | 5981 | |
6017 | 5982 | #: app/views/profile_editor/edit.html.erb:67 |
6018 | 5983 | msgid "Select the categories of your interest" |
... | ... | @@ -6023,20 +5988,17 @@ msgid "Delete profile" |
6023 | 5988 | msgstr "Remover perfil" |
6024 | 5989 | |
6025 | 5990 | #: app/views/profile_editor/edit.html.erb:81 |
6026 | -#, fuzzy | |
6027 | 5991 | msgid "Deactivate profile" |
6028 | -msgstr "Perfil privado" | |
5992 | +msgstr "Desativar perfil" | |
6029 | 5993 | |
6030 | 5994 | #: app/views/profile_editor/edit.html.erb:81 |
6031 | 5995 | #: app/views/profile_editor/edit.html.erb:83 |
6032 | -#, fuzzy | |
6033 | 5996 | msgid "Are you sure you want to deactivate this profile?" |
6034 | -msgstr "Tem certeza que quer remover este perfil?" | |
5997 | +msgstr "Tem certeza que deseja desativar este perfil?" | |
6035 | 5998 | |
6036 | 5999 | #: app/views/profile_editor/edit.html.erb:83 |
6037 | -#, fuzzy | |
6038 | 6000 | msgid "Activate profile" |
6039 | -msgstr "Perfil privado" | |
6001 | +msgstr "Ativar perfil" | |
6040 | 6002 | |
6041 | 6003 | #: app/views/profile_editor/disable.html.erb:1 |
6042 | 6004 | msgid "Disabling '%s' enterprise" |
... | ... | @@ -6072,35 +6034,39 @@ msgstr "Sim, quero habilitar." |
6072 | 6034 | #: app/views/profile_editor/welcome_page.html.erb:1 |
6073 | 6035 | #: app/views/profile_editor/index.html.erb:71 |
6074 | 6036 | #: app/views/templates/index.html.erb:32 |
6075 | -#, fuzzy | |
6076 | 6037 | msgid "Edit welcome page" |
6077 | -msgstr "Texto de boas vindas no registro" | |
6038 | +msgstr "Editar página de boas vindas" | |
6078 | 6039 | |
6079 | 6040 | #: app/views/profile_editor/welcome_page.html.erb:8 |
6080 | 6041 | msgid "Your welcome page will only be displayed if this options is selected." |
6081 | 6042 | msgstr "" |
6043 | +"Sua página de boas vindas será exibida apenas se esta opção estiver " | |
6044 | +"selecionada." | |
6082 | 6045 | |
6083 | 6046 | #: app/views/profile_editor/welcome_page.html.erb:13 |
6084 | 6047 | msgid "" |
6085 | 6048 | "This page will be displayed to the user after his signup with this template." |
6086 | 6049 | msgstr "" |
6050 | +"Esta página será exibida assim que o novo usuário se registrar com este tema." | |
6087 | 6051 | |
6088 | 6052 | #: app/views/profile_editor/_moderation.html.erb:1 |
6089 | 6053 | msgid "Moderation options" |
6090 | 6054 | msgstr "Opções de moderação" |
6091 | 6055 | |
6092 | 6056 | #: app/views/profile_editor/_moderation.html.erb:4 |
6093 | -#, fuzzy | |
6094 | 6057 | msgid "Invitation moderation:" |
6095 | -msgstr "Texto do convite:" | |
6058 | +msgstr "Moderação de convite:" | |
6096 | 6059 | |
6097 | 6060 | #: app/views/profile_editor/_moderation.html.erb:9 |
6098 | 6061 | msgid "Allow all members to send invitation (Default: only administrator)" |
6099 | 6062 | msgstr "" |
6063 | +"Permitir que todos os integrantes enviem convite (Padrão: apenas " | |
6064 | +"administrador)" | |
6100 | 6065 | |
6101 | 6066 | #: app/views/profile_editor/_moderation.html.erb:15 |
6102 | 6067 | msgid "Allow members to invite only friends (Default: all users)" |
6103 | 6068 | msgstr "" |
6069 | +"Permitir que integrantes convidem apenas amigos (Padrão: todos os usuários)" | |
6104 | 6070 | |
6105 | 6071 | #: app/views/profile_editor/_moderation.html.erb:22 |
6106 | 6072 | #: app/views/memberships/new_community.html.erb:32 |
... | ... | @@ -6303,23 +6269,20 @@ msgid "Offline" |
6303 | 6269 | msgstr "Desconectado" |
6304 | 6270 | |
6305 | 6271 | #: app/views/shared/logged_in/xmpp_chat.html.erb:60 |
6306 | -#, fuzzy | |
6307 | 6272 | msgid "Join room" |
6308 | -msgstr "Entrar" | |
6273 | +msgstr "Entrar na sala de bate-papo" | |
6309 | 6274 | |
6310 | 6275 | #: app/views/shared/logged_in/xmpp_chat.html.erb:61 |
6311 | -#, fuzzy | |
6312 | 6276 | msgid "Leave room" |
6313 | -msgstr "Deixe seu comentário" | |
6277 | +msgstr "Sair da sala de bate-papo" | |
6314 | 6278 | |
6315 | 6279 | #: app/views/shared/_profile_connections.html.erb:2 |
6316 | -#, fuzzy | |
6317 | 6280 | msgid "Profiles in common:" |
6318 | -msgstr "Informações do perfil" | |
6281 | +msgstr "Perfis em comum:" | |
6319 | 6282 | |
6320 | 6283 | #: app/views/shared/_profile_connections.html.erb:17 |
6321 | 6284 | msgid "Tags in common:" |
6322 | -msgstr "" | |
6285 | +msgstr "Palavras-chave (tags) em comum:" | |
6323 | 6286 | |
6324 | 6287 | #: app/views/shared/access_denied.html.erb:3 lib/authenticated_system.rb:79 |
6325 | 6288 | msgid "Access denied" |
... | ... | @@ -6445,27 +6408,23 @@ msgid "Admin" |
6445 | 6408 | msgstr "Administrador" |
6446 | 6409 | |
6447 | 6410 | #: app/views/shared/_profile_suggestions_list.html.erb:6 |
6448 | -#, fuzzy | |
6449 | 6411 | msgid "You have no more suggestions :(" |
6450 | -msgstr "Você tem solicitações pendentes" | |
6412 | +msgstr "Não há nenhuma outra sugestão para você :(" | |
6451 | 6413 | |
6452 | 6414 | #: app/views/shared/_profile_suggestions_list.html.erb:19 |
6453 | 6415 | #: app/views/shared/_profile_suggestions_list.html.erb:26 |
6454 | -#, fuzzy | |
6455 | 6416 | msgid "Add suggestion" |
6456 | -msgstr "Sugestão de artigo" | |
6417 | +msgstr "Adicionar sugestão" | |
6457 | 6418 | |
6458 | 6419 | #: app/views/shared/_profile_suggestions_list.html.erb:39 |
6459 | 6420 | #: app/views/shared/_profile_suggestions_list.html.erb:47 |
6460 | -#, fuzzy | |
6461 | 6421 | msgid "Remove suggestion" |
6462 | -msgstr "Sugestão de artigo" | |
6422 | +msgstr "Remover sugestão" | |
6463 | 6423 | |
6464 | 6424 | #: app/views/shared/_profile_suggestions_list.html.erb:40 |
6465 | 6425 | #: app/views/shared/_profile_suggestions_list.html.erb:48 |
6466 | -#, fuzzy | |
6467 | 6426 | msgid "Are you sure you want to remove this suggestion?" |
6468 | -msgstr "Tem certeza de que deseja excluir esta sugestão de artigo?" | |
6427 | +msgstr "Tem certeza que deseja remover esta sugestão?" | |
6469 | 6428 | |
6470 | 6429 | #: app/views/shared/_profile_search_form.html.erb:4 |
6471 | 6430 | #: app/views/shared/_profile_search_form.html.erb:8 |
... | ... | @@ -6481,14 +6440,12 @@ msgid "Search all content" |
6481 | 6440 | msgstr "Buscar todo o conteúdo" |
6482 | 6441 | |
6483 | 6442 | #: app/views/shared/_remove_suggestion.html.erb:4 |
6484 | -#, fuzzy | |
6485 | 6443 | msgid "Are you sure you want to remove %s from your suggestions list?" |
6486 | -msgstr "Tem certeza que quer remover %s da sua lista de amigos?" | |
6444 | +msgstr "Tem certeza que quer remover %s da sua lista de sugestões?" | |
6487 | 6445 | |
6488 | 6446 | #: app/views/shared/_remove_suggestion.html.erb:8 |
6489 | -#, fuzzy | |
6490 | 6447 | msgid "Yes, I want to remove %s" |
6491 | -msgstr "Sim, quero sair." | |
6448 | +msgstr "Sim, quero remover %s" | |
6492 | 6449 | |
6493 | 6450 | #: app/views/shared/_lead_and_body.html.erb:18 |
6494 | 6451 | msgid "Used when a short version of your text is needed." |
... | ... | @@ -6622,42 +6579,36 @@ msgid "Create a new template for %s" |
6622 | 6579 | msgstr "Criar um novo modelo para %s" |
6623 | 6580 | |
6624 | 6581 | #: app/views/templates/index.html.erb:16 |
6625 | -#, fuzzy | |
6626 | 6582 | msgid "Template" |
6627 | -msgstr "Editar Modelos" | |
6583 | +msgstr "Tema" | |
6628 | 6584 | |
6629 | 6585 | #: app/views/templates/index.html.erb:23 |
6630 | 6586 | msgid "Edit template \"%s\"" |
6631 | 6587 | msgstr "Editar modelo \"%s\"" |
6632 | 6588 | |
6633 | 6589 | #: app/views/templates/index.html.erb:25 |
6634 | -#, fuzzy | |
6635 | 6590 | msgid "is the default template" |
6636 | -msgstr "Usar o tema padrão" | |
6591 | +msgstr "é o modelo padrão" | |
6637 | 6592 | |
6638 | 6593 | #: app/views/templates/index.html.erb:27 |
6639 | 6594 | msgid "Set as default" |
6640 | -msgstr "" | |
6595 | +msgstr "Definir como padrão" | |
6641 | 6596 | |
6642 | 6597 | #: app/views/templates/index.html.erb:27 |
6643 | -#, fuzzy | |
6644 | 6598 | msgid "Set %s template as default" |
6645 | -msgstr "O novo modelo foi criado" | |
6599 | +msgstr "Definir o modelo %s como padrão" | |
6646 | 6600 | |
6647 | 6601 | #: app/views/templates/index.html.erb:31 |
6648 | -#, fuzzy | |
6649 | 6602 | msgid "Edit settings" |
6650 | -msgstr "Configurações de e-mail" | |
6603 | +msgstr "Editar configurações" | |
6651 | 6604 | |
6652 | 6605 | #: app/views/templates/index.html.erb:33 |
6653 | -#, fuzzy | |
6654 | 6606 | msgid "Edit sideblocks" |
6655 | 6607 | msgstr "Editar blocos laterais" |
6656 | 6608 | |
6657 | 6609 | #: app/views/templates/index.html.erb:35 |
6658 | -#, fuzzy | |
6659 | 6610 | msgid "Edit header/footer" |
6660 | -msgstr "Editando cabeçalho e rodapé" | |
6611 | +msgstr "Editar cabeçalho/rodapé" | |
6661 | 6612 | |
6662 | 6613 | #: app/views/doc/_path.html.erb:2 |
6663 | 6614 | msgid "You are here:" |
... | ... | @@ -6723,17 +6674,19 @@ msgstr "O que fazer agora?" |
6723 | 6674 | |
6724 | 6675 | #: app/views/home/welcome.html.erb:20 |
6725 | 6676 | msgid "Access your %s and see your face on the network!" |
6726 | -msgstr "" | |
6677 | +msgstr "Acesse seu %s e veja sua cara na rede!" | |
6727 | 6678 | |
6728 | 6679 | #: app/views/home/welcome.html.erb:22 |
6729 | 6680 | msgid "" |
6730 | 6681 | "You can also explore your %s to customize your profile. Here are some %s on " |
6731 | 6682 | "what you can do there." |
6732 | 6683 | msgstr "" |
6684 | +"Você pode também explorar seu %s para customizar seu perfil. Aqui há algumas " | |
6685 | +"%s sobre o que você pode fazer." | |
6733 | 6686 | |
6734 | 6687 | #: app/views/home/welcome.html.erb:24 |
6735 | 6688 | msgid "tips" |
6736 | -msgstr "" | |
6689 | +msgstr "dicas" | |
6737 | 6690 | |
6738 | 6691 | #: app/views/home/welcome.html.erb:25 |
6739 | 6692 | msgid "%s your Gmail, Yahoo and Hotmail contacts!" |
... | ... | @@ -6761,7 +6714,7 @@ msgstr "Comece a explorar e divirta-se!" |
6761 | 6714 | |
6762 | 6715 | #: app/views/home/welcome.html.erb:29 |
6763 | 6716 | msgid "What can I do as a %s?" |
6764 | -msgstr "" | |
6717 | +msgstr "O que posso fazer como %s?" | |
6765 | 6718 | |
6766 | 6719 | #: app/views/home/index.html.erb:2 |
6767 | 6720 | msgid "News" |
... | ... | @@ -6988,9 +6941,8 @@ msgstr "Adicionar integrantes" |
6988 | 6941 | #: app/views/invite/select_friends.html.erb:6 |
6989 | 6942 | #: app/views/invite/invite_friends.html.erb:5 |
6990 | 6943 | #: app/views/profile/members.html.erb:21 |
6991 | -#, fuzzy | |
6992 | 6944 | msgid "Invite people to join" |
6993 | -msgstr "Convide seus amigos para entrar em %s" | |
6945 | +msgstr "Convide seus amigos para entrar" | |
6994 | 6946 | |
6995 | 6947 | #: app/views/profile_members/_index_buttons.html.erb:8 |
6996 | 6948 | #: app/views/profile/send_mail.html.erb:3 |
... | ... | @@ -7106,35 +7058,30 @@ msgid "Regions" |
7106 | 7058 | msgstr "Regiões" |
7107 | 7059 | |
7108 | 7060 | #: app/views/memberships/welcome.html.erb:1 |
7109 | -#, fuzzy | |
7110 | 7061 | msgid "Community created" |
7111 | -msgstr "Comunidade" | |
7062 | +msgstr "Comunidade criada" | |
7112 | 7063 | |
7113 | 7064 | #: app/views/memberships/welcome.html.erb:2 |
7114 | -#, fuzzy | |
7115 | 7065 | msgid "Your community (%s) was successfully created." |
7116 | -msgstr "Seu empreendimento (%s) foi registrado com sucesso." | |
7066 | +msgstr "Sua comunidade (%s) foi criada com sucesso." | |
7117 | 7067 | |
7118 | 7068 | #: app/views/memberships/welcome.html.erb:3 |
7119 | -#, fuzzy | |
7120 | 7069 | msgid "You can manage your community now." |
7121 | -msgstr "Você pode gerenciar seu empreendimento agora." | |
7070 | +msgstr "Agora você já pode gerenciar sua comunidade." | |
7122 | 7071 | |
7123 | 7072 | #: app/views/memberships/welcome.html.erb:5 |
7124 | 7073 | #: app/views/enterprise_registration/creation.html.erb:5 |
7125 | 7074 | msgid "What can I do with a %s?" |
7126 | -msgstr "" | |
7075 | +msgstr "O que posso fazer com um %s?" | |
7127 | 7076 | |
7128 | 7077 | #: app/views/memberships/suggest.html.erb:1 |
7129 | -#, fuzzy | |
7130 | 7078 | msgid "Communities suggestions for %s" |
7131 | -msgstr "Configurações do perfil para %s" | |
7079 | +msgstr "Sugestões de comunidades para %s" | |
7132 | 7080 | |
7133 | 7081 | #: app/views/memberships/suggest.html.erb:4 |
7134 | 7082 | #: app/views/memberships/connections.html.erb:4 |
7135 | -#, fuzzy | |
7136 | 7083 | msgid "Go to groups list" |
7137 | -msgstr "Nenhum grupo para listar" | |
7084 | +msgstr "Ir para a lista de grupos" | |
7138 | 7085 | |
7139 | 7086 | #: app/views/memberships/new_community.html.erb:1 |
7140 | 7087 | msgid "Creating new community" |
... | ... | @@ -7153,7 +7100,7 @@ msgstr "" |
7153 | 7100 | |
7154 | 7101 | #: app/views/memberships/remove_suggestion.html.erb:2 |
7155 | 7102 | msgid "Removing suggestion for community: %s" |
7156 | -msgstr "" | |
7103 | +msgstr "Removendo sugestão para a comunidade %s" | |
7157 | 7104 | |
7158 | 7105 | #: app/views/memberships/index.html.erb:6 |
7159 | 7106 | #: app/views/profile/communities.html.erb:19 |
... | ... | @@ -7166,9 +7113,8 @@ msgid "Register a new enterprise" |
7166 | 7113 | msgstr "Registrar um novo empreendimento" |
7167 | 7114 | |
7168 | 7115 | #: app/views/memberships/index.html.erb:19 |
7169 | -#, fuzzy | |
7170 | 7116 | msgid "See some suggestions of communities..." |
7171 | -msgstr "Administrador tem que aprovar a criação de comunidades" | |
7117 | +msgstr "Veja algumas sugestões de comunidades..." | |
7172 | 7118 | |
7173 | 7119 | #: app/views/memberships/index.html.erb:23 |
7174 | 7120 | msgid "No groups to list" |
... | ... | @@ -7574,9 +7520,8 @@ msgid "Drag images to add them to the text." |
7574 | 7520 | msgstr "Arraste as imagens para adicioná-las ao texto." |
7575 | 7521 | |
7576 | 7522 | #: app/views/cms/_drag_and_drop_note.html.erb:4 |
7577 | -#, fuzzy | |
7578 | 7523 | msgid "Click on file names to add links to the text." |
7579 | -msgstr "Arraste as imagens para adicioná-las ao texto." | |
7524 | +msgstr "Clique no nome dos arquivos para adicionar links ao texto." | |
7580 | 7525 | |
7581 | 7526 | #: app/views/cms/upload_files.html.erb:3 |
7582 | 7527 | msgid "This file couldn't be saved" |
... | ... | @@ -7609,34 +7554,28 @@ msgid "Insert media" |
7609 | 7554 | msgstr "Adicionar mídia" |
7610 | 7555 | |
7611 | 7556 | #: app/views/cms/_text_editor_sidebar.html.erb:8 |
7612 | -#, fuzzy | |
7613 | 7557 | msgid "Show/Hide" |
7614 | -msgstr "Mostrar" | |
7558 | +msgstr "Mostrar/Ocultar" | |
7615 | 7559 | |
7616 | 7560 | #: app/views/cms/_text_editor_sidebar.html.erb:21 |
7617 | -#, fuzzy | |
7618 | 7561 | msgid "New folder" |
7619 | -msgstr "pasta superior" | |
7562 | +msgstr "Nova pasta" | |
7620 | 7563 | |
7621 | 7564 | #: app/views/cms/_text_editor_sidebar.html.erb:26 |
7622 | -#, fuzzy | |
7623 | 7565 | msgid "Hide all uploads" |
7624 | -msgstr "Ver todos os produtos" | |
7566 | +msgstr "Ocultar todos os envios" | |
7625 | 7567 | |
7626 | 7568 | #: app/views/cms/_text_editor_sidebar.html.erb:27 |
7627 | -#, fuzzy | |
7628 | 7569 | msgid "Show all uploads" |
7629 | -msgstr "Ver todos os produtos" | |
7570 | +msgstr "Mostrar todos os envios" | |
7630 | 7571 | |
7631 | 7572 | #: app/views/cms/_text_editor_sidebar.html.erb:33 |
7632 | -#, fuzzy | |
7633 | 7573 | msgid "Recent media" |
7634 | -msgstr "Adicionar mídia" | |
7574 | +msgstr "Imagens e arquivos recentes" | |
7635 | 7575 | |
7636 | 7576 | #: app/views/cms/_link_article.html.erb:3 |
7637 | -#, fuzzy | |
7638 | 7577 | msgid "Reference" |
7639 | -msgstr "Url de referência" | |
7578 | +msgstr "Referência" | |
7640 | 7579 | |
7641 | 7580 | #: app/views/cms/select_article_type.html.erb:3 |
7642 | 7581 | msgid "Choose the type of content:" |
... | ... | @@ -7647,46 +7586,48 @@ msgid "This is a republication of \"%s\", by %s." |
7647 | 7586 | msgstr "Esta é uma republicação de \"%s\", por %s." |
7648 | 7587 | |
7649 | 7588 | #: app/views/cms/publish.html.erb:3 |
7650 | -#, fuzzy | |
7651 | 7589 | msgid "Where do you want to publish this article?" |
7652 | -msgstr "Selecione os grupos onde você quer publicar seu artigo" | |
7590 | +msgstr "Onde você deseja publicar este artigo?" | |
7653 | 7591 | |
7654 | 7592 | #: app/views/cms/publish.html.erb:7 |
7655 | 7593 | msgid "There were errors with the following communities: " |
7656 | 7594 | msgstr "Houve problemas com as seguintes comunidades: " |
7657 | 7595 | |
7658 | 7596 | #: app/views/cms/publish.html.erb:22 |
7659 | -#, fuzzy | |
7660 | 7597 | msgid "Publish this article on your profile" |
7661 | -msgstr "Publicar seu artigo na comunidade portal" | |
7598 | +msgstr "Publicar este artigo no seu perfil" | |
7662 | 7599 | |
7663 | 7600 | #: app/views/cms/publish.html.erb:23 |
7664 | 7601 | msgid "" |
7665 | 7602 | "You can publish this article on your profile where your friends and " |
7666 | 7603 | "followers will see." |
7667 | 7604 | msgstr "" |
7605 | +"Você pode publicar este artigo no seu perfil, para seus amigos e seguidores " | |
7606 | +"poderem ver." | |
7668 | 7607 | |
7669 | 7608 | #: app/views/cms/publish.html.erb:37 |
7670 | -#, fuzzy | |
7671 | 7609 | msgid "Publish this article on communities you are part of" |
7672 | -msgstr "Publicar seu artigo na comunidade portal" | |
7610 | +msgstr "Publicar este artigo em comunidades que você faz parte" | |
7673 | 7611 | |
7674 | 7612 | #: app/views/cms/publish.html.erb:38 |
7675 | 7613 | msgid "" |
7676 | 7614 | "You can submit this article to one or more communities you are a member of, " |
7677 | 7615 | "just search for the community below." |
7678 | 7616 | msgstr "" |
7617 | +"Você pode enviar este artigo para uma ou mais comunidades das quais você faz " | |
7618 | +"parte. Basta buscar a(s) comunidade(s) abaixo." | |
7679 | 7619 | |
7680 | 7620 | #: app/views/cms/publish.html.erb:42 |
7681 | -#, fuzzy | |
7682 | 7621 | msgid "Type in a search for your community" |
7683 | -msgstr "Digite um termo de pesquisa para os usuários" | |
7622 | +msgstr "Digite um termo de busca para a(s) comunidade(s)" | |
7684 | 7623 | |
7685 | 7624 | #: app/views/cms/publish.html.erb:55 |
7686 | 7625 | msgid "" |
7687 | 7626 | "You can suggest this article to the portal community, where it can show up " |
7688 | 7627 | "on the homepage." |
7689 | 7628 | msgstr "" |
7629 | +"Você pode sugerir este artigo para a comunidade do portal, de modo que ele " | |
7630 | +"apareça na página inicial." | |
7690 | 7631 | |
7691 | 7632 | #: app/views/cms/destroy.html.erb:1 |
7692 | 7633 | msgid "Delete: %s" |
... | ... | @@ -7709,14 +7650,12 @@ msgid "Yes, I want." |
7709 | 7650 | msgstr "Sim, eu quero." |
7710 | 7651 | |
7711 | 7652 | #: app/views/cms/_media_new_folder.html.erb:1 |
7712 | -#, fuzzy | |
7713 | 7653 | msgid "Create new folder" |
7714 | -msgstr "Criar um novo papel" | |
7654 | +msgstr "Criar nova pasta" | |
7715 | 7655 | |
7716 | 7656 | #: app/views/cms/_media_new_folder.html.erb:3 |
7717 | -#, fuzzy | |
7718 | 7657 | msgid "Choose parent folder:" |
7719 | -msgstr "pasta superior" | |
7658 | +msgstr "Escolha a pasta-mãe:" | |
7720 | 7659 | |
7721 | 7660 | #: app/views/cms/_media_new_folder.html.erb:11 |
7722 | 7661 | #: app/views/manage_products/_form.html.erb:6 |
... | ... | @@ -7826,14 +7765,12 @@ msgid "You can manage your enterprise now." |
7826 | 7765 | msgstr "Você pode gerenciar seu empreendimento agora." |
7827 | 7766 | |
7828 | 7767 | #: app/views/person_notifier/mailer/content_summary.html.erb:8 |
7829 | -#, fuzzy | |
7830 | 7768 | msgid "%s's Notifications" |
7831 | -msgstr "Opções de notificação" | |
7769 | +msgstr "Notificações de %s" | |
7832 | 7770 | |
7833 | 7771 | #: app/views/person_notifier/mailer/content_summary.html.erb:23 |
7834 | -#, fuzzy | |
7835 | 7772 | msgid "Network Activity" |
7836 | -msgstr "[%s] Atividade da Rede" | |
7773 | +msgstr "Atividade da rede" | |
7837 | 7774 | |
7838 | 7775 | #: app/views/person_notifier/mailer/_profile_comments.html.erb:6 |
7839 | 7776 | msgid "View all %s comments" |
... | ... | @@ -7859,14 +7796,12 @@ msgid "communities|View all" |
7859 | 7796 | msgstr "Ver todas" |
7860 | 7797 | |
7861 | 7798 | #: app/views/blocks/communities.html.erb:9 |
7862 | -#, fuzzy | |
7863 | 7799 | msgid "Some suggestions for you" |
7864 | -msgstr "Sugestões: %s" | |
7800 | +msgstr "Algumas sugestões para você" | |
7865 | 7801 | |
7866 | 7802 | #: app/views/blocks/communities.html.erb:14 |
7867 | -#, fuzzy | |
7868 | 7803 | msgid "See all suggestions" |
7869 | -msgstr "Sugestão de artigo" | |
7804 | +msgstr "Veja todas as sugestões" | |
7870 | 7805 | |
7871 | 7806 | #: app/views/blocks/profile_info.html.erb:19 |
7872 | 7807 | #: app/views/blocks/my_network.html.erb:5 |
... | ... | @@ -8495,14 +8430,12 @@ msgid "Do you want to remove this user?" |
8495 | 8430 | msgstr "Você quer remover esse usuário?" |
8496 | 8431 | |
8497 | 8432 | #: app/views/invite/select_friends.html.erb:10 |
8498 | -#, fuzzy | |
8499 | 8433 | msgid "Step 2 of 2: Selecting People" |
8500 | -msgstr "Passo 2 de 2: Selecionando Amigos" | |
8434 | +msgstr "Passo 2 de 2: Selecionando amigos" | |
8501 | 8435 | |
8502 | 8436 | #: app/views/invite/select_friends.html.erb:15 |
8503 | -#, fuzzy | |
8504 | 8437 | msgid "Indicate which people you want to invite." |
8505 | -msgstr "Indique quais amigos você quer convidar." | |
8438 | +msgstr "Indique quais pessoas você quer convidar." | |
8506 | 8439 | |
8507 | 8440 | #: app/views/invite/select_friends.html.erb:23 |
8508 | 8441 | msgid "Enter one e-mail address per line:" |
... | ... | @@ -8518,34 +8451,31 @@ msgstr "Desmarcar todos" |
8518 | 8451 | |
8519 | 8452 | #: app/views/invite/select_friends.html.erb:36 |
8520 | 8453 | msgid "Invite!" |
8521 | -msgstr "" | |
8454 | +msgstr "Convidar!" | |
8522 | 8455 | |
8523 | 8456 | #: app/views/invite/invite_friends.html.erb:2 |
8524 | -#, fuzzy | |
8525 | 8457 | msgid "Ask for friendship" |
8526 | -msgstr "%s amigos" | |
8458 | +msgstr "Solicite amizade" | |
8527 | 8459 | |
8528 | 8460 | #: app/views/invite/invite_friends.html.erb:3 |
8529 | 8461 | msgid "You can search for user profiles and ask them to become your friends." |
8530 | -msgstr "" | |
8462 | +msgstr "Você pode procurar pessoas e pedir que elas se tornem suas amigas." | |
8531 | 8463 | |
8532 | 8464 | #: app/views/invite/invite_friends.html.erb:6 |
8533 | 8465 | msgid "You can search for user profiles and invite them to join this group." |
8534 | -msgstr "" | |
8466 | +msgstr "Você pode procurar pessoas e convidá-las a entrar neste grupo." | |
8535 | 8467 | |
8536 | 8468 | #: app/views/invite/invite_friends.html.erb:10 |
8537 | -#, fuzzy | |
8538 | 8469 | msgid "Choose person by:" |
8539 | -msgstr "Escolha um blog:" | |
8470 | +msgstr "Escolha a pessoa por:" | |
8540 | 8471 | |
8541 | 8472 | #: app/views/invite/invite_friends.html.erb:24 |
8542 | 8473 | msgid "Type in the person's %{search_fields}" |
8543 | -msgstr "" | |
8474 | +msgstr "Digite os campos %{search_fields} da pessoa" | |
8544 | 8475 | |
8545 | 8476 | #: app/views/invite/invite_friends.html.erb:28 |
8546 | -#, fuzzy | |
8547 | 8477 | msgid "Invite" |
8548 | -msgstr "Convite" | |
8478 | +msgstr "Convidar" | |
8549 | 8479 | |
8550 | 8480 | #: app/views/invite/invite_friends.html.erb:35 |
8551 | 8481 | msgid "Invite people from my e-mail contacts" |
... | ... | @@ -8728,29 +8658,29 @@ msgstr "Ver lista validações de empreendimentos processados" |
8728 | 8658 | |
8729 | 8659 | #: app/views/user_mailer/profiles_suggestions_email.html.erb:3 |
8730 | 8660 | msgid "We want to give you some suggestions to grow up your network." |
8731 | -msgstr "" | |
8661 | +msgstr "Nós queremos fornecer a você algumas sugestões para ampliar sua rede." | |
8732 | 8662 | |
8733 | 8663 | #: app/views/user_mailer/profiles_suggestions_email.html.erb:4 |
8734 | 8664 | msgid "Check it out!" |
8735 | -msgstr "" | |
8665 | +msgstr "Confira!" | |
8736 | 8666 | |
8737 | 8667 | #: app/views/user_mailer/profiles_suggestions_email.html.erb:7 |
8738 | -#, fuzzy | |
8739 | 8668 | msgid "Friends suggestions:" |
8740 | -msgstr "Sugestão de artigo" | |
8669 | +msgstr "Sugestões de amizades:" | |
8741 | 8670 | |
8742 | 8671 | #: app/views/user_mailer/profiles_suggestions_email.html.erb:14 |
8743 | 8672 | msgid "To see the full list of friends suggestions, follow the link: %s" |
8744 | 8673 | msgstr "" |
8674 | +"Para ver a lista completa de sugestões de amizade, clique neste link: %s" | |
8745 | 8675 | |
8746 | 8676 | #: app/views/user_mailer/profiles_suggestions_email.html.erb:18 |
8747 | -#, fuzzy | |
8748 | 8677 | msgid "Communities suggestions:" |
8749 | -msgstr "Menu de comunidades" | |
8678 | +msgstr "Sugestões de comunidades:" | |
8750 | 8679 | |
8751 | 8680 | #: app/views/user_mailer/profiles_suggestions_email.html.erb:25 |
8752 | 8681 | msgid "To see the full list of communities suggestions, follow the link: %s" |
8753 | 8682 | msgstr "" |
8683 | +"Para ver a lista completa de sugestões de comunidades, clique neste link: %s" | |
8754 | 8684 | |
8755 | 8685 | #: app/views/user_mailer/activation_code.text.erb:3 |
8756 | 8686 | #: app/views/user/mailer/activation_code.html.erb:3 |
... | ... | @@ -9295,52 +9225,50 @@ msgid "Select Portal Folders" |
9295 | 9225 | msgstr "Selecionar Pastas do Portal" |
9296 | 9226 | |
9297 | 9227 | #: app/views/admin_panel/set_portal_community.html.erb:21 |
9298 | -#, fuzzy | |
9299 | 9228 | msgid "Define news amount on portal" |
9300 | -msgstr "Definir Quantidade por Pasta" | |
9229 | +msgstr "Definir a quantidade de notícias no portal" | |
9301 | 9230 | |
9302 | 9231 | #: app/views/admin_panel/_signup_welcome_screen.html.erb:2 |
9303 | 9232 | msgid "" |
9304 | 9233 | "If you enable this feature on the \"Features\" section of the Administration " |
9305 | 9234 | "Panel, this text will be shown as a welcome message to users after signup." |
9306 | 9235 | msgstr "" |
9236 | +"Se você ativar esta funcionalidade na seção \"Funcionalidades\" do painel de " | |
9237 | +"administração, este texto será exibido como uma mensagem de boas vindas ao " | |
9238 | +"usuário após se registrar." | |
9307 | 9239 | |
9308 | 9240 | #: app/views/admin_panel/_signup_welcome_screen.html.erb:7 |
9309 | 9241 | msgid "" |
9310 | 9242 | "If this content is left blank, the following page will be displayed to the " |
9311 | 9243 | "user:" |
9312 | 9244 | msgstr "" |
9245 | +"Se este conteúdo ficar em branco, a seguinte página será exibida ao novo " | |
9246 | +"usuário:" | |
9313 | 9247 | |
9314 | 9248 | #: app/views/admin_panel/manage_organizations_status.html.erb:1 |
9315 | -#, fuzzy | |
9316 | 9249 | msgid "Manage organizations" |
9317 | -msgstr "Organização do perfil" | |
9250 | +msgstr "Gerenciar organizações" | |
9318 | 9251 | |
9319 | 9252 | #: app/views/admin_panel/manage_organizations_status.html.erb:7 |
9320 | -#, fuzzy | |
9321 | 9253 | msgid "Find profiles" |
9322 | -msgstr "Perfis aleatórios" | |
9254 | +msgstr "Buscar perfis" | |
9323 | 9255 | |
9324 | 9256 | #: app/views/admin_panel/manage_organizations_status.html.erb:17 |
9325 | -#, fuzzy | |
9326 | 9257 | msgid "Filter by: " |
9327 | -msgstr "Filtro" | |
9258 | +msgstr "Filtrar por: " | |
9328 | 9259 | |
9329 | 9260 | #: app/views/admin_panel/manage_organizations_status.html.erb:44 |
9330 | -#, fuzzy | |
9331 | 9261 | msgid "Deactivate" |
9332 | -msgstr "Desativar usuário" | |
9262 | +msgstr "Desativar" | |
9333 | 9263 | |
9334 | 9264 | #: app/views/admin_panel/manage_organizations_status.html.erb:44 |
9335 | 9265 | #: app/views/admin_panel/manage_organizations_status.html.erb:48 |
9336 | -#, fuzzy | |
9337 | 9266 | msgid "Do you want to deactivate this profile ?" |
9338 | -msgstr "Você quer desativar esse usuário?" | |
9267 | +msgstr "Você deseja desativar esse perfil?" | |
9339 | 9268 | |
9340 | 9269 | #: app/views/admin_panel/manage_organizations_status.html.erb:46 |
9341 | -#, fuzzy | |
9342 | 9270 | msgid "Do you want to activate this profile ?" |
9343 | -msgstr "Você quer ativar esse usuário?" | |
9271 | +msgstr "Você deseja ativar esse perfil?" | |
9344 | 9272 | |
9345 | 9273 | #: app/views/admin_panel/set_portal_folders.html.erb:1 |
9346 | 9274 | msgid "Select folders" |
... | ... | @@ -9424,34 +9352,28 @@ msgid "Terms of use" |
9424 | 9352 | msgstr "Termos de Uso" |
9425 | 9353 | |
9426 | 9354 | #: app/views/admin_panel/site_info.html.erb:16 |
9427 | -#, fuzzy | |
9428 | 9355 | msgid "Signup welcome email" |
9429 | -msgstr "Texto de boas vindas no registro" | |
9356 | +msgstr "E-mail de boas vindas após o registro" | |
9430 | 9357 | |
9431 | 9358 | #: app/views/admin_panel/site_info.html.erb:18 |
9432 | -#, fuzzy | |
9433 | 9359 | msgid "Signup welcome page" |
9434 | -msgstr "Texto de boas vindas no registro" | |
9360 | +msgstr "Página de boas vindas após o registro" | |
9435 | 9361 | |
9436 | 9362 | #: app/views/admin_panel/set_portal_news_amount.html.erb:1 |
9437 | -#, fuzzy | |
9438 | 9363 | msgid "News amount on portal" |
9439 | -msgstr "Quantidade de notícias por pasta" | |
9364 | +msgstr "Quantidade de notícias no portal" | |
9440 | 9365 | |
9441 | 9366 | #: app/views/admin_panel/set_portal_news_amount.html.erb:5 |
9442 | -#, fuzzy | |
9443 | 9367 | msgid "Number of highlighted news" |
9444 | -msgstr "Número de notícias" | |
9368 | +msgstr "Quantidade de notícias destacadas" | |
9445 | 9369 | |
9446 | 9370 | #: app/views/admin_panel/set_portal_news_amount.html.erb:6 |
9447 | -#, fuzzy | |
9448 | 9371 | msgid "Number of portal news" |
9449 | -msgstr "Número de notícias" | |
9372 | +msgstr "Quantidade de notícias do portal" | |
9450 | 9373 | |
9451 | 9374 | #: app/views/admin_panel/set_portal_news_amount.html.erb:7 |
9452 | -#, fuzzy | |
9453 | 9375 | msgid "Number of news by folder" |
9454 | -msgstr "Número de notícias" | |
9376 | +msgstr "Quantidade de notícias por pasta" | |
9455 | 9377 | |
9456 | 9378 | #: app/views/admin_panel/index.html.erb:1 |
9457 | 9379 | msgid "Administrator Panel" |
... | ... | @@ -9507,9 +9429,8 @@ msgid "Fields" |
9507 | 9429 | msgstr "Campos" |
9508 | 9430 | |
9509 | 9431 | #: app/views/admin_panel/index.html.erb:23 |
9510 | -#, fuzzy | |
9511 | 9432 | msgid "Manage organizations status" |
9512 | -msgstr "Gerenciar suas tarefas pendentes" | |
9433 | +msgstr "Gerenciar a situação das organizações" | |
9513 | 9434 | |
9514 | 9435 | #: app/views/admin_panel/index.html.erb:39 |
9515 | 9436 | msgid "Enterprise-related settings" | ... | ... |
script/noosfero-plugins
... | ... | @@ -82,7 +82,6 @@ _enable(){ |
82 | 82 | |
83 | 83 | if [ -d "$available_plugins_dir/$plugin" ]; then |
84 | 84 | source="$available_plugins_dir/$plugin" |
85 | - linksource="../../plugins/$plugin" | |
86 | 85 | else |
87 | 86 | if [ ! -d "$plugin" ]; then |
88 | 87 | echo "E: $plugin not found (needs to be an existing directory)" |
... | ... | @@ -91,7 +90,6 @@ _enable(){ |
91 | 90 | |
92 | 91 | # out-of-tree plugins |
93 | 92 | source="$plugin" |
94 | - linksource="$source" | |
95 | 93 | plugin=$(basename "$plugin") |
96 | 94 | fi |
97 | 95 | |
... | ... | @@ -114,7 +112,7 @@ _enable(){ |
114 | 112 | dependencies_file="$source/dependencies.rb" |
115 | 113 | if [ -e $source/Gemfile ]; then |
116 | 114 | gemfile=$(mktemp --tmpdir=.) |
117 | - cat Gemfile $source/Gemfile > $gemfile | |
115 | + cat $NOOSFERO_DIR/Gemfile $source/Gemfile > $gemfile | |
118 | 116 | if ! RUBYOPT='' BUNDLE_GEMFILE="$gemfile" bundle --local --quiet; then |
119 | 117 | dependencies_ok=false |
120 | 118 | fi |
... | ... | @@ -125,7 +123,7 @@ _enable(){ |
125 | 123 | fi |
126 | 124 | fi |
127 | 125 | if [ "$installation_ok" = true ] && [ "$dependencies_ok" = true ]; then |
128 | - ln -s "$linksource" "$target" | |
126 | + ln -s "$source" "$target" | |
129 | 127 | plugins_public_dir="$NOOSFERO_DIR/public/plugins" |
130 | 128 | plugins_features_dir="$NOOSFERO_DIR/features/plugins" |
131 | 129 | test -d "$target/public" && ln -s "$target/public" "$plugins_public_dir/$plugin" | ... | ... |
script/production
... | ... | @@ -71,11 +71,11 @@ stop_via_pid_file() { |
71 | 71 | |
72 | 72 | environments_loop() { |
73 | 73 | action="$1" |
74 | - environments=$(find ./config/environments -name *_$RAILS_ENV.rb) | |
74 | + environments=$(find ./config/environments -name "*_${RAILS_ENV}.rb") | |
75 | 75 | if [ "$environments" ]; then |
76 | 76 | for environment in $environments; do |
77 | 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 | 79 | RAILS_ENV=$env bundle exec ./script/feed-updater "$action" -i $env |
80 | 80 | done |
81 | 81 | else | ... | ... |
test/unit/article_test.rb
... | ... | @@ -1892,4 +1892,233 @@ class ArticleTest < ActiveSupport::TestCase |
1892 | 1892 | assert_equal p3, article.author_by_version(3) |
1893 | 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 | 2124 | end | ... | ... |
test/unit/person_test.rb
... | ... | @@ -1631,4 +1631,9 @@ class PersonTest < ActiveSupport::TestCase |
1631 | 1631 | assert person.can_change_homepage? |
1632 | 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 | 1639 | end | ... | ... |