Download as
Browse Code »

Commit 5cff799c8fa569782c850ed0a782007bfbd74e30

Authored by Michel Felipe
2 parents 5e126d2f 00d07ecc
Exists in master and in 7 other branches avoid_duplicated_tasks, proposal_response, proposal_task_category_required, remove_escaped_html, restore_rejected_proposal, staging, tasks_keep_filter_params

Merge branch 'master' of gitlab.com:noosfero-plugins/proposals_discussion

Showing 3 changed files with 78 additions and 102 deletions   Show diff stats
lib/proposals_discussion_plugin/discussion.rb
  Diff comments   View file @5cff799
... ... @@ -60,4 +60,8 @@ class ProposalsDiscussionPlugin::Discussion < ProposalsDiscussionPlugin::Proposa
60 60 ProposalsDiscussionPlugin::Proposal.from_discussion(self)
61 61 end
62 62  
  63 + def display_media_panel?
  64 + true
  65 + end
  66 +
63 67 end
... ...
lib/proposals_discussion_plugin/topic.rb
  Diff comments   View file @5cff799
... ... @@ -27,4 +27,8 @@ class ProposalsDiscussionPlugin::Topic < ProposalsDiscussionPlugin::ProposalsHo
27 27 !discussion.moderate_proposals
28 28 end
29 29  
  30 + def display_media_panel?
  31 + true
  32 + end
  33 +
30 34 end
... ...
po/pt/proposals_discussion.po
  Diff comments   View file @5cff799
1 1 msgid ""
2 2 msgstr ""
3   -"Project-Id-Version: 1.1-2853-g2066e85\n"
4   -"POT-Creation-Date: 2015-07-13 19:42-0300\n"
  3 +"Project-Id-Version: 0.45.0-6097-g490300c\n"
  4 +"POT-Creation-Date: 2015-07-23 16:25-0300\n"
5 5 "PO-Revision-Date: 2015-02-12 09:49-0300\n"
6 6 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
7 7 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -26,20 +26,19 @@ msgid &quot;Error flagging proposal. Please, contact the system admin&quot;
26 26 msgstr "Erro ao marcar a proposta. Favor contactar o administrador do sistema"
27 27  
28 28 #: plugins/proposals_discussion/controllers/myprofile/proposals_discussion_plugin_tasks_controller.rb:19
29   -#: plugins/proposals_discussion/views/tasks/processed.html.erb:8
30 29 #: plugins/proposals_discussion/views/proposals_discussion_plugin_tasks/index.html.erb:7
31 30 #: plugins/proposals_discussion/views/proposals_discussion_plugin_tasks/index.html.erb:35
32 31 msgid "All"
33 32 msgstr "Todas"
34 33  
35   -#: plugins/proposals_discussion/controllers/myprofile/proposals_discussion_plugin_tasks_controller.rb:54
  34 +#: plugins/proposals_discussion/controllers/myprofile/proposals_discussion_plugin_tasks_controller.rb:53
36 35 #, fuzzy
37 36 msgid "Error to save categories. Please, contact the system admin"
38 37 msgstr "Erro ao marcar a proposta. Favor contactar o administrador do sistema"
39 38  
40   -#: plugins/proposals_discussion/controllers/myprofile/proposals_discussion_plugin_tasks_controller.rb:71
  39 +#: plugins/proposals_discussion/controllers/myprofile/proposals_discussion_plugin_tasks_controller.rb:72
41 40 msgid "Saved with success!"
42   -msgstr ""
  41 +msgstr "Salvo com sucesso!"
43 42  
44 43 #: plugins/proposals_discussion/controllers/myprofile/proposals_discussion_plugin_myprofile_controller.rb:11
45 44 msgid "Please select a topic"
... ... @@ -129,11 +128,11 @@ msgstr &quot;&quot;
129 128 "\">enviou a seguinte proposta.</span><br/><span class=\"abstract\">"
130 129 "%{abstract}</span>"
131 130  
132   -#: plugins/proposals_discussion/lib/proposals_discussion_plugin/proposal_task.rb:184
  131 +#: plugins/proposals_discussion/lib/proposals_discussion_plugin/proposal_task.rb:180
133 132 msgid "%{requestor} wants to send a proposal."
134   -msgstr "%{requestor} quer enviar a proposta"
  133 +msgstr "%{requestor} quer enviar a proposta."
135 134  
136   -#: plugins/proposals_discussion/lib/proposals_discussion_plugin/proposal_task.rb:189
  135 +#: plugins/proposals_discussion/lib/proposals_discussion_plugin/proposal_task.rb:185
137 136 msgid ""
138 137 "You will need login to %{system} in order to accept or reject the proposal "
139 138 "sent by %{requestor}"
... ... @@ -141,7 +140,7 @@ msgstr &quot;&quot;
141 140 "Você precisará logar em %{system} a fim de aceitar ou rejeitar a proposta "
142 141 "enviada por %{requestor}"
143 142  
144   -#: plugins/proposals_discussion/lib/proposals_discussion_plugin/proposal_task.rb:269
  143 +#: plugins/proposals_discussion/lib/proposals_discussion_plugin/proposal_task.rb:210
145 144 msgid ""
146 145 "Your request for publishing the proposal \"%{article}\" was approved. Here "
147 146 "is the comment left by the admin who approved your proposal:\n"
... ... @@ -153,15 +152,15 @@ msgstr &quot;&quot;
153 152 "\n"
154 153 "%{comment} "
155 154  
156   -#: plugins/proposals_discussion/lib/proposals_discussion_plugin/proposal_task.rb:271
  155 +#: plugins/proposals_discussion/lib/proposals_discussion_plugin/proposal_task.rb:212
157 156 msgid "Your request for publishing the proposal \"%{article}\" was approved."
158 157 msgstr "Sua requisição para publicar a proposta \"%{article}\" foi aprovada."
159 158  
160   -#: plugins/proposals_discussion/lib/proposals_discussion_plugin/proposal_task.rb:276
  159 +#: plugins/proposals_discussion/lib/proposals_discussion_plugin/proposal_task.rb:217
161 160 msgid "Your request for publishing the proposal \"%{article}\" was rejected."
162 161 msgstr "Sua requisição para publicar a proposta \"%{article}\" foi rejeitada."
163 162  
164   -#: plugins/proposals_discussion/lib/proposals_discussion_plugin/proposal_task.rb:278
  163 +#: plugins/proposals_discussion/lib/proposals_discussion_plugin/proposal_task.rb:219
165 164 msgid ""
166 165 "Here is the reject explanation left by the moderator who rejected your "
167 166 "proposal: \n"
... ... @@ -172,7 +171,7 @@ msgstr &quot;&quot;
172 171 "\n"
173 172 "%{reject_explanation}"
174 173  
175   -#: plugins/proposals_discussion/lib/proposals_discussion_plugin/proposal_task.rb:312
  174 +#: plugins/proposals_discussion/lib/proposals_discussion_plugin/proposal_task.rb:253
176 175 msgid "Select at least one category"
177 176 msgstr "Selecione pelo menos uma categoria"
178 177  
... ... @@ -249,137 +248,78 @@ msgstr &quot;Chave Privada&quot;
249 248 msgid "New Host"
250 249 msgstr "Novo Endereço"
251 250  
252   -#: plugins/proposals_discussion/views/tasks/processed.html.erb:4
253   -#, fuzzy
254   -msgid "%s's processed tasks"
255   -msgstr "Visualizar tarefas processadas"
256   -
257   -#: plugins/proposals_discussion/views/tasks/processed.html.erb:11
258   -#: plugins/proposals_discussion/views/proposals_discussion_plugin_tasks/index.html.erb:26
259   -msgid "Filter"
260   -msgstr "Filtro"
261   -
262   -#: plugins/proposals_discussion/views/tasks/processed.html.erb:13
263   -#: plugins/proposals_discussion/views/proposals_discussion_plugin_tasks/index.html.erb:28
264   -msgid "Type of task"
265   -msgstr "Tipo de tarefa"
266   -
267   -#: plugins/proposals_discussion/views/tasks/processed.html.erb:14
268   -#, fuzzy
269   -msgid "Status:"
270   -msgstr "Estatísticas"
271   -
272   -#: plugins/proposals_discussion/views/tasks/processed.html.erb:14
273   -msgid "Any"
274   -msgstr ""
275   -
276   -#: plugins/proposals_discussion/views/tasks/processed.html.erb:18
277   -#, fuzzy
278   -msgid "Text Filter:"
279   -msgstr "Filtro de texto"
280   -
281   -#: plugins/proposals_discussion/views/tasks/processed.html.erb:22
282   -msgid "Requestor:"
283   -msgstr ""
284   -
285   -#: plugins/proposals_discussion/views/tasks/processed.html.erb:23
286   -msgid "Closed by:"
287   -msgstr ""
288   -
289   -#: plugins/proposals_discussion/views/tasks/processed.html.erb:26
290   -msgid "Creation date"
291   -msgstr ""
292   -
293   -#: plugins/proposals_discussion/views/tasks/processed.html.erb:27
294   -msgid "Processed date"
295   -msgstr ""
296   -
297   -#: plugins/proposals_discussion/views/tasks/processed.html.erb:30
298   -#: plugins/proposals_discussion/views/proposals_discussion_plugin_tasks/index.html.erb:43
299   -msgid "Search"
300   -msgstr "Buscar"
301   -
302   -#: plugins/proposals_discussion/views/tasks/processed.html.erb:38
303   -#, fuzzy
304   -msgid "No processed tasks."
305   -msgstr "Visualizar tarefas processadas"
306   -
307   -#: plugins/proposals_discussion/views/tasks/processed.html.erb:43
308   -#: plugins/proposals_discussion/views/tasks/_task.html.erb:4
  251 +#: plugins/proposals_discussion/views/tasks/proposals_discussion_plugin/_proposal_task_processed.html.erb:2
  252 +#: plugins/proposals_discussion/views/tasks/proposals_discussion_plugin/_proposal_task.html.erb:3
309 253 #: plugins/proposals_discussion/views/proposals_discussion_plugin_tasks/_task.html.erb:3
310 254 msgid "Source"
311 255 msgstr "Origem"
312 256  
313   -#: plugins/proposals_discussion/views/tasks/processed.html.erb:52
  257 +#: plugins/proposals_discussion/views/tasks/proposals_discussion_plugin/_proposal_task_processed.html.erb:12
314 258 msgid "Created:"
315   -msgstr ""
  259 +msgstr "Criado:"
316 260  
317   -#: plugins/proposals_discussion/views/tasks/processed.html.erb:58
  261 +#: plugins/proposals_discussion/views/tasks/proposals_discussion_plugin/_proposal_task_processed.html.erb:18
318 262 #: plugins/proposals_discussion/views/proposals_discussion_plugin_tasks/_task.html.erb:50
319 263 msgid "Moderator"
320 264 msgstr "Moderador"
321 265  
322   -#: plugins/proposals_discussion/views/tasks/processed.html.erb:62
  266 +#: plugins/proposals_discussion/views/tasks/proposals_discussion_plugin/_proposal_task_processed.html.erb:22
323 267 #: plugins/proposals_discussion/views/proposals_discussion_plugin_tasks/_task.html.erb:54
324 268 msgid "Moderated at"
325 269 msgstr "Moderado em"
326 270  
327   -#: plugins/proposals_discussion/views/tasks/processed.html.erb:69
  271 +#: plugins/proposals_discussion/views/tasks/proposals_discussion_plugin/_proposal_task_processed.html.erb:29
328 272 msgid "Evaluator"
329 273 msgstr "Validador"
330 274  
331   -#: plugins/proposals_discussion/views/tasks/processed.html.erb:73
  275 +#: plugins/proposals_discussion/views/tasks/proposals_discussion_plugin/_proposal_task_processed.html.erb:33
332 276 msgid "Evaluated at"
333 277 msgstr "Validado em"
334 278  
335   -#: plugins/proposals_discussion/views/tasks/processed.html.erb:86
336   -msgid "Back"
337   -msgstr ""
338   -
339   -#: plugins/proposals_discussion/views/tasks/proposals_discussion_plugin/_proposal_task_accept_details.html.erb:2
340   -#: plugins/proposals_discussion/views/proposals_discussion_plugin_tasks/_task_accept_details.html.erb:2
341   -#, fuzzy
342   -msgid "Select an acceptance email template:"
343   -msgstr "Selecione um template de email de rejeição:"
344   -
345   -#: plugins/proposals_discussion/views/tasks/proposals_discussion_plugin/_proposal_task_accept_details.html.erb:4
346   -#: plugins/proposals_discussion/views/proposals_discussion_plugin_tasks/_task_accept_details.html.erb:4
347   -msgid "Select the folder where the article must be published"
348   -msgstr "Selecione a pasta onde o artigo será publicado"
349   -
350   -#: plugins/proposals_discussion/views/tasks/proposals_discussion_plugin/_proposal_task_reject_details.html.erb:1
351   -#: plugins/proposals_discussion/views/proposals_discussion_plugin_tasks/_task_reject_details.html.erb:1
352   -msgid "Select a rejection email template:"
353   -msgstr "Selecione um template de email de rejeição:"
354   -
355   -#: plugins/proposals_discussion/views/tasks/_task.html.erb:10
  279 +#: plugins/proposals_discussion/views/tasks/proposals_discussion_plugin/_proposal_task.html.erb:8
356 280 #: plugins/proposals_discussion/views/proposals_discussion_plugin_tasks/_task.html.erb:9
357 281 msgid "Assign to:"
358 282 msgstr "Atribuir para:"
359 283  
360   -#: plugins/proposals_discussion/views/tasks/_task.html.erb:20
  284 +#: plugins/proposals_discussion/views/tasks/proposals_discussion_plugin/_proposal_task.html.erb:18
361 285 #: plugins/proposals_discussion/views/proposals_discussion_plugin_tasks/_task.html.erb:19
362 286 msgid "Assigned to:"
363 287 msgstr "Atribuído para:"
364 288  
365   -#: plugins/proposals_discussion/views/tasks/_task.html.erb:28
  289 +#: plugins/proposals_discussion/views/tasks/proposals_discussion_plugin/_proposal_task.html.erb:26
366 290 #: plugins/proposals_discussion/views/proposals_discussion_plugin_tasks/index.html.erb:65
367 291 #: plugins/proposals_discussion/views/proposals_discussion_plugin_tasks/index.html.erb:75
368 292 msgid "Accept"
369 293 msgstr "Aceitar"
370 294  
371   -#: plugins/proposals_discussion/views/tasks/_task.html.erb:33
  295 +#: plugins/proposals_discussion/views/tasks/proposals_discussion_plugin/_proposal_task.html.erb:31
372 296 #: plugins/proposals_discussion/views/proposals_discussion_plugin_tasks/index.html.erb:65
373 297 #: plugins/proposals_discussion/views/proposals_discussion_plugin_tasks/index.html.erb:75
374 298 msgid "Reject"
375 299 msgstr "Rejeitar"
376 300  
377   -#: plugins/proposals_discussion/views/tasks/_task.html.erb:38
  301 +#: plugins/proposals_discussion/views/tasks/proposals_discussion_plugin/_proposal_task.html.erb:36
378 302 #: plugins/proposals_discussion/views/proposals_discussion_plugin_tasks/index.html.erb:65
379 303 #: plugins/proposals_discussion/views/proposals_discussion_plugin_tasks/index.html.erb:75
380 304 msgid "Skip"
381 305 msgstr "Pular"
382 306  
  307 +#: plugins/proposals_discussion/views/tasks/proposals_discussion_plugin/_proposal_task_accept_details.html.erb:2
  308 +#: plugins/proposals_discussion/views/proposals_discussion_plugin_tasks/_task_accept_details.html.erb:2
  309 +#, fuzzy
  310 +msgid "Select an acceptance email template:"
  311 +msgstr "Selecione um template de email de rejeição:"
  312 +
  313 +#: plugins/proposals_discussion/views/tasks/proposals_discussion_plugin/_proposal_task_accept_details.html.erb:4
  314 +#: plugins/proposals_discussion/views/proposals_discussion_plugin_tasks/_task_accept_details.html.erb:4
  315 +msgid "Select the folder where the article must be published"
  316 +msgstr "Selecione a pasta onde o artigo será publicado"
  317 +
  318 +#: plugins/proposals_discussion/views/tasks/proposals_discussion_plugin/_proposal_task_reject_details.html.erb:1
  319 +#: plugins/proposals_discussion/views/proposals_discussion_plugin_tasks/_task_reject_details.html.erb:1
  320 +msgid "Select a rejection email template:"
  321 +msgstr "Selecione um template de email de rejeição:"
  322 +
383 323 #: plugins/proposals_discussion/views/cms/proposals_discussion_plugin/_proposal.html.erb:15
384 324 msgid "Title"
385 325 msgstr "Título"
... ... @@ -476,6 +416,14 @@ msgstr &quot;%s&#39;s tarefas pendentes&quot;
476 416 msgid "This error happened with the following tasks: "
477 417 msgstr "O erro ocorreu com as seguintes tarefas: "
478 418  
  419 +#: plugins/proposals_discussion/views/proposals_discussion_plugin_tasks/index.html.erb:26
  420 +msgid "Filter"
  421 +msgstr "Filtro"
  422 +
  423 +#: plugins/proposals_discussion/views/proposals_discussion_plugin_tasks/index.html.erb:28
  424 +msgid "Type of task"
  425 +msgstr "Tipo de tarefa"
  426 +
479 427 #: plugins/proposals_discussion/views/proposals_discussion_plugin_tasks/index.html.erb:31
480 428 msgid "Text filter"
481 429 msgstr "Filtro de texto"
... ... @@ -493,6 +441,10 @@ msgstr &quot;Sem atribuição&quot;
493 441 msgid "Status"
494 442 msgstr "Estatísticas"
495 443  
  444 +#: plugins/proposals_discussion/views/proposals_discussion_plugin_tasks/index.html.erb:43
  445 +msgid "Search"
  446 +msgstr "Buscar"
  447 +
496 448 #: plugins/proposals_discussion/views/proposals_discussion_plugin_tasks/index.html.erb:50
497 449 msgid "No pending tasks for %s"
498 450 msgstr "Sem tarefas pendentes para %s"
... ... @@ -521,6 +473,22 @@ msgstr &quot;Marcar todas para: &quot;
521 473 msgid "Categories"
522 474 msgstr "Categorias"
523 475  
  476 +#, fuzzy
  477 +#~ msgid "%s's processed tasks"
  478 +#~ msgstr "Visualizar tarefas processadas"
  479 +
  480 +#, fuzzy
  481 +#~ msgid "Status:"
  482 +#~ msgstr "Estatísticas"
  483 +
  484 +#, fuzzy
  485 +#~ msgid "Text Filter:"
  486 +#~ msgstr "Filtro de texto"
  487 +
  488 +#, fuzzy
  489 +#~ msgid "No processed tasks."
  490 +#~ msgstr "Visualizar tarefas processadas"
  491 +
524 492 #~ msgid "Comment for author"
525 493 #~ msgstr "Comentário para o autor"
526 494  
... ...