Download as
Browse Code »

Commit 6b4b2dd5116786cbab8f5e694b5e44618a529c85

Authored by Zambom
1 parent 8165a87b
Exists in master and in 2 other branches amadeus_univasf, refactoring

Adjusting webconference date verification

Showing 30 changed files with 297 additions and 247 deletions   Show diff stats
amadeus/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @6b4b2dd
... ... @@ -8,7 +8,7 @@ msgid ""
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-09-10 02:55-0300\n"
  11 +"POT-Creation-Date: 2017-09-13 23:29-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -18,99 +18,99 @@ msgstr &quot;&quot;
18 18 "Content-Transfer-Encoding: 8bit\n"
19 19 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
20 20  
21   -#: amadeus/settings.py:184
  21 +#: amadeus/settings.py:186
22 22 msgid "Portuguese"
23 23 msgstr "Português"
24 24  
25   -#: amadeus/settings.py:185
  25 +#: amadeus/settings.py:187
26 26 msgid "English"
27 27 msgstr "Inglês"
28 28  
29   -#: amadeus/templates/base.html:111
  29 +#: amadeus/templates/base.html:112
30 30 msgid "Search for subjects and resources"
31 31 msgstr "Buscar por assuntos ou recursos"
32 32  
33   -#: amadeus/templates/base.html:123 amadeus/templates/base.html:126
  33 +#: amadeus/templates/base.html:124 amadeus/templates/base.html:127
34 34 msgid "Language Selector"
35 35 msgstr "Seletor de Línguas"
36 36  
37   -#: amadeus/templates/base.html:157
  37 +#: amadeus/templates/base.html:158
38 38 msgid "Profile"
39 39 msgstr "Perfil"
40 40  
41   -#: amadeus/templates/base.html:158
  41 +#: amadeus/templates/base.html:159
42 42 msgid "Edit Profile"
43 43 msgstr "Editar Perfil"
44 44  
45   -#: amadeus/templates/base.html:159
  45 +#: amadeus/templates/base.html:160
46 46 msgid "Change Password"
47 47 msgstr "Alterar Senha"
48 48  
49   -#: amadeus/templates/base.html:160
  49 +#: amadeus/templates/base.html:161
50 50 msgid "Delete Account"
51 51 msgstr "Remover Conta"
52 52  
53   -#: amadeus/templates/base.html:161
  53 +#: amadeus/templates/base.html:162
54 54 msgid "Logout"
55 55 msgstr "Sair"
56 56  
57   -#: amadeus/templates/base.html:166
  57 +#: amadeus/templates/base.html:167
58 58 msgid "settings"
59 59 msgstr "configurações"
60 60  
61   -#: amadeus/templates/base.html:169
  61 +#: amadeus/templates/base.html:170
62 62 msgid "Settings"
63 63 msgstr "Configurações"
64 64  
65   -#: amadeus/templates/base.html:172
  65 +#: amadeus/templates/base.html:173
66 66 msgid "Manage Users"
67 67 msgstr "Gerenciar Usuários"
68 68  
69   -#: amadeus/templates/base.html:173
  69 +#: amadeus/templates/base.html:174
70 70 msgid "Manage Categories"
71 71 msgstr "Gerenciar Categorias"
72 72  
73   -#: amadeus/templates/base.html:174
  73 +#: amadeus/templates/base.html:175
74 74 msgid "Manage News"
75 75 msgstr "Gerenciar Notícias"
76 76  
77   -#: amadeus/templates/base.html:181
  77 +#: amadeus/templates/base.html:182
78 78 msgid "System"
79 79 msgstr "Sistema"
80 80  
81   -#: amadeus/templates/base.html:188
  81 +#: amadeus/templates/base.html:189
82 82 msgid "Mail Sender"
83 83 msgstr "Remetente de Email"
84 84  
85   -#: amadeus/templates/base.html:189
  85 +#: amadeus/templates/base.html:190
86 86 msgid "Security"
87 87 msgstr "Segurança"
88 88  
89   -#: amadeus/templates/base.html:190
  89 +#: amadeus/templates/base.html:191
90 90 msgid "Theme"
91 91 msgstr "Temas"
92 92  
93   -#: amadeus/templates/base.html:191
  93 +#: amadeus/templates/base.html:192
94 94 msgid "Web Conference"
95 95 msgstr "Web conferência"
96 96  
97   -#: amadeus/templates/base.html:225 amadeus/templates/base.html:280
  97 +#: amadeus/templates/base.html:227 amadeus/templates/base.html:282
98 98 msgid "Subjects"
99 99 msgstr "Assuntos"
100 100  
101   -#: amadeus/templates/base.html:230 amadeus/templates/base.html:285
  101 +#: amadeus/templates/base.html:232 amadeus/templates/base.html:287
102 102 msgid "Mural"
103 103 msgstr "Mural"
104 104  
105   -#: amadeus/templates/base.html:236 amadeus/templates/base.html:291
  105 +#: amadeus/templates/base.html:238 amadeus/templates/base.html:293
106 106 msgid "Messages"
107 107 msgstr "Mensagens"
108 108  
109   -#: amadeus/templates/base.html:242 amadeus/templates/base.html:297
  109 +#: amadeus/templates/base.html:244 amadeus/templates/base.html:299
110 110 msgid "Pendencies"
111 111 msgstr "Pendências"
112 112  
113   -#: amadeus/templates/base.html:250 amadeus/templates/base.html:305
  113 +#: amadeus/templates/base.html:252 amadeus/templates/base.html:307
114 114 msgid "Analytics"
115 115 msgstr "Analytics"
116 116  
... ...
analytics/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @6b4b2dd
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-09-10 02:55-0300\n"
  11 +"POT-Creation-Date: 2017-09-13 23:29-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ...
api/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @6b4b2dd
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-09-10 02:55-0300\n"
  11 +"POT-Creation-Date: 2017-09-13 23:29-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -26,23 +26,23 @@ msgstr &quot;&quot;
26 26 msgid "[Photo]"
27 27 msgstr ""
28 28  
29   -#: api/views.py:341
  29 +#: api/views.py:374
30 30 #, python-format
31 31 msgid "Last message in %s"
32 32 msgstr ""
33 33  
34   -#: api/views.py:358
  34 +#: api/views.py:391
35 35 msgid "Message sent successfully!"
36 36 msgstr ""
37 37  
38   -#: api/views.py:364
  38 +#: api/views.py:397
39 39 msgid "Error while sending message!"
40 40 msgstr ""
41 41  
42   -#: api/views.py:371
  42 +#: api/views.py:404
43 43 msgid "No information received!"
44 44 msgstr ""
45 45  
46   -#: api/views.py:377
  46 +#: api/views.py:410
47 47 msgid "Amadeus"
48 48 msgstr ""
... ...
bulletin/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @6b4b2dd
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-09-10 02:55-0300\n"
  11 +"POT-Creation-Date: 2017-09-13 23:29-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -72,7 +72,7 @@ msgstr &quot;Metas&quot;
72 72 msgid "Relevant Indicators"
73 73 msgstr "Indicadores Relevantes"
74 74  
75   -#: bulletin/models.py:25 bulletin/views.py:934
  75 +#: bulletin/models.py:25 bulletin/views.py:935
76 76 msgid "Bulletin"
77 77 msgstr "Boletim"
78 78  
... ... @@ -231,7 +231,7 @@ msgstr &quot;para informar as dificuldades que podem prejudicar seu desempenho.&quot;
231 231 msgid "Type here the dificulties that may harm your performance"
232 232 msgstr "Escreva aqui as dificuldades que podem diminuir sua performance"
233 233  
234   -#: bulletin/utils.py:47 bulletin/views.py:1021
  234 +#: bulletin/utils.py:47 bulletin/views.py:1022
235 235 #, python-format
236 236 msgid "Last message in %s"
237 237 msgstr "Última mensagem em %s"
... ... @@ -291,54 +291,54 @@ msgstr &quot;&quot;
291 291 msgid "Update Bulletin"
292 292 msgstr "Atualizar boletim"
293 293  
294   -#: bulletin/views.py:796
  294 +#: bulletin/views.py:797
295 295 #, python-format
296 296 msgid "The Bulletin \"%s\" was updated successfully!"
297 297 msgstr "O Boletim \"%s\" foi atualizado com sucesso!"
298 298  
299   -#: bulletin/views.py:832
  299 +#: bulletin/views.py:833
300 300 #, python-format
301 301 msgid ""
302 302 "The bulletin \"%s\" was removed successfully from virtual environment \"%s\"!"
303 303 msgstr "O boletim \"%s\" foi removido com sucesso do ambiente virtual \"%s\"! "
304 304  
305   -#: bulletin/views.py:891
  305 +#: bulletin/views.py:892
306 306 msgid "Bulletin Reports"
307 307 msgstr "Relatórios do Boletim"
308 308  
309   -#: bulletin/views.py:910
  309 +#: bulletin/views.py:911
310 310 msgid "Realized"
311 311 msgstr "Realizada"
312 312  
313   -#: bulletin/views.py:910
  313 +#: bulletin/views.py:911
314 314 msgid "Unrealized"
315 315 msgstr "Não realizada"
316 316  
317   -#: bulletin/views.py:910
  317 +#: bulletin/views.py:911
318 318 msgid "Historic"
319 319 msgstr "Histórico"
320 320  
321   -#: bulletin/views.py:925 bulletin/views.py:933
  321 +#: bulletin/views.py:926 bulletin/views.py:934
322 322 msgid "View"
323 323 msgstr "Visualizar"
324 324  
325   -#: bulletin/views.py:939
  325 +#: bulletin/views.py:940
326 326 msgid "Actions about resource"
327 327 msgstr "Ações sobre o recurso"
328 328  
329   -#: bulletin/views.py:940
  329 +#: bulletin/views.py:941
330 330 msgid "Quantity"
331 331 msgstr "Quantidade"
332 332  
333   -#: bulletin/views.py:1009
  333 +#: bulletin/views.py:1010
334 334 msgid "[Photo]"
335 335 msgstr "[Foto]"
336 336  
337   -#: bulletin/views.py:1030
  337 +#: bulletin/views.py:1031
338 338 msgid "The message was successfull sent!"
339 339 msgstr "A mensagem foi enviada com sucesso!"
340 340  
341   -#: bulletin/views.py:1032
  341 +#: bulletin/views.py:1033
342 342 msgid "No user selected!"
343 343 msgstr "Nenhum usuário selecionado!"
344 344  
... ...
categories/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @6b4b2dd
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-09-10 02:55-0300\n"
  11 +"POT-Creation-Date: 2017-09-13 23:29-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ...
chat/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @6b4b2dd
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-09-10 02:55-0300\n"
  11 +"POT-Creation-Date: 2017-09-13 23:29-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ...
dashboards/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @6b4b2dd
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-09-10 02:55-0300\n"
  11 +"POT-Creation-Date: 2017-09-13 23:29-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ...
file_link/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @6b4b2dd
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-09-10 02:55-0300\n"
  11 +"POT-Creation-Date: 2017-09-13 23:29-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -206,12 +206,12 @@ msgstr &quot;&quot;
206 206 msgid "Update File Link"
207 207 msgstr "Atualizar Link para Arquivo"
208 208  
209   -#: file_link/views.py:321
  209 +#: file_link/views.py:322
210 210 #, python-format
211 211 msgid "The File Link \"%s\" was updated successfully!"
212 212 msgstr "O Link para Arquivo \"%s\" foi atualizado com sucesso!"
213 213  
214   -#: file_link/views.py:348
  214 +#: file_link/views.py:349
215 215 #, python-format
216 216 msgid ""
217 217 "The File Link \"%s\" was removed successfully from virtual environment \"%s"
... ... @@ -220,52 +220,52 @@ msgstr &quot;&quot;
220 220 "O Link para Arquivo \"%s\" foi removido do ambiente virtual \"%s\" com "
221 221 "sucesso!"
222 222  
223   -#: file_link/views.py:407
  223 +#: file_link/views.py:408
224 224 msgid "File Link Reports"
225 225 msgstr "Relatŕios de Link para Arquivo"
226 226  
227   -#: file_link/views.py:426
  227 +#: file_link/views.py:427
228 228 msgid "Realized"
229 229 msgstr "Realizada"
230 230  
231   -#: file_link/views.py:426
  231 +#: file_link/views.py:427
232 232 msgid "Unrealized"
233 233 msgstr "Não Realizada"
234 234  
235   -#: file_link/views.py:426
  235 +#: file_link/views.py:427
236 236 msgid "Historic"
237 237 msgstr "Histórico"
238 238  
239   -#: file_link/views.py:441 file_link/views.py:449
  239 +#: file_link/views.py:442 file_link/views.py:450
240 240 msgid "View"
241 241 msgstr "Visualizar"
242 242  
243   -#: file_link/views.py:450
  243 +#: file_link/views.py:451
244 244 msgid "File link"
245 245 msgstr "Link para Arquivo"
246 246  
247   -#: file_link/views.py:455
  247 +#: file_link/views.py:456
248 248 msgid "Actions about resource"
249 249 msgstr "Ações sobre o recurso"
250 250  
251   -#: file_link/views.py:456
  251 +#: file_link/views.py:457
252 252 msgid "Quantity"
253 253 msgstr "Quantidade"
254 254  
255   -#: file_link/views.py:503
  255 +#: file_link/views.py:504
256 256 msgid "[Photo]"
257 257 msgstr "[Imagem]"
258 258  
259   -#: file_link/views.py:515
  259 +#: file_link/views.py:516
260 260 #, python-format
261 261 msgid "Last message in %s"
262 262 msgstr "Última mensagem em %s"
263 263  
264   -#: file_link/views.py:524
  264 +#: file_link/views.py:525
265 265 msgid "The message was successfull sent!"
266 266 msgstr "A mensagem foi enviada com sucesso!"
267 267  
268   -#: file_link/views.py:526
  268 +#: file_link/views.py:527
269 269 msgid "No user selected!"
270 270 msgstr "Nenhum usuário selecionado!"
271 271  
... ...
goals/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @6b4b2dd
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-09-10 02:55-0300\n"
  11 +"POT-Creation-Date: 2017-09-13 23:29-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ...
links/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @6b4b2dd
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-09-10 02:55-0300\n"
  11 +"POT-Creation-Date: 2017-09-13 23:29-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -18,30 +18,34 @@ msgstr &quot;&quot;
18 18 "Content-Transfer-Encoding: 8bit\n"
19 19 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
20 20  
21   -#: links/forms.py:31
  21 +#: links/forms.py:33
22 22 msgid "Tags"
23 23 msgstr "Tags"
24 24  
25   -#: links/forms.py:32
  25 +#: links/forms.py:34
26 26 msgid "Website URL"
27 27 msgstr "URL do site:"
28 28  
29   -#: links/forms.py:38
  29 +#: links/forms.py:40
30 30 msgid "Link name"
31 31 msgstr "Nome do Link"
32 32  
33   -#: links/forms.py:39
  33 +#: links/forms.py:41
34 34 msgid "End View"
35 35 msgstr ""
36 36  
37   -#: links/forms.py:40
  37 +#: links/forms.py:42
38 38 msgid "End View Date"
39 39 msgstr "Data final para visualizar"
40 40  
41   -#: links/forms.py:68
  41 +#: links/forms.py:62
42 42 msgid "There is already a link with this name on this subject"
43 43 msgstr "Ja existe um link com este nome neste Assunto"
44 44  
  45 +#: links/forms.py:74
  46 +msgid "Invalid URL. It should be an valid link."
  47 +msgstr ""
  48 +
45 49 #: links/models.py:13
46 50 msgid "Link_URL"
47 51 msgstr "URL do link"
... ... @@ -50,31 +54,31 @@ msgstr &quot;URL do link&quot;
50 54 msgid "Are you sure you want delete the Website link"
51 55 msgstr "Tem certeza que voce deseja remover esse Link para Website"
52 56  
53   -#: links/templates/links/_form.html:112
  57 +#: links/templates/links/_form.html:99
54 58 msgid "Pendencies Notifications"
55 59 msgstr "Notificações de pendências"
56 60  
57   -#: links/templates/links/_form.html:130
  61 +#: links/templates/links/_form.html:117
58 62 msgid "Action not performed by the user"
59 63 msgstr "Ação não realizada pelo usuário"
60 64  
61   -#: links/templates/links/_form.html:156
  65 +#: links/templates/links/_form.html:143
62 66 msgid "Wished period"
63 67 msgstr "Período desejado"
64 68  
65   -#: links/templates/links/_form.html:222
  69 +#: links/templates/links/_form.html:209
66 70 msgid "Students"
67 71 msgstr ""
68 72  
69   -#: links/templates/links/_form.html:252
  73 +#: links/templates/links/_form.html:239
70 74 msgid "Attribute students to file link"
71 75 msgstr "Atribuir estudantes para o link de arquivo"
72 76  
73   -#: links/templates/links/_form.html:272
  77 +#: links/templates/links/_form.html:259
74 78 msgid "Attribute groups to file link"
75 79 msgstr "Atribuir grupos para o link de arquivo"
76 80  
77   -#: links/templates/links/_form.html:320
  81 +#: links/templates/links/_form.html:307
78 82 msgid "Save"
79 83 msgstr "Salvar"
80 84  
... ... @@ -189,56 +193,56 @@ msgstr &quot;&quot;
189 193 msgid "Update Website Link"
190 194 msgstr "Atualizar Link do website"
191 195  
192   -#: links/views.py:341
  196 +#: links/views.py:342
193 197 #, python-format
194 198 msgid "The Website Link \"%s\" was updated successfully!"
195 199 msgstr "O link do website \"%s\" foi atualizado com sucesso! "
196 200  
197   -#: links/views.py:385
  201 +#: links/views.py:386
198 202 msgid "Links Reports"
199 203 msgstr "Relatórios de links"
200 204  
201   -#: links/views.py:404
  205 +#: links/views.py:405
202 206 msgid "Realized"
203 207 msgstr "Realizada"
204 208  
205   -#: links/views.py:404
  209 +#: links/views.py:405
206 210 msgid "Unrealized"
207 211 msgstr "Não Realizada"
208 212  
209   -#: links/views.py:404
  213 +#: links/views.py:405
210 214 msgid "Historic"
211 215 msgstr "Histórico"
212 216  
213   -#: links/views.py:419 links/views.py:427
  217 +#: links/views.py:420 links/views.py:428
214 218 msgid "View"
215 219 msgstr "Visualizar"
216 220  
217   -#: links/views.py:428
  221 +#: links/views.py:429
218 222 msgid "Links"
219 223 msgstr "Links"
220 224  
221   -#: links/views.py:433
  225 +#: links/views.py:434
222 226 msgid "Actions about resource"
223 227 msgstr "Ações sobre o recurso"
224 228  
225   -#: links/views.py:434
  229 +#: links/views.py:435
226 230 msgid "Quantity"
227 231 msgstr "Quantidade"
228 232  
229   -#: links/views.py:481
  233 +#: links/views.py:482
230 234 msgid "[Photo]"
231 235 msgstr "[Imagem]"
232 236  
233   -#: links/views.py:493
  237 +#: links/views.py:494
234 238 #, python-format
235 239 msgid "Last message in %s"
236 240 msgstr "Última mensagem em %s"
237 241  
238   -#: links/views.py:502
  242 +#: links/views.py:503
239 243 msgid "The message was successfull sent!"
240 244 msgstr "A mensagem foi enviada com sucesso!"
241 245  
242   -#: links/views.py:504
  246 +#: links/views.py:505
243 247 msgid "No user selected!"
244 248 msgstr "Nenhum usuário selecionado!"
... ...
log/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @6b4b2dd
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-09-10 02:55-0300\n"
  11 +"POT-Creation-Date: 2017-09-13 23:29-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ...
mailsender/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @6b4b2dd
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-09-10 02:55-0300\n"
  11 +"POT-Creation-Date: 2017-09-13 23:29-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ...
mural/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @6b4b2dd
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-09-10 02:55-0300\n"
  11 +"POT-Creation-Date: 2017-09-13 23:29-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ...
news/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @6b4b2dd
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-09-10 02:55-0300\n"
  11 +"POT-Creation-Date: 2017-09-13 23:29-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ...
notifications/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @6b4b2dd
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-09-10 02:55-0300\n"
  11 +"POT-Creation-Date: 2017-09-13 23:29-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ...
pdf_file/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @6b4b2dd
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-09-10 02:55-0300\n"
  11 +"POT-Creation-Date: 2017-09-13 23:29-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -202,63 +202,63 @@ msgstr &quot;&quot;
202 202 msgid "Update PDF File"
203 203 msgstr "Atualize arquivo PDF"
204 204  
205   -#: pdf_file/views.py:328
  205 +#: pdf_file/views.py:329
206 206 #, python-format
207 207 msgid "The PDF File \"%s\" was updated successfully!"
208 208 msgstr "O arquivo PDF \"%s\" foi atualizado com sucesso!"
209 209  
210   -#: pdf_file/views.py:355
  210 +#: pdf_file/views.py:356
211 211 #, python-format
212 212 msgid ""
213 213 "The PDF File \"%s\" was removed successfully from virtual environment \"%s\"!"
214 214 msgstr ""
215 215 "O arquivo PDF \"%s\" foi removido com sucesso do ambiente virtual \"%s\" "
216 216  
217   -#: pdf_file/views.py:413
  217 +#: pdf_file/views.py:414
218 218 msgid "PDF File Reports"
219 219 msgstr "Relatórios do arquivo de PDF"
220 220  
221   -#: pdf_file/views.py:433
  221 +#: pdf_file/views.py:434
222 222 msgid "Realized"
223 223 msgstr "Realizada"
224 224  
225   -#: pdf_file/views.py:433
  225 +#: pdf_file/views.py:434
226 226 msgid "Unrealized"
227 227 msgstr "Não Realizada"
228 228  
229   -#: pdf_file/views.py:433
  229 +#: pdf_file/views.py:434
230 230 msgid "Historic"
231 231 msgstr "Histórico"
232 232  
233   -#: pdf_file/views.py:449 pdf_file/views.py:457
  233 +#: pdf_file/views.py:450 pdf_file/views.py:458
234 234 msgid "View"
235 235 msgstr "Visualizar"
236 236  
237   -#: pdf_file/views.py:458
  237 +#: pdf_file/views.py:459
238 238 msgid "PDF File"
239 239 msgstr "Criar o arquivo PDF"
240 240  
241   -#: pdf_file/views.py:463
  241 +#: pdf_file/views.py:464
242 242 msgid "Actions about resource"
243 243 msgstr "Ações sobre o recurso"
244 244  
245   -#: pdf_file/views.py:464
  245 +#: pdf_file/views.py:465
246 246 msgid "Quantity"
247 247 msgstr "Quantidade"
248 248  
249   -#: pdf_file/views.py:511
  249 +#: pdf_file/views.py:512
250 250 msgid "[Photo]"
251 251 msgstr "[Imagem]"
252 252  
253   -#: pdf_file/views.py:523
  253 +#: pdf_file/views.py:524
254 254 #, python-format
255 255 msgid "Last message in %s"
256 256 msgstr "Última mensagem em %s"
257 257  
258   -#: pdf_file/views.py:532
  258 +#: pdf_file/views.py:533
259 259 msgid "The message was successfull sent!"
260 260 msgstr "A mensagem foi enviada com sucesso!"
261 261  
262   -#: pdf_file/views.py:534
  262 +#: pdf_file/views.py:535
263 263 msgid "No user selected!"
264 264 msgstr "Nenhum usuário selecionado!"
... ...
pendencies/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @6b4b2dd
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-09-10 02:55-0300\n"
  11 +"POT-Creation-Date: 2017-09-13 23:29-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ...
reports/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @6b4b2dd
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-09-10 02:55-0300\n"
  11 +"POT-Creation-Date: 2017-09-13 23:29-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ...
security/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @6b4b2dd
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-09-10 02:55-0300\n"
  11 +"POT-Creation-Date: 2017-09-13 23:29-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ...
students_group/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @6b4b2dd
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-09-10 02:55-0300\n"
  11 +"POT-Creation-Date: 2017-09-13 23:29-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ...
subjects/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @6b4b2dd
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-09-10 02:55-0300\n"
  11 +"POT-Creation-Date: 2017-09-13 23:29-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -248,12 +248,12 @@ msgid &quot; Any subjects or Resources were not found on the search for &quot;
248 248 msgstr " Nenhum assunto ou recursos foram encontrados na busca por "
249 249  
250 250 #: subjects/templates/subjects/list_search.html:48
251   -#: subjects/templates/subjects/list_search.html:51 subjects/views.py:676
  251 +#: subjects/templates/subjects/list_search.html:51 subjects/views.py:677
252 252 msgid "Subjects"
253 253 msgstr "Assuntos"
254 254  
255 255 #: subjects/templates/subjects/list_search.html:49
256   -#: subjects/templates/subjects/list_search.html:52 subjects/views.py:683
  256 +#: subjects/templates/subjects/list_search.html:52 subjects/views.py:684
257 257 msgid "Resources"
258 258 msgstr "Recursos"
259 259  
... ... @@ -407,17 +407,17 @@ msgstr &quot;Assunto \&quot;%s\&quot; foi registrado na categoria \&quot;%s\&quot; com sucesso!&quot;
407 407 msgid "Update Subject"
408 408 msgstr "Atualizar Assunto"
409 409  
410   -#: subjects/views.py:430
  410 +#: subjects/views.py:431
411 411 #, python-format
412 412 msgid "The Subject \"%s\" was updated on \"%s\" Category successfully!"
413 413 msgstr "Assunto \"%s\" foi atualizado na categoria \"%s\" com sucesso!"
414 414  
415   -#: subjects/views.py:471 subjects/views.py:515
  415 +#: subjects/views.py:472 subjects/views.py:516
416 416 #, python-format
417 417 msgid "Subject \"%s\" removed successfully!"
418 418 msgstr "Assunto \"%s\" removido com sucesso!"
419 419  
420   -#: subjects/views.py:479 subjects/views.py:483
  420 +#: subjects/views.py:480 subjects/views.py:484
421 421 msgid ""
422 422 "Subject can't be removed. The subject still possess students and learning "
423 423 "objects associated"
... ... @@ -425,24 +425,24 @@ msgstr &quot;&quot;
425 425 "Assunto não pode ser removido. Ele ainda possui alunos e objetos de "
426 426 "aprendizado associados"
427 427  
428   -#: subjects/views.py:602
  428 +#: subjects/views.py:603
429 429 msgid "Subscription date is due!"
430 430 msgstr "O período de inscrição está encerrado!"
431 431  
432   -#: subjects/views.py:615
  432 +#: subjects/views.py:616
433 433 msgid "Subscription was successfull!"
434 434 msgstr "Inscrição feita com sucesso!"
435 435  
436   -#: subjects/views.py:748
  436 +#: subjects/views.py:749
437 437 #, python-format
438 438 msgid "%s - Backup"
439 439 msgstr "%s - Backup"
440 440  
441   -#: subjects/views.py:907
  441 +#: subjects/views.py:908
442 442 #, python-format
443 443 msgid "%s - Restore"
444 444 msgstr "%s - Restaurar"
445 445  
446   -#: subjects/views.py:981
  446 +#: subjects/views.py:982
447 447 msgid "Backup restored successfully!"
448 448 msgstr "Backup restaurado com sucesso!"
... ...
themes/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @6b4b2dd
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-09-10 02:55-0300\n"
  11 +"POT-Creation-Date: 2017-09-13 23:29-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ...
topics/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @6b4b2dd
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-09-10 02:55-0300\n"
  11 +"POT-Creation-Date: 2017-09-13 23:29-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ...
users/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @6b4b2dd
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-09-10 02:55-0300\n"
  11 +"POT-Creation-Date: 2017-09-13 23:29-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ...
webconference/forms.py
  Diff comments   View file @6b4b2dd
... ... @@ -10,7 +10,7 @@ from subjects.forms import ParticipantsMultipleChoiceField
10 10  
11 11 from .models import Webconference, ConferenceSettings
12 12  
13   -from pendencies.forms import PendenciesForm
  13 +from pendencies.forms import PendenciesLimitedForm
14 14 from pendencies.models import Pendencies
15 15  
16 16 class WebconferenceForm(forms.ModelForm):
... ... @@ -48,9 +48,14 @@ class WebconferenceForm(forms.ModelForm):
48 48 'groups': forms.SelectMultiple,
49 49 }
50 50  
51   - def clean_name(self):
52   - name = self.cleaned_data.get('name', '')
  51 + def clean(self):
  52 + cleaned_data = super(WebconferenceForm, self).clean()
  53 +
  54 + start = cleaned_data.get('start', None)
  55 + end = cleaned_data.get('end', None)
53 56  
  57 + name = self.cleaned_data.get('name', '')
  58 +
54 59 topics = self.subject.topic_subject.all()
55 60  
56 61 for topic in topics:
... ... @@ -60,30 +65,35 @@ class WebconferenceForm(forms.ModelForm):
60 65 same_name = topic.resource_topic.filter(name__unaccent__iexact = name).count()
61 66  
62 67 if same_name > 0:
63   - self._errors['name'] = [_('This subject already has a web conference with this name')]
  68 + self.add_error('name', _('This subject already has a web conference with this name'))
64 69  
65   - return ValueError
  70 + if start and end:
  71 + if not start == ValueError and not end == ValueError:
  72 + if start > end:
  73 + self.add_error('start', _('This input should be filled with a date equal or before the End.'))
  74 + self.add_error('end', _('This input should be filled with a date equal or after the Start.'))
66 75  
67   - return name
  76 + if not start == ValueError:
  77 + if not self.instance.id and start.date() < datetime.datetime.today().date():
  78 + self.add_error('start', _("This input should be filled with a date equal or after today's date."))
68 79  
  80 + if start.date() < self.subject.init_date:
  81 + self.add_error('start', _('This input should be filled with a date equal or after the subject begin date.("%s")')%(self.subject.init_date))
69 82  
70   - def clean_start(self):
71   - start = self.cleaned_data['start']
72   - if start.date() < datetime.datetime.now().date():
73   - self._errors['start'] = [_('This date must be today or after')]
74   - return ValueError
  83 + if start.date() > self.subject.end_date:
  84 + self.add_error('start', _('This input should be filled with a date equal or before the subject end date.("%s")')%(self.subject.end_date))
75 85  
76   - return start
  86 + if not end == ValueError:
  87 + if not self.instance.id and end.date() < datetime.datetime.today().date():
  88 + self.add_error('end', _("This input should be filled with a date equal or after today's date."))
77 89  
78   - def clean_end(self):
79   - end = self.cleaned_data['end']
80   - start = self.cleaned_data['start']
  90 + if end.date() < self.subject.init_date:
  91 + self.add_error('end', _('This input should be filled with a date equal or after the subject begin date.("%s")')%(self.subject.init_date))
81 92  
82   - if start is ValueError or end < start:
83   - self._errors['end'] = [_('This date must be equal start date/hour or after')]
84   - return ValueError
  93 + if end.date() > self.subject.end_date:
  94 + self.add_error('end', _('This input should be filled with a date equal or before the subject end date.("%s")')%(self.subject.end_date))
85 95  
86   - return end
  96 + return cleaned_data
87 97  
88 98 def save(self, commit = True):
89 99 super(WebconferenceForm, self).save(commit = True)
... ... @@ -134,4 +144,4 @@ class SettingsForm(forms.ModelForm):
134 144 'domain': _('The domain of the jitsi server, e.g. meet.jit.si'),
135 145 }
136 146  
137   -InlinePendenciesFormset = inlineformset_factory(Webconference, Pendencies, form = PendenciesForm, extra = 1, max_num = 3, validate_max = True, can_delete = True)
  147 +InlinePendenciesFormset = inlineformset_factory(Webconference, Pendencies, form = PendenciesLimitedForm, extra = 1, max_num = 3, validate_max = True, can_delete = True)
... ...
webconference/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @6b4b2dd
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-09-10 02:55-0300\n"
  11 +"POT-Creation-Date: 2017-09-13 23:29-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -30,23 +30,41 @@ msgstr &quot;Titulo da Web Conferência&quot;
30 30 msgid "Presentation"
31 31 msgstr "Apresentação"
32 32  
33   -#: webconference/forms.py:63
  33 +#: webconference/forms.py:68
34 34 msgid "This subject already has a web conference with this name"
35 35 msgstr "Este assunto já tem uma web conferência com este nome"
36 36  
37 37 #: webconference/forms.py:73
38   -msgid "This date must be today or after"
39   -msgstr "Esta data deve ser hoje ou depois"
  38 +msgid "This input should be filled with a date equal or before the End."
  39 +msgstr "Esse campo deve ser preenchido com uma data igual ou anterior à Final."
40 40  
41   -#: webconference/forms.py:83
42   -msgid "This date must be equal start date/hour or after"
43   -msgstr "Esta data deve ser igual ou posterior a data/hora de inicio"
  41 +#: webconference/forms.py:74
  42 +msgid "This input should be filled with a date equal or after the Start."
  43 +msgstr "Esse campo deve ser preenchido com uma data igual ou anterior à de Início."
44 44  
45   -#: webconference/forms.py:130 webconference/models.py:35
  45 +#: webconference/forms.py:78 webconference/forms.py:88
  46 +msgid "This input should be filled with a date equal or after today's date."
  47 +msgstr ""
  48 +
  49 +#: webconference/forms.py:81 webconference/forms.py:91
  50 +#, python-format
  51 +msgid ""
  52 +"This input should be filled with a date equal or after the subject begin "
  53 +"date.(\"%s\")"
  54 +msgstr ""
  55 +
  56 +#: webconference/forms.py:84 webconference/forms.py:94
  57 +#, python-format
  58 +msgid ""
  59 +"This input should be filled with a date equal or before the subject end date."
  60 +"(\"%s\")"
  61 +msgstr ""
  62 +
  63 +#: webconference/forms.py:140 webconference/models.py:35
46 64 msgid "Domain"
47 65 msgstr "Dominio"
48 66  
49   -#: webconference/forms.py:134
  67 +#: webconference/forms.py:144
50 68 msgid "The domain of the jitsi server, e.g. meet.jit.si"
51 69 msgstr "O dominio do servidor do jitsi, ex: meet.jit.si"
52 70  
... ... @@ -97,28 +115,28 @@ msgstr &quot;Ação não executada pelo usuário&quot;
97 115 msgid "Wished period"
98 116 msgstr "Período desejado"
99 117  
100   -#: webconference/templates/webconference/_form.html:253
  118 +#: webconference/templates/webconference/_form.html:279
101 119 msgid "Students"
102 120 msgstr ""
103 121  
104   -#: webconference/templates/webconference/_form.html:283
  122 +#: webconference/templates/webconference/_form.html:309
105 123 msgid "Attribute students to Web Conference"
106 124 msgstr "Atribuir alunos à web conferência"
107 125  
108   -#: webconference/templates/webconference/_form.html:303
  126 +#: webconference/templates/webconference/_form.html:329
109 127 msgid "Attribute groups to Web Conference"
110 128 msgstr "Atribuir grupos à web conferência"
111 129  
112   -#: webconference/templates/webconference/_form.html:372
  130 +#: webconference/templates/webconference/_form.html:398
113 131 #: webconference/templates/webconference/config.html:42
114 132 msgid "Save"
115 133 msgstr "Salvar"
116 134  
117   -#: webconference/templates/webconference/_form.html:379
  135 +#: webconference/templates/webconference/_form.html:405
118 136 msgid "Add new notification"
119 137 msgstr "Notificações Pendentes"
120 138  
121   -#: webconference/templates/webconference/_form.html:380
  139 +#: webconference/templates/webconference/_form.html:406
122 140 msgid "Remove this"
123 141 msgstr "Remover isto"
124 142  
... ... @@ -127,7 +145,7 @@ msgid &quot;Settings: Conference&quot;
127 145 msgstr "Configurações: Web Conferência"
128 146  
129 147 #: webconference/templates/webconference/create.html:21
130   -#: webconference/views.py:340
  148 +#: webconference/views.py:342
131 149 msgid "Create Web Conference"
132 150 msgstr "Criar Web Conferência"
133 151  
... ... @@ -206,25 +224,25 @@ msgstr &quot;Editar: &quot;
206 224  
207 225 #: webconference/templates/webconference/view.html:68
208 226 #: webconference/templates/webconference/window_view.html:43
209   -#: webconference/views.py:260 webconference/views.py:273
210   -#: webconference/views.py:294 webconference/views.py:395
211   -#: webconference/views.py:408 webconference/views.py:417
212   -#: webconference/views.py:620
  227 +#: webconference/views.py:262 webconference/views.py:275
  228 +#: webconference/views.py:296 webconference/views.py:397
  229 +#: webconference/views.py:410 webconference/views.py:419
  230 +#: webconference/views.py:623
213 231 msgid "Participate"
214 232 msgstr "Participar"
215 233  
216   -#: webconference/views.py:61 webconference/views.py:106
  234 +#: webconference/views.py:60 webconference/views.py:105
217 235 #, python-format
218 236 msgid "%s - Web Conference"
219 237 msgstr "%s - Web Conferência"
220 238  
221   -#: webconference/views.py:260 webconference/views.py:273
222   -#: webconference/views.py:294 webconference/views.py:395
223   -#: webconference/views.py:408 webconference/views.py:417
  239 +#: webconference/views.py:262 webconference/views.py:275
  240 +#: webconference/views.py:296 webconference/views.py:397
  241 +#: webconference/views.py:410 webconference/views.py:419
224 242 msgid "Visualize"
225 243 msgstr "Visualizar"
226 244  
227   -#: webconference/views.py:351
  245 +#: webconference/views.py:353
228 246 #, python-format
229 247 msgid ""
230 248 "The Web conference \"%s\" was added to the Topic \"%s\" of the virtual "
... ... @@ -233,16 +251,16 @@ msgstr &quot;&quot;
233 251 "A web conferência '%s' foi adicionada ao tópico '%s' do ambiente virtual "
234 252 "'%s' com sucesso!"
235 253  
236   -#: webconference/views.py:458
  254 +#: webconference/views.py:460
237 255 msgid "Update Web Conference"
238 256 msgstr "Atualizar a web conferência"
239 257  
240   -#: webconference/views.py:469
  258 +#: webconference/views.py:472
241 259 #, python-format
242 260 msgid "The Web conference \"%s\" was updated successfully!"
243 261 msgstr "A web conferência '%s' foi atualizada com sucesso!"
244 262  
245   -#: webconference/views.py:505
  263 +#: webconference/views.py:508
246 264 #, python-format
247 265 msgid ""
248 266 "The web conference \"%s\" was removed successfully from virtual environment "
... ... @@ -250,81 +268,63 @@ msgid &quot;&quot;
250 268 msgstr ""
251 269 "A web conferência '%s' foi removida com sucesso do ambiente virtual '%s'!"
252 270  
253   -#: webconference/views.py:539
  271 +#: webconference/views.py:542
254 272 msgid "Conference settings updated successfully!"
255 273 msgstr "Configurações de segurança atualizadas com sucesso!"
256 274  
257   -#: webconference/views.py:546
  275 +#: webconference/views.py:549
258 276 msgid "Web Conference Settings"
259 277 msgstr "Configurações da Web Conferência"
260 278  
261   -#: webconference/views.py:589
  279 +#: webconference/views.py:592
262 280 msgid "Youtube Video Reports"
263 281 msgstr "Relatórios do Video do Youtube"
264 282  
265   -#: webconference/views.py:608
  283 +#: webconference/views.py:611
266 284 msgid "Realized"
267 285 msgstr "Realizada"
268 286  
269   -#: webconference/views.py:608
  287 +#: webconference/views.py:611
270 288 msgid "Unrealized"
271 289 msgstr "Não Realizada"
272 290  
273   -#: webconference/views.py:608
  291 +#: webconference/views.py:611
274 292 msgid "Historic"
275 293 msgstr "Histórico"
276 294  
277   -#: webconference/views.py:620
  295 +#: webconference/views.py:623
278 296 msgid "View"
279 297 msgstr "Visualizar"
280 298  
281   -#: webconference/views.py:620
  299 +#: webconference/views.py:623
282 300 msgid "Enter"
283 301 msgstr "Entrar"
284 302  
285   -#: webconference/views.py:646
  303 +#: webconference/views.py:649
286 304 msgid "Webconference"
287 305 msgstr "Web Conferência"
288 306  
289   -#: webconference/views.py:659
  307 +#: webconference/views.py:662
290 308 msgid "Actions about resource"
291 309 msgstr "Ações sobre o recurso"
292 310  
293   -#: webconference/views.py:660
  311 +#: webconference/views.py:663
294 312 msgid "Quantity"
295 313 msgstr "Quantidade"
296 314  
297   -#: webconference/views.py:707
  315 +#: webconference/views.py:710
298 316 msgid "[Photo]"
299 317 msgstr "[Foto]"
300 318  
301   -#: webconference/views.py:719
  319 +#: webconference/views.py:722
302 320 #, python-format
303 321 msgid "Last message in %s"
304 322 msgstr "Última mensagem em %s"
305 323  
306   -#: webconference/views.py:728
  324 +#: webconference/views.py:731
307 325 msgid "The message was successfull sent!"
308 326 msgstr "A mensagem foi enviada com sucesso!"
309 327  
310   -#: webconference/views.py:730
  328 +#: webconference/views.py:733
311 329 msgid "No user selected!"
312   -msgstr "Nenhum usuário selecionado!"
313   -
314   -#~ msgid "Conference Settings"
315   -#~ msgstr "Configurações da web conferência"
316   -
317   -#~ msgid "Don't allow users to self-register"
318   -#~ msgstr "Não permitir que usuários se auto-cadastrem"
319   -
320   -#~ msgid "Put system in maintenance mode"
321   -#~ msgstr "Colocar sistema em modo de manutenção"
322   -
323   -#~ msgid "Security configuration"
324   -#~ msgstr "Configuração de Securação"
325   -
326   -#~ msgid "Security configurations"
327   -#~ msgstr "Configurações de Segurança"
328   -
329   -#~ msgid "Security"
330   -#~ msgstr "Segurança"
  330 +msgstr "Nenhum usuário selecionado!"
331 331 \ No newline at end of file
... ...
webconference/templates/webconference/_form.html
  Diff comments   View file @6b4b2dd
... ... @@ -238,6 +238,32 @@
238 238 </div>
239 239 {% endif %}
240 240 </div>
  241 + <div class="form-group{% if notify.has_error %} has-error {% endif %} row">
  242 + <div class="col-lg-2 col-md-2 col-sm-2 col-xs-3 checkbox">
  243 + <label>
  244 + {% render_field notify.limit_date_check class="limit_date" %} {{ notify.limit_date.label }}
  245 + </label>
  246 + </div>
  247 + <div class="col-lg-4 col-md-4 col-sm-4 col-xs-4">
  248 + {% render_field notify.limit_date class='form-control datetime-picker limit_date_input' %}
  249 + </div>
  250 + </div>
  251 + <div class="row">
  252 + <span id="helpBlock" class="help-block">{{ notify.limit_date.help_text }}</span>
  253 +
  254 + {% if notify.limit_date.errors %}
  255 + <div class="alert alert-danger alert-dismissible" role="alert">
  256 + <button type="button" class="close" data-dismiss="alert" aria-label="Close">
  257 + <span aria-hidden="true">&times;</span>
  258 + </button>
  259 + <ul>
  260 + {% for error in notify.limit_date.errors %}
  261 + <li>{{ error }}</li>
  262 + {% endfor %}
  263 + </ul>
  264 + </div>
  265 + {% endif %}
  266 + </div>
241 267 </div>
242 268 </div>
243 269 {% endfor %}
... ... @@ -395,6 +421,10 @@
395 421 var checkbox = $(this).parent().parent().find('.end_date');
396 422 $(checkbox).prop('checked', true);
397 423 });
  424 + $('.limit_date_input').on('click', function () {
  425 + var checkbox = $(this).parent().parent().find('.limit_date');
  426 + $(checkbox).prop('checked', true);
  427 + });
398 428  
399 429 var subject = $("#id_control_subject").val();
400 430  
... ... @@ -418,6 +448,13 @@
418 448 $(this).parent().parent().find('.end_date').prop('checked', false);
419 449 }
420 450 });
  451 + $('.limit_date_input').each(function () {
  452 + if ($(this).val() != '') {
  453 + $(this).parent().parent().find('.limit_date').prop('checked', true);
  454 + } else {
  455 + $(this).parent().parent().find('.limit_date').prop('checked', false);
  456 + }
  457 + });
421 458  
422 459 var subject = $("#id_control_subject").val();
423 460  
... ...
webconference/views.py
  Diff comments   View file @6b4b2dd
... ... @@ -28,7 +28,6 @@ from log.decorators import log_decorator
28 28  
29 29 from topics.models import Topic
30 30  
31   -from pendencies.forms import PendenciesForm
32 31 from braces import views as braces_mixins
33 32  
34 33 from .forms import WebconferenceForm, SettingsForm, InlinePendenciesFormset, WebConferenceUpdateForm
... ... @@ -261,7 +260,7 @@ class CreateView(LoginRequiredMixin, LogMixin, generic.edit.CreateView):
261 260 slug = self.kwargs.get('slug', '')
262 261 topic = get_object_or_404(Topic, slug = slug)
263 262 pendencies_form = InlinePendenciesFormset(initial = [{'subject': topic.subject.id, 'actions': [("", "-------"),("view", _("Visualize")), ("participate", _("Participate"))]}])
264   - print (pendencies_form)
  263 +
265 264 return self.render_to_response(self.get_context_data(form = form, pendencies_form = pendencies_form))
266 265  
267 266 def post(self, request, *args, **kwargs):
... ...
webpage/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @6b4b2dd
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-09-10 02:55-0300\n"
  11 +"POT-Creation-Date: 2017-09-13 23:29-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -188,64 +188,64 @@ msgstr &quot;&quot;
188 188 msgid "Update Webpage"
189 189 msgstr "Atualizar Página Web"
190 190  
191   -#: webpage/views.py:367
  191 +#: webpage/views.py:368
192 192 #, python-format
193 193 msgid "The Webpage \"%s\" was updated successfully!"
194 194 msgstr "A Página Web \"%s\" foi atualizada com sucesso!"
195 195  
196   -#: webpage/views.py:403
  196 +#: webpage/views.py:404
197 197 #, python-format
198 198 msgid ""
199 199 "The webpage \"%s\" was removed successfully from virtual environment \"%s\"!"
200 200 msgstr ""
201 201 "A Página Web \"%s\" foi removida do ambiente virtual \"%s\" com sucesso!"
202 202  
203   -#: webpage/views.py:462
  203 +#: webpage/views.py:463
204 204 msgid "Webpage Reports"
205 205 msgstr "Relatórios da Webpage"
206 206  
207   -#: webpage/views.py:481
  207 +#: webpage/views.py:482
208 208 msgid "Realized"
209 209 msgstr "Realizado"
210 210  
211   -#: webpage/views.py:481
  211 +#: webpage/views.py:482
212 212 msgid "Unrealized"
213 213 msgstr "Não Realizado"
214 214  
215   -#: webpage/views.py:481
  215 +#: webpage/views.py:482
216 216 msgid "Historic"
217 217 msgstr "Histórico"
218 218  
219   -#: webpage/views.py:496 webpage/views.py:504
  219 +#: webpage/views.py:497 webpage/views.py:505
220 220 msgid "View"
221 221 msgstr "Visualizar"
222 222  
223   -#: webpage/views.py:505
  223 +#: webpage/views.py:506
224 224 msgid "Webpage"
225 225 msgstr "Nome da Página Web"
226 226  
227   -#: webpage/views.py:510
  227 +#: webpage/views.py:511
228 228 msgid "Actions about resource"
229 229 msgstr "Ações sobre o recurso"
230 230  
231   -#: webpage/views.py:511
  231 +#: webpage/views.py:512
232 232 msgid "Quantity"
233 233 msgstr "Quantidade"
234 234  
235   -#: webpage/views.py:560
  235 +#: webpage/views.py:561
236 236 msgid "[Photo]"
237 237 msgstr "[Imagem]"
238 238  
239   -#: webpage/views.py:572
  239 +#: webpage/views.py:573
240 240 #, python-format
241 241 msgid "Last message in %s"
242 242 msgstr "Última mensagem em %s"
243 243  
244   -#: webpage/views.py:581
  244 +#: webpage/views.py:582
245 245 msgid "The message was successfull sent!"
246 246 msgstr "A mensagem foi enviada com sucesso!"
247 247  
248   -#: webpage/views.py:583
  248 +#: webpage/views.py:584
249 249 msgid "No user selected!"
250 250 msgstr "Nenhum usuário selecionado!"
251 251  
... ...
youtube_video/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @6b4b2dd
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-09-10 02:55-0300\n"
  11 +"POT-Creation-Date: 2017-09-13 23:29-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -181,7 +181,7 @@ msgstr &quot;Visualizar&quot;
181 181 #: youtube_video/views.py:164 youtube_video/views.py:177
182 182 #: youtube_video/views.py:196 youtube_video/views.py:299
183 183 #: youtube_video/views.py:312 youtube_video/views.py:321
184   -#: youtube_video/views.py:552
  184 +#: youtube_video/views.py:553
185 185 msgid "Finish"
186 186 msgstr "Finalizar"
187 187  
... ... @@ -202,12 +202,12 @@ msgstr &quot;&quot;
202 202 msgid "Update YouTube Video"
203 203 msgstr "Atualizar Vídeo do YouTube"
204 204  
205   -#: youtube_video/views.py:373
  205 +#: youtube_video/views.py:374
206 206 #, python-format
207 207 msgid "The YouTube Video \"%s\" was updated successfully!"
208 208 msgstr "O Vídeo do YouTube \"%s\" foi atualizado com sucesso!"
209 209  
210   -#: youtube_video/views.py:409
  210 +#: youtube_video/views.py:410
211 211 #, python-format
212 212 msgid ""
213 213 "The YouTube Video \"%s\" was removed successfully from virtual environment "
... ... @@ -216,55 +216,55 @@ msgstr &quot;&quot;
216 216 "O Vídeo do YouTube \"%s\" foi removido do ambiente virtual \"%s\" com "
217 217 "sucesso!"
218 218  
219   -#: youtube_video/views.py:521
  219 +#: youtube_video/views.py:522
220 220 msgid "Youtube Video Reports"
221 221 msgstr "Relatórios de Vídeo do YouTube"
222 222  
223   -#: youtube_video/views.py:540
  223 +#: youtube_video/views.py:541
224 224 msgid "Realized"
225 225 msgstr "Realizada"
226 226  
227   -#: youtube_video/views.py:540
  227 +#: youtube_video/views.py:541
228 228 msgid "Unrealized"
229 229 msgstr "Não Realizada"
230 230  
231   -#: youtube_video/views.py:540
  231 +#: youtube_video/views.py:541
232 232 msgid "Historic"
233 233 msgstr "Histórico"
234 234  
235   -#: youtube_video/views.py:552
  235 +#: youtube_video/views.py:553
236 236 msgid "View"
237 237 msgstr "Visualizar"
238 238  
239   -#: youtube_video/views.py:552
  239 +#: youtube_video/views.py:553
240 240 msgid "Watch"
241 241 msgstr "Assistir"
242 242  
243   -#: youtube_video/views.py:578
  243 +#: youtube_video/views.py:579
244 244 msgid "Youtube Video"
245 245 msgstr "Vídeo do YouTube"
246 246  
247   -#: youtube_video/views.py:591
  247 +#: youtube_video/views.py:592
248 248 msgid "Actions about resource"
249 249 msgstr "Ações sobre o recurso"
250 250  
251   -#: youtube_video/views.py:592
  251 +#: youtube_video/views.py:593
252 252 msgid "Quantity"
253 253 msgstr "Quantidade"
254 254  
255   -#: youtube_video/views.py:639
  255 +#: youtube_video/views.py:640
256 256 msgid "[Photo]"
257 257 msgstr "[Imagem]"
258 258  
259   -#: youtube_video/views.py:651
  259 +#: youtube_video/views.py:652
260 260 #, python-format
261 261 msgid "Last message in %s"
262 262 msgstr "Última mensagem em %s"
263 263  
264   -#: youtube_video/views.py:659
  264 +#: youtube_video/views.py:660
265 265 msgid "The message was successfull sent!"
266 266 msgstr "A mensagem foi enviada com sucesso!"
267 267  
268   -#: youtube_video/views.py:661
  268 +#: youtube_video/views.py:662
269 269 msgid "No user selected!"
270 270 msgstr "Nenhum usuário selecionado!"
... ...