Merge branch 'master' of gitlab.com:noosfero/noosfero

Leandro Santos
2 parents 737a3688 dac513ed
Showing 5 changed files with 39 additions and 43 deletions Show diff stats
plugins/custom_forms/controllers/custom_forms_plugin_profile_controller.rb
plugins/custom_forms/test/functional/custom_forms_plugin_profile_controller_test.rb
plugins/metadata/lib/ext/profile.rb
po/fr/noosfero.po
po/pt/noosfero.po
@@ -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
@@ -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")
@@ -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)
@@ -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,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-12 15:51+0200\n"
-"Last-Translator: daniel <dtygel@eita.org.br>\n"
+"PO-Revision-Date: 2015-03-13 14:56+0200\n"
+"Last-Translator: TWS <tablettws@gmail.com>\n"
 "Language-Team: Portuguese "
 "<https://hosted.weblate.org/projects/noosfero/noosfero/pt/>\n"
 "Language: pt\n"
@@ -26,15 +26,15 @@ msgstr &quot;&quot;
 #: app/models/approve_comment.rb:17
 msgid "Anonymous"
-msgstr "Anônimo"
+msgstr "Anonimo"
 #: app/models/approve_comment.rb:25 app/models/approve_article.rb:17
 msgid "Article removed."
-msgstr "Artigo removido."
+msgstr "Articolo Rimosso."
 #: app/models/approve_comment.rb:33
 msgid "New comment to article"
-msgstr "Novo comentário para o artigo"
+msgstr "Nuovo commento in questo articolo"
 #: app/models/approve_comment.rb:49 app/models/approve_comment.rb:51
 msgid "%{requestor} commented on the article: %{linked_subject}."
	@@ -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)