Download as
Browse Code »

Commit b573227eff06cf0ff0b5bc3ab95dd77de5095619

Authored by Erik Zambom
Committed by GitHub
2 parents 1bbaba90 30e80411
Exists in master and in 2 other branches amadeus_univasf, refactoring

Merge pull request #556 from amadeusproject/refactoring 

Daily Update - 08_09_2017
Showing 46 changed files with 188 additions and 146 deletions   Show diff stats
amadeus/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @b573227
@@ -8,7 +8,7 @@ msgid "" @@ -8,7 +8,7 @@ msgid ""
8 msgstr "" 8 msgstr ""
9 "Project-Id-Version: PACKAGE VERSION\n" 9 "Project-Id-Version: PACKAGE VERSION\n"
10 "Report-Msgid-Bugs-To: \n" 10 "Report-Msgid-Bugs-To: \n"
11 -"POT-Creation-Date: 2017-09-03 00:15-0300\n" 11 +"POT-Creation-Date: 2017-09-07 22:29-0300\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n" 14 "Language-Team: LANGUAGE <LL@li.org>\n"
analytics/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @b573227
@@ -8,7 +8,7 @@ msgid &quot;&quot; @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 msgstr "" 8 msgstr ""
9 "Project-Id-Version: PACKAGE VERSION\n" 9 "Project-Id-Version: PACKAGE VERSION\n"
10 "Report-Msgid-Bugs-To: \n" 10 "Report-Msgid-Bugs-To: \n"
11 -"POT-Creation-Date: 2017-09-03 00:15-0300\n" 11 +"POT-Creation-Date: 2017-09-07 22:29-0300\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n" 14 "Language-Team: LANGUAGE <LL@li.org>\n"
api/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @b573227
@@ -8,7 +8,7 @@ msgid &quot;&quot; @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 msgstr "" 8 msgstr ""
9 "Project-Id-Version: PACKAGE VERSION\n" 9 "Project-Id-Version: PACKAGE VERSION\n"
10 "Report-Msgid-Bugs-To: \n" 10 "Report-Msgid-Bugs-To: \n"
11 -"POT-Creation-Date: 2017-09-03 00:15-0300\n" 11 +"POT-Creation-Date: 2017-09-07 22:29-0300\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n" 14 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,23 +18,31 @@ msgstr &quot;&quot; @@ -18,23 +18,31 @@ msgstr &quot;&quot;
18 "Content-Transfer-Encoding: 8bit\n" 18 "Content-Transfer-Encoding: 8bit\n"
19 "Plural-Forms: nplurals=2; plural=(n > 1);\n" 19 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
20 20
21 -#: api/views.py:332 21 +#: api/utils.py:35
  22 +msgid " sent a message"
  23 +msgstr ""
  24 +
  25 +#: api/utils.py:40
  26 +msgid "[Photo]"
  27 +msgstr ""
  28 +
  29 +#: api/views.py:341
22 #, python-format 30 #, python-format
23 msgid "Last message in %s" 31 msgid "Last message in %s"
24 msgstr "" 32 msgstr ""
25 33
26 -#: api/views.py:349 34 +#: api/views.py:358
27 msgid "Message sent successfully!" 35 msgid "Message sent successfully!"
28 msgstr "" 36 msgstr ""
29 37
30 -#: api/views.py:353 38 +#: api/views.py:364
31 msgid "Error while sending message!" 39 msgid "Error while sending message!"
32 msgstr "" 40 msgstr ""
33 41
34 -#: api/views.py:360 42 +#: api/views.py:371
35 msgid "No information received!" 43 msgid "No information received!"
36 msgstr "" 44 msgstr ""
37 45
38 -#: api/views.py:366 46 +#: api/views.py:377
39 msgid "Amadeus" 47 msgid "Amadeus"
40 msgstr "" 48 msgstr ""
bulletin/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @b573227
@@ -8,7 +8,7 @@ msgid &quot;&quot; @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 msgstr "" 8 msgstr ""
9 "Project-Id-Version: PACKAGE VERSION\n" 9 "Project-Id-Version: PACKAGE VERSION\n"
10 "Report-Msgid-Bugs-To: \n" 10 "Report-Msgid-Bugs-To: \n"
11 -"POT-Creation-Date: 2017-09-03 00:15-0300\n" 11 +"POT-Creation-Date: 2017-09-07 22:29-0300\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n" 14 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -30,23 +30,25 @@ msgstr &quot;Nome do boletim&quot; @@ -30,23 +30,25 @@ msgstr &quot;Nome do boletim&quot;
30 msgid "Bulletin content" 30 msgid "Bulletin content"
31 msgstr "Apresentação do boletim" 31 msgstr "Apresentação do boletim"
32 32
33 -#: bulletin/forms.py:56 33 +#: bulletin/forms.py:58
34 msgid "This subject already has a bulletin with this name" 34 msgid "This subject already has a bulletin with this name"
35 msgstr "Este assunto já possui um boletim com este nome" 35 msgstr "Este assunto já possui um boletim com este nome"
36 36
37 -#: bulletin/forms.py:69 bulletin/forms.py:86 37 +#: bulletin/forms.py:71 bulletin/forms.py:88
  38 +#: bulletin/templates/bulletin/_form.html:98
  39 +#: bulletin/templates/bulletin/_form.html:151
38 msgid "The file is too large. It should have less than 1MB." 40 msgid "The file is too large. It should have less than 1MB."
39 msgstr "O arquivo é muito grande. Ele deve ter menos que 1MB." 41 msgstr "O arquivo é muito grande. Ele deve ter menos que 1MB."
40 42
41 -#: bulletin/forms.py:74 bulletin/forms.py:91 bulletin/forms.py:137 43 +#: bulletin/forms.py:76 bulletin/forms.py:93 bulletin/forms.py:139
42 msgid "This field is required." 44 msgid "This field is required."
43 msgstr "Este campo é obrigatório." 45 msgstr "Este campo é obrigatório."
44 46
45 -#: bulletin/forms.py:129 47 +#: bulletin/forms.py:131
46 msgid "Message" 48 msgid "Message"
47 msgstr "Mensagem" 49 msgstr "Mensagem"
48 50
49 -#: bulletin/forms.py:149 51 +#: bulletin/forms.py:151
50 msgid "The image is too large. It should have less than 5MB." 52 msgid "The image is too large. It should have less than 5MB."
51 msgstr "A imagem é muito grande. Ela deve ter menos que 5MB." 53 msgstr "A imagem é muito grande. Ela deve ter menos que 5MB."
52 54
@@ -70,7 +72,7 @@ msgstr &quot;Metas&quot; @@ -70,7 +72,7 @@ msgstr &quot;Metas&quot;
70 msgid "Relevant Indicators" 72 msgid "Relevant Indicators"
71 msgstr "Indicadores Relevantes" 73 msgstr "Indicadores Relevantes"
72 74
73 -#: bulletin/models.py:25 bulletin/views.py:932 75 +#: bulletin/models.py:25 bulletin/views.py:934
74 msgid "Bulletin" 76 msgid "Bulletin"
75 msgstr "Boletim" 77 msgstr "Boletim"
76 78
@@ -87,7 +89,7 @@ msgid &quot;Click to download a xls file with the data of the goals&quot; @@ -87,7 +89,7 @@ msgid &quot;Click to download a xls file with the data of the goals&quot;
87 msgstr "Clique para baixar um arquivo xls com os dados das metas" 89 msgstr "Clique para baixar um arquivo xls com os dados das metas"
88 90
89 #: bulletin/templates/bulletin/_form.html:55 91 #: bulletin/templates/bulletin/_form.html:55
90 -#: bulletin/templates/bulletin/_form.html:96 92 +#: bulletin/templates/bulletin/_form.html:109
91 msgid "Choose your file..." 93 msgid "Choose your file..."
92 msgstr "Escolha seu arquivo..." 94 msgstr "Escolha seu arquivo..."
93 95
@@ -96,31 +98,36 @@ msgid &quot;Click or drop the .xls file with the goals data&quot; @@ -96,31 +98,36 @@ msgid &quot;Click or drop the .xls file with the goals data&quot;
96 msgstr "Selecione ou solte o arquivo .xls com os dados das metas" 98 msgstr "Selecione ou solte o arquivo .xls com os dados das metas"
97 99
98 #: bulletin/templates/bulletin/_form.html:71 100 #: bulletin/templates/bulletin/_form.html:71
99 -#: bulletin/templates/bulletin/_form.html:112 101 +#: bulletin/templates/bulletin/_form.html:125
100 msgid "The file could not exceed 1MB." 102 msgid "The file could not exceed 1MB."
101 msgstr "O arquivo não pode exceder 1MB." 103 msgstr "O arquivo não pode exceder 1MB."
102 104
103 -#: bulletin/templates/bulletin/_form.html:110 105 +#: bulletin/templates/bulletin/_form.html:99
  106 +#: bulletin/templates/bulletin/_form.html:152
  107 +msgid "File not supported."
  108 +msgstr ""
  109 +
  110 +#: bulletin/templates/bulletin/_form.html:123
104 msgid "Click or drop the .xls file with the indicators data" 111 msgid "Click or drop the .xls file with the indicators data"
105 msgstr "Selecione ou solte o arquivo .xls com a informação dos indicadores" 112 msgstr "Selecione ou solte o arquivo .xls com a informação dos indicadores"
106 113
107 -#: bulletin/templates/bulletin/_form.html:132 114 +#: bulletin/templates/bulletin/_form.html:156
108 msgid "Common resources settings" 115 msgid "Common resources settings"
109 msgstr "Configurações comuns dos recursos" 116 msgstr "Configurações comuns dos recursos"
110 117
111 -#: bulletin/templates/bulletin/_form.html:182 118 +#: bulletin/templates/bulletin/_form.html:206
112 msgid "Pendencies Notifications" 119 msgid "Pendencies Notifications"
113 msgstr "Notificação de pendências" 120 msgstr "Notificação de pendências"
114 121
115 -#: bulletin/templates/bulletin/_form.html:198 122 +#: bulletin/templates/bulletin/_form.html:222
116 msgid "Action not performed by the user" 123 msgid "Action not performed by the user"
117 msgstr "Ação não realizada pelo usuário" 124 msgstr "Ação não realizada pelo usuário"
118 125
119 -#: bulletin/templates/bulletin/_form.html:224 126 +#: bulletin/templates/bulletin/_form.html:248
120 msgid "Wished period" 127 msgid "Wished period"
121 msgstr "Período desejado" 128 msgstr "Período desejado"
122 129
123 -#: bulletin/templates/bulletin/_form.html:335 130 +#: bulletin/templates/bulletin/_form.html:359
124 msgid "Save" 131 msgid "Save"
125 msgstr "Salvar" 132 msgstr "Salvar"
126 133
@@ -224,7 +231,7 @@ msgstr &quot;para informar as dificuldades que podem prejudicar seu desempenho.&quot; @@ -224,7 +231,7 @@ msgstr &quot;para informar as dificuldades que podem prejudicar seu desempenho.&quot;
224 msgid "Type here the dificulties that may harm your performance" 231 msgid "Type here the dificulties that may harm your performance"
225 msgstr "Escreva aqui as dificuldades que podem diminuir sua performance" 232 msgstr "Escreva aqui as dificuldades que podem diminuir sua performance"
226 233
227 -#: bulletin/utils.py:50 bulletin/views.py:1019 234 +#: bulletin/utils.py:47 bulletin/views.py:1021
228 #, python-format 235 #, python-format
229 msgid "Last message in %s" 236 msgid "Last message in %s"
230 msgstr "Última mensagem em %s" 237 msgstr "Última mensagem em %s"
@@ -266,12 +273,12 @@ msgstr &quot;&quot; @@ -266,12 +273,12 @@ msgstr &quot;&quot;
266 msgid "The topic %s already has a Bulletin, so you can't create another." 273 msgid "The topic %s already has a Bulletin, so you can't create another."
267 msgstr "O tópico %s já possui um Boletim, então você não pode criar outro." 274 msgstr "O tópico %s já possui um Boletim, então você não pode criar outro."
268 275
269 -#: bulletin/views.py:430 bulletin/views.py:443 bulletin/views.py:712  
270 -#: bulletin/views.py:714 bulletin/views.py:730 bulletin/views.py:732 276 +#: bulletin/views.py:430 bulletin/views.py:443 bulletin/views.py:713
  277 +#: bulletin/views.py:715 bulletin/views.py:731 bulletin/views.py:733
271 msgid "Visualize" 278 msgid "Visualize"
272 msgstr "Visualizar" 279 msgstr "Visualizar"
273 280
274 -#: bulletin/views.py:523 281 +#: bulletin/views.py:524
275 #, python-format 282 #, python-format
276 msgid "" 283 msgid ""
277 "The Bulletin \"%s\" was added to the Topic \"%s\" of the virtual environment " 284 "The Bulletin \"%s\" was added to the Topic \"%s\" of the virtual environment "
@@ -280,58 +287,58 @@ msgstr &quot;&quot; @@ -280,58 +287,58 @@ msgstr &quot;&quot;
280 "O Boletim \"%s\" foi adicionado ao Tópio \"%s\" do ambiente virtual \"%s\" " 287 "O Boletim \"%s\" foi adicionado ao Tópio \"%s\" do ambiente virtual \"%s\" "
281 "com sucesso!" 288 "com sucesso!"
282 289
283 -#: bulletin/views.py:776 290 +#: bulletin/views.py:777
284 msgid "Update Bulletin" 291 msgid "Update Bulletin"
285 msgstr "Atualizar boletim" 292 msgstr "Atualizar boletim"
286 293
287 -#: bulletin/views.py:794 294 +#: bulletin/views.py:796
288 #, python-format 295 #, python-format
289 msgid "The Bulletin \"%s\" was updated successfully!" 296 msgid "The Bulletin \"%s\" was updated successfully!"
290 msgstr "O Boletim \"%s\" foi atualizado com sucesso!" 297 msgstr "O Boletim \"%s\" foi atualizado com sucesso!"
291 298
292 -#: bulletin/views.py:830 299 +#: bulletin/views.py:832
293 #, python-format 300 #, python-format
294 msgid "" 301 msgid ""
295 "The bulletin \"%s\" was removed successfully from virtual environment \"%s\"!" 302 "The bulletin \"%s\" was removed successfully from virtual environment \"%s\"!"
296 msgstr "O boletim \"%s\" foi removido com sucesso do ambiente virtual \"%s\"! " 303 msgstr "O boletim \"%s\" foi removido com sucesso do ambiente virtual \"%s\"! "
297 304
298 -#: bulletin/views.py:889 305 +#: bulletin/views.py:891
299 msgid "Bulletin Reports" 306 msgid "Bulletin Reports"
300 msgstr "Relatórios do Boletim" 307 msgstr "Relatórios do Boletim"
301 308
302 -#: bulletin/views.py:908 309 +#: bulletin/views.py:910
303 msgid "Realized" 310 msgid "Realized"
304 msgstr "Realizada" 311 msgstr "Realizada"
305 312
306 -#: bulletin/views.py:908 313 +#: bulletin/views.py:910
307 msgid "Unrealized" 314 msgid "Unrealized"
308 msgstr "Não realizada" 315 msgstr "Não realizada"
309 316
310 -#: bulletin/views.py:908 317 +#: bulletin/views.py:910
311 msgid "Historic" 318 msgid "Historic"
312 msgstr "Histórico" 319 msgstr "Histórico"
313 320
314 -#: bulletin/views.py:923 bulletin/views.py:931 321 +#: bulletin/views.py:925 bulletin/views.py:933
315 msgid "View" 322 msgid "View"
316 msgstr "Visualizar" 323 msgstr "Visualizar"
317 324
318 -#: bulletin/views.py:937 325 +#: bulletin/views.py:939
319 msgid "Actions about resource" 326 msgid "Actions about resource"
320 msgstr "Ações sobre o recurso" 327 msgstr "Ações sobre o recurso"
321 328
322 -#: bulletin/views.py:938 329 +#: bulletin/views.py:940
323 msgid "Quantity" 330 msgid "Quantity"
324 msgstr "Quantidade" 331 msgstr "Quantidade"
325 332
326 -#: bulletin/views.py:1007 333 +#: bulletin/views.py:1009
327 msgid "[Photo]" 334 msgid "[Photo]"
328 msgstr "[Foto]" 335 msgstr "[Foto]"
329 336
330 -#: bulletin/views.py:1028 337 +#: bulletin/views.py:1030
331 msgid "The message was successfull sent!" 338 msgid "The message was successfull sent!"
332 msgstr "A mensagem foi enviada com sucesso!" 339 msgstr "A mensagem foi enviada com sucesso!"
333 340
334 -#: bulletin/views.py:1030 341 +#: bulletin/views.py:1032
335 msgid "No user selected!" 342 msgid "No user selected!"
336 msgstr "Nenhum usuário selecionado!" 343 msgstr "Nenhum usuário selecionado!"
337 344
bulletin/templates/bulletin/view.html
  Diff comments   View file @b573227
@@ -104,29 +104,30 @@ @@ -104,29 +104,30 @@
104 104
105 105
106 <!-- Cor amarela --> 106 <!-- Cor amarela -->
107 - {% if meta.alcancada < meta.desejada and meta.alcancada > meta.estabelecida %} 107 + {% if meta.alcancada < meta.desejada and meta.alcancada > meta.estabelecida or meta.alcancada < meta.desejada and meta.alcancada == meta.estabelecida %}
108 <th style="text-align:center;background-color:#f8b800 ; text-shadow: 1px 1px 2px #000; color:#fff; font-weight: normal;" 108 <th style="text-align:center;background-color:#f8b800 ; text-shadow: 1px 1px 2px #000; color:#fff; font-weight: normal;"
109 data-toggle="tooltip" data-html="true" data-placement="bottom" 109 data-toggle="tooltip" data-html="true" data-placement="bottom"
110 title="<b>Meta atingida!</b><br><br>Atenção! O seu resultado foi inferior ao recomendado pelo professor." class="grey-tooltip"> 110 title="<b>Meta atingida!</b><br><br>Atenção! O seu resultado foi inferior ao recomendado pelo professor." class="grey-tooltip">
111 {{ meta.alcancada }}%</th> 111 {{ meta.alcancada }}%</th>
112 {% endif %} 112 {% endif %}
113 113
114 - {% if meta.alcancada > meta.desejada and meta.alcancada < meta.estabelecida %} 114 + {% if meta.alcancada > meta.desejada and meta.alcancada < meta.estabelecida or meta.alcancada == meta.desejada and meta.alcancada < meta.estabelecida %}
115 <th style="text-align:center;background-color:#f8b800 ; text-shadow: 1px 1px 2px #000; color:#fff; font-weight: normal;" 115 <th style="text-align:center;background-color:#f8b800 ; text-shadow: 1px 1px 2px #000; color:#fff; font-weight: normal;"
116 data-toggle="tooltip" data-html="true" data-placement="bottom" 116 data-toggle="tooltip" data-html="true" data-placement="bottom"
117 title="<b>Meta atingida!</b><br><br>Atenção! O seu resultado foi inferior a sua meta inicial." class="grey-tooltip"> 117 title="<b>Meta atingida!</b><br><br>Atenção! O seu resultado foi inferior a sua meta inicial." class="grey-tooltip">
118 {{ meta.alcancada }}%</th> 118 {{ meta.alcancada }}%</th>
119 -  
120 {% endif %} 119 {% endif %}
  120 +
121 <!-- Cor amarela --> 121 <!-- Cor amarela -->
122 122
123 <!-- Cor verde --> 123 <!-- Cor verde -->
124 - {% if meta.alcancada > meta.desejada and meta.alcancada > meta.estabelecida or meta.alcancada == 100 %} 124 + {% if meta.alcancada > meta.desejada and meta.alcancada > meta.estabelecida or meta.alcancada == meta.desejada and meta.alcancada > meta.estabelecida or meta.alcancada > meta.desejada and meta.alcancada == meta.estabelecida or meta.alcancada == 100 or meta.alcancada == meta.desejada and meta.alcancada == meta.estabelecida %}
125 <th style="text-align:center;background-color:#00d337; text-shadow: 1px 1px 2px #000; color:#fff; font-weight: normal;" 125 <th style="text-align:center;background-color:#00d337; text-shadow: 1px 1px 2px #000; color:#fff; font-weight: normal;"
126 data-toggle="tooltip" data-html="true" data-placement="bottom" 126 data-toggle="tooltip" data-html="true" data-placement="bottom"
127 title="<b>Meta atingida!</b>" class="grey-tooltip"> 127 title="<b>Meta atingida!</b>" class="grey-tooltip">
128 {{ meta.alcancada }}%</th> 128 {{ meta.alcancada }}%</th>
129 {% endif %} 129 {% endif %}
  130 +
130 <!-- Cor verde --> 131 <!-- Cor verde -->
131 132
132 <!-- Cor vermelha --> 133 <!-- Cor vermelha -->
@@ -141,7 +142,6 @@ @@ -141,7 +142,6 @@
141 142
142 143
143 </tr> 144 </tr>
144 -  
145 {% endfor %} 145 {% endfor %}
146 146
147 147
bulletin/templates/bulletin/window_view.html
  Diff comments   View file @b573227
@@ -126,29 +126,30 @@ @@ -126,29 +126,30 @@
126 126
127 127
128 <!-- Cor amarela --> 128 <!-- Cor amarela -->
129 - {% if meta.alcancada < meta.desejada and meta.alcancada > meta.estabelecida %} 129 + {% if meta.alcancada < meta.desejada and meta.alcancada > meta.estabelecida or meta.alcancada < meta.desejada and meta.alcancada == meta.estabelecida %}
130 <th style="text-align:center;background-color:#f8b800 ; text-shadow: 1px 1px 2px #000; color:#fff; font-weight: normal;" 130 <th style="text-align:center;background-color:#f8b800 ; text-shadow: 1px 1px 2px #000; color:#fff; font-weight: normal;"
131 data-toggle="tooltip" data-html="true" data-placement="bottom" 131 data-toggle="tooltip" data-html="true" data-placement="bottom"
132 title="<b>Meta atingida!</b><br><br>Atenção! O seu resultado foi inferior ao recomendado pelo professor." class="grey-tooltip"> 132 title="<b>Meta atingida!</b><br><br>Atenção! O seu resultado foi inferior ao recomendado pelo professor." class="grey-tooltip">
133 {{ meta.alcancada }}%</th> 133 {{ meta.alcancada }}%</th>
134 {% endif %} 134 {% endif %}
135 135
136 - {% if meta.alcancada > meta.desejada and meta.alcancada < meta.estabelecida %} 136 + {% if meta.alcancada > meta.desejada and meta.alcancada < meta.estabelecida or meta.alcancada == meta.desejada and meta.alcancada < meta.estabelecida %}
137 <th style="text-align:center;background-color:#f8b800 ; text-shadow: 1px 1px 2px #000; color:#fff; font-weight: normal;" 137 <th style="text-align:center;background-color:#f8b800 ; text-shadow: 1px 1px 2px #000; color:#fff; font-weight: normal;"
138 data-toggle="tooltip" data-html="true" data-placement="bottom" 138 data-toggle="tooltip" data-html="true" data-placement="bottom"
139 title="<b>Meta atingida!</b><br><br>Atenção! O seu resultado foi inferior a sua meta inicial." class="grey-tooltip"> 139 title="<b>Meta atingida!</b><br><br>Atenção! O seu resultado foi inferior a sua meta inicial." class="grey-tooltip">
140 {{ meta.alcancada }}%</th> 140 {{ meta.alcancada }}%</th>
141 -  
142 {% endif %} 141 {% endif %}
  142 +
143 <!-- Cor amarela --> 143 <!-- Cor amarela -->
144 144
145 <!-- Cor verde --> 145 <!-- Cor verde -->
146 - {% if meta.alcancada > meta.desejada and meta.alcancada > meta.estabelecida or meta.alcancada == 100 %} 146 + {% if meta.alcancada > meta.desejada and meta.alcancada > meta.estabelecida or meta.alcancada == meta.desejada and meta.alcancada > meta.estabelecida or meta.alcancada > meta.desejada and meta.alcancada == meta.estabelecida or meta.alcancada == 100 or meta.alcancada == meta.desejada and meta.alcancada == meta.estabelecida %}
147 <th style="text-align:center;background-color:#00d337; text-shadow: 1px 1px 2px #000; color:#fff; font-weight: normal;" 147 <th style="text-align:center;background-color:#00d337; text-shadow: 1px 1px 2px #000; color:#fff; font-weight: normal;"
148 data-toggle="tooltip" data-html="true" data-placement="bottom" 148 data-toggle="tooltip" data-html="true" data-placement="bottom"
149 title="<b>Meta atingida!</b>" class="grey-tooltip"> 149 title="<b>Meta atingida!</b>" class="grey-tooltip">
150 {{ meta.alcancada }}%</th> 150 {{ meta.alcancada }}%</th>
151 {% endif %} 151 {% endif %}
  152 +
152 <!-- Cor verde --> 153 <!-- Cor verde -->
153 154
154 <!-- Cor vermelha --> 155 <!-- Cor vermelha -->
categories/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @b573227
@@ -8,7 +8,7 @@ msgid &quot;&quot; @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 msgstr "" 8 msgstr ""
9 "Project-Id-Version: PACKAGE VERSION\n" 9 "Project-Id-Version: PACKAGE VERSION\n"
10 "Report-Msgid-Bugs-To: \n" 10 "Report-Msgid-Bugs-To: \n"
11 -"POT-Creation-Date: 2017-09-03 00:15-0300\n" 11 +"POT-Creation-Date: 2017-09-07 22:29-0300\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n" 14 "Language-Team: LANGUAGE <LL@li.org>\n"
chat/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @b573227
@@ -8,7 +8,7 @@ msgid &quot;&quot; @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 msgstr "" 8 msgstr ""
9 "Project-Id-Version: PACKAGE VERSION\n" 9 "Project-Id-Version: PACKAGE VERSION\n"
10 "Report-Msgid-Bugs-To: \n" 10 "Report-Msgid-Bugs-To: \n"
11 -"POT-Creation-Date: 2017-09-03 00:15-0300\n" 11 +"POT-Creation-Date: 2017-09-07 22:29-0300\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n" 14 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -250,11 +250,11 @@ msgstr &quot;Inativo&quot; @@ -250,11 +250,11 @@ msgstr &quot;Inativo&quot;
250 msgid "Offline" 250 msgid "Offline"
251 msgstr "Offline" 251 msgstr "Offline"
252 252
253 -#: chat/templatetags/chat_tags.py:63 chat/views.py:429 253 +#: chat/templatetags/chat_tags.py:63 chat/views.py:426
254 msgid "Unfavorite" 254 msgid "Unfavorite"
255 msgstr "Desfavoritar" 255 msgstr "Desfavoritar"
256 256
257 -#: chat/templatetags/chat_tags.py:65 chat/views.py:433 257 +#: chat/templatetags/chat_tags.py:65 chat/views.py:430
258 msgid "Favorite" 258 msgid "Favorite"
259 msgstr "Favoritar" 259 msgstr "Favoritar"
260 260
dashboards/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @b573227
@@ -8,7 +8,7 @@ msgid &quot;&quot; @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 msgstr "" 8 msgstr ""
9 "Project-Id-Version: PACKAGE VERSION\n" 9 "Project-Id-Version: PACKAGE VERSION\n"
10 "Report-Msgid-Bugs-To: \n" 10 "Report-Msgid-Bugs-To: \n"
11 -"POT-Creation-Date: 2017-09-03 00:15-0300\n" 11 +"POT-Creation-Date: 2017-09-07 22:29-0300\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n" 14 "Language-Team: LANGUAGE <LL@li.org>\n"
file_link/forms.py
  Diff comments   View file @b573227
@@ -13,7 +13,7 @@ class FileLinkForm(forms.ModelForm): @@ -13,7 +13,7 @@ class FileLinkForm(forms.ModelForm):
13 subject = None 13 subject = None
14 MAX_UPLOAD_SIZE = 10*1024*1024 14 MAX_UPLOAD_SIZE = 10*1024*1024
15 15
16 - students = ParticipantsMultipleChoiceField(queryset = None) 16 + students = ParticipantsMultipleChoiceField(queryset = None, required = False)
17 17
18 def __init__(self, *args, **kwargs): 18 def __init__(self, *args, **kwargs):
19 super(FileLinkForm, self).__init__(*args, **kwargs) 19 super(FileLinkForm, self).__init__(*args, **kwargs)
file_link/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @b573227
@@ -8,7 +8,7 @@ msgid &quot;&quot; @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 msgstr "" 8 msgstr ""
9 "Project-Id-Version: PACKAGE VERSION\n" 9 "Project-Id-Version: PACKAGE VERSION\n"
10 "Report-Msgid-Bugs-To: \n" 10 "Report-Msgid-Bugs-To: \n"
11 -"POT-Creation-Date: 2017-09-03 00:15-0300\n" 11 +"POT-Creation-Date: 2017-09-07 22:29-0300\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n" 14 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,23 +18,23 @@ msgstr &quot;&quot; @@ -18,23 +18,23 @@ msgstr &quot;&quot;
18 "Content-Transfer-Encoding: 8bit\n" 18 "Content-Transfer-Encoding: 8bit\n"
19 "Plural-Forms: nplurals=2; plural=(n > 1);\n" 19 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
20 20
21 -#: file_link/forms.py:26 21 +#: file_link/forms.py:30
22 msgid "Tags" 22 msgid "Tags"
23 msgstr "Tags" 23 msgstr "Tags"
24 24
25 -#: file_link/forms.py:32 25 +#: file_link/forms.py:36
26 msgid "File name" 26 msgid "File name"
27 msgstr "Nome do arquivo" 27 msgstr "Nome do arquivo"
28 28
29 -#: file_link/forms.py:52 29 +#: file_link/forms.py:57
30 msgid "This subject already has a file link with this name" 30 msgid "This subject already has a file link with this name"
31 msgstr "Esse assunto já possui um Link para Arquivo com esse nome" 31 msgstr "Esse assunto já possui um Link para Arquivo com esse nome"
32 32
33 -#: file_link/forms.py:64 file_link/templates/file_links/_form.html:75 33 +#: file_link/forms.py:69 file_link/templates/file_links/_form.html:75
34 msgid "The file is too large. It should have less than 10MB." 34 msgid "The file is too large. It should have less than 10MB."
35 msgstr "Esse arquivo é muito grande. Ele deve conter menos de 10MB." 35 msgstr "Esse arquivo é muito grande. Ele deve conter menos de 10MB."
36 36
37 -#: file_link/forms.py:69 37 +#: file_link/forms.py:74
38 msgid "This field is required." 38 msgid "This field is required."
39 msgstr "Esse campo é obrigatório." 39 msgstr "Esse campo é obrigatório."
40 40
file_link/templates/file_links/_form.html
  Diff comments   View file @b573227
@@ -234,7 +234,7 @@ @@ -234,7 +234,7 @@
234 <div class="col-md-12"> 234 <div class="col-md-12">
235 <a data-parent="#professors_accordion" data-toggle="collapse" href="#students"> 235 <a data-parent="#professors_accordion" data-toggle="collapse" href="#students">
236 <h4 class="panel-title"> 236 <h4 class="panel-title">
237 - <button class="btn btn-default btn-xs text-center cat-selector"><i class="fa fa-angle-right fa-2x" aria-hidden="true"></i></button><label for="{{ form.students.auto_id }}">{{ form.students.label }}</label> 237 + <button class="btn btn-default btn-xs text-center cat-selector"><i class="fa fa-angle-right fa-2x" aria-hidden="true"></i></button><label for="{{ form.students.auto_id }}">{% trans 'Students' %}</label>
238 </h4> 238 </h4>
239 </a> 239 </a>
240 </div> 240 </div>
goals/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @b573227
@@ -8,7 +8,7 @@ msgid &quot;&quot; @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 msgstr "" 8 msgstr ""
9 "Project-Id-Version: PACKAGE VERSION\n" 9 "Project-Id-Version: PACKAGE VERSION\n"
10 "Report-Msgid-Bugs-To: \n" 10 "Report-Msgid-Bugs-To: \n"
11 -"POT-Creation-Date: 2017-09-03 00:15-0300\n" 11 +"POT-Creation-Date: 2017-09-07 22:29-0300\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n" 14 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -403,7 +403,7 @@ msgstr &quot;Submeteu&quot; @@ -403,7 +403,7 @@ msgstr &quot;Submeteu&quot;
403 msgid "%s Instance" 403 msgid "%s Instance"
404 msgstr "Instância de %s" 404 msgstr "Instância de %s"
405 405
406 -#: goals/utils.py:59 goals/views.py:1224 406 +#: goals/utils.py:61 goals/views.py:1224
407 #, python-format 407 #, python-format
408 msgid "Last message in %s" 408 msgid "Last message in %s"
409 msgstr "Última mensagem em %s" 409 msgstr "Última mensagem em %s"
links/forms.py
  Diff comments   View file @b573227
@@ -14,7 +14,7 @@ class LinkForm(forms.ModelForm): @@ -14,7 +14,7 @@ class LinkForm(forms.ModelForm):
14 subject = None 14 subject = None
15 MAX_UPLOAD_SIZE = 10*1024*1024 15 MAX_UPLOAD_SIZE = 10*1024*1024
16 16
17 - students = ParticipantsMultipleChoiceField(queryset = None) 17 + students = ParticipantsMultipleChoiceField(queryset = None, required = False)
18 18
19 def __init__(self, *args, **kwargs): 19 def __init__(self, *args, **kwargs):
20 super(LinkForm, self).__init__(*args, **kwargs) 20 super(LinkForm, self).__init__(*args, **kwargs)
links/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @b573227
@@ -8,7 +8,7 @@ msgid &quot;&quot; @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 msgstr "" 8 msgstr ""
9 "Project-Id-Version: PACKAGE VERSION\n" 9 "Project-Id-Version: PACKAGE VERSION\n"
10 "Report-Msgid-Bugs-To: \n" 10 "Report-Msgid-Bugs-To: \n"
11 -"POT-Creation-Date: 2017-09-03 00:15-0300\n" 11 +"POT-Creation-Date: 2017-09-07 22:29-0300\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n" 14 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,27 +18,27 @@ msgstr &quot;&quot; @@ -18,27 +18,27 @@ msgstr &quot;&quot;
18 "Content-Transfer-Encoding: 8bit\n" 18 "Content-Transfer-Encoding: 8bit\n"
19 "Plural-Forms: nplurals=2; plural=(n > 1);\n" 19 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
20 20
21 -#: links/forms.py:27 21 +#: links/forms.py:31
22 msgid "Tags" 22 msgid "Tags"
23 msgstr "Tags" 23 msgstr "Tags"
24 24
25 -#: links/forms.py:28 25 +#: links/forms.py:32
26 msgid "Website URL" 26 msgid "Website URL"
27 msgstr "URL do site:" 27 msgstr "URL do site:"
28 28
29 -#: links/forms.py:34 29 +#: links/forms.py:38
30 msgid "Link name" 30 msgid "Link name"
31 msgstr "Nome do Link" 31 msgstr "Nome do Link"
32 32
33 -#: links/forms.py:35 33 +#: links/forms.py:39
34 msgid "End View" 34 msgid "End View"
35 msgstr "" 35 msgstr ""
36 36
37 -#: links/forms.py:36 37 +#: links/forms.py:40
38 msgid "End View Date" 38 msgid "End View Date"
39 msgstr "Data final para visualizar" 39 msgstr "Data final para visualizar"
40 40
41 -#: links/forms.py:64 41 +#: links/forms.py:68
42 msgid "There is already a link with this name on this subject" 42 msgid "There is already a link with this name on this subject"
43 msgstr "Ja existe um link com este nome neste Assunto" 43 msgstr "Ja existe um link com este nome neste Assunto"
44 44
links/templates/links/_form.html
  Diff comments   View file @b573227
@@ -219,7 +219,7 @@ @@ -219,7 +219,7 @@
219 <div class="col-md-12"> 219 <div class="col-md-12">
220 <a data-parent="#professors_accordion" data-toggle="collapse" href="#students"> 220 <a data-parent="#professors_accordion" data-toggle="collapse" href="#students">
221 <h4 class="panel-title"> 221 <h4 class="panel-title">
222 - <button class="btn btn-default btn-xs text-center cat-selector"><i class="fa fa-angle-right fa-2x" aria-hidden="true"></i></button><label for="{{ form.students.auto_id }}">{{ form.students.label }}</label> 222 + <button class="btn btn-default btn-xs text-center cat-selector"><i class="fa fa-angle-right fa-2x" aria-hidden="true"></i></button><label for="{{ form.students.auto_id }}">{% trans 'Students' %}</label>
223 </h4> 223 </h4>
224 </a> 224 </a>
225 </div> 225 </div>
log/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @b573227
@@ -8,7 +8,7 @@ msgid &quot;&quot; @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 msgstr "" 8 msgstr ""
9 "Project-Id-Version: PACKAGE VERSION\n" 9 "Project-Id-Version: PACKAGE VERSION\n"
10 "Report-Msgid-Bugs-To: \n" 10 "Report-Msgid-Bugs-To: \n"
11 -"POT-Creation-Date: 2017-09-03 00:15-0300\n" 11 +"POT-Creation-Date: 2017-09-07 22:29-0300\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n" 14 "Language-Team: LANGUAGE <LL@li.org>\n"
mailsender/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @b573227
@@ -8,7 +8,7 @@ msgid &quot;&quot; @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 msgstr "" 8 msgstr ""
9 "Project-Id-Version: PACKAGE VERSION\n" 9 "Project-Id-Version: PACKAGE VERSION\n"
10 "Report-Msgid-Bugs-To: \n" 10 "Report-Msgid-Bugs-To: \n"
11 -"POT-Creation-Date: 2017-09-03 00:15-0300\n" 11 +"POT-Creation-Date: 2017-09-07 22:29-0300\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n" 14 "Language-Team: LANGUAGE <LL@li.org>\n"
mural/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @b573227
@@ -8,7 +8,7 @@ msgid &quot;&quot; @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 msgstr "" 8 msgstr ""
9 "Project-Id-Version: PACKAGE VERSION\n" 9 "Project-Id-Version: PACKAGE VERSION\n"
10 "Report-Msgid-Bugs-To: \n" 10 "Report-Msgid-Bugs-To: \n"
11 -"POT-Creation-Date: 2017-09-03 00:15-0300\n" 11 +"POT-Creation-Date: 2017-09-07 22:29-0300\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n" 14 "Language-Team: LANGUAGE <LL@li.org>\n"
news/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @b573227
@@ -8,7 +8,7 @@ msgid &quot;&quot; @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 msgstr "" 8 msgstr ""
9 "Project-Id-Version: PACKAGE VERSION\n" 9 "Project-Id-Version: PACKAGE VERSION\n"
10 "Report-Msgid-Bugs-To: \n" 10 "Report-Msgid-Bugs-To: \n"
11 -"POT-Creation-Date: 2017-09-03 00:15-0300\n" 11 +"POT-Creation-Date: 2017-09-07 22:29-0300\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n" 14 "Language-Team: LANGUAGE <LL@li.org>\n"
notifications/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @b573227
@@ -8,7 +8,7 @@ msgid &quot;&quot; @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 msgstr "" 8 msgstr ""
9 "Project-Id-Version: PACKAGE VERSION\n" 9 "Project-Id-Version: PACKAGE VERSION\n"
10 "Report-Msgid-Bugs-To: \n" 10 "Report-Msgid-Bugs-To: \n"
11 -"POT-Creation-Date: 2017-09-03 00:15-0300\n" 11 +"POT-Creation-Date: 2017-09-07 22:29-0300\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n" 14 "Language-Team: LANGUAGE <LL@li.org>\n"
pdf_file/forms.py
  Diff comments   View file @b573227
@@ -12,7 +12,7 @@ class PDFFileForm(forms.ModelForm): @@ -12,7 +12,7 @@ class PDFFileForm(forms.ModelForm):
12 subject = None 12 subject = None
13 MAX_UPLOAD_SIZE = 10*1024*1024 13 MAX_UPLOAD_SIZE = 10*1024*1024
14 14
15 - students = ParticipantsMultipleChoiceField(queryset = None) 15 + students = ParticipantsMultipleChoiceField(queryset = None, required = False)
16 16
17 def __init__(self, *args, **kwargs): 17 def __init__(self, *args, **kwargs):
18 super(PDFFileForm, self).__init__(*args, **kwargs) 18 super(PDFFileForm, self).__init__(*args, **kwargs)
pdf_file/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @b573227
@@ -8,7 +8,7 @@ msgid &quot;&quot; @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 msgstr "" 8 msgstr ""
9 "Project-Id-Version: PACKAGE VERSION\n" 9 "Project-Id-Version: PACKAGE VERSION\n"
10 "Report-Msgid-Bugs-To: \n" 10 "Report-Msgid-Bugs-To: \n"
11 -"POT-Creation-Date: 2017-09-03 00:15-0300\n" 11 +"POT-Creation-Date: 2017-09-07 22:29-0300\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n" 14 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,23 +18,23 @@ msgstr &quot;&quot; @@ -18,23 +18,23 @@ msgstr &quot;&quot;
18 "Content-Transfer-Encoding: 8bit\n" 18 "Content-Transfer-Encoding: 8bit\n"
19 "Plural-Forms: nplurals=2; plural=(n > 1);\n" 19 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
20 20
21 -#: pdf_file/forms.py:25 21 +#: pdf_file/forms.py:28
22 msgid "Tags" 22 msgid "Tags"
23 msgstr "Tags" 23 msgstr "Tags"
24 24
25 -#: pdf_file/forms.py:30 25 +#: pdf_file/forms.py:33
26 msgid "File name" 26 msgid "File name"
27 msgstr "Nome do arquivo" 27 msgstr "Nome do arquivo"
28 28
29 -#: pdf_file/forms.py:51 29 +#: pdf_file/forms.py:54
30 msgid "This subject already has a pdf file with this name" 30 msgid "This subject already has a pdf file with this name"
31 msgstr "Este assunto já possui um arquivo PDF com este nome" 31 msgstr "Este assunto já possui um arquivo PDF com este nome"
32 32
33 -#: pdf_file/forms.py:63 pdf_file/templates/pdf_file/_form.html:75 33 +#: pdf_file/forms.py:66 pdf_file/templates/pdf_file/_form.html:75
34 msgid "The file is too large. It should have less than 10MB." 34 msgid "The file is too large. It should have less than 10MB."
35 msgstr "O arquivo é muito grande. Deve ser menor do que 10MB" 35 msgstr "O arquivo é muito grande. Deve ser menor do que 10MB"
36 36
37 -#: pdf_file/forms.py:68 37 +#: pdf_file/forms.py:71
38 msgid "This field is required." 38 msgid "This field is required."
39 msgstr "Este campo é requerido." 39 msgstr "Este campo é requerido."
40 40
pdf_file/templates/pdf_file/_form.html
  Diff comments   View file @b573227
@@ -236,7 +236,7 @@ @@ -236,7 +236,7 @@
236 <div class="col-md-12"> 236 <div class="col-md-12">
237 <a data-parent="#professors_accordion" data-toggle="collapse" href="#students"> 237 <a data-parent="#professors_accordion" data-toggle="collapse" href="#students">
238 <h4 class="panel-title"> 238 <h4 class="panel-title">
239 - <button class="btn btn-default btn-xs text-center cat-selector"><i class="fa fa-angle-right fa-2x" aria-hidden="true"></i></button><label for="{{ form.students.auto_id }}">{{ form.students.label }}</label> 239 + <button class="btn btn-default btn-xs text-center cat-selector"><i class="fa fa-angle-right fa-2x" aria-hidden="true"></i></button><label for="{{ form.students.auto_id }}">{% trans 'Students' %}</label>
240 </h4> 240 </h4>
241 </a> 241 </a>
242 </div> 242 </div>
pendencies/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @b573227
@@ -8,7 +8,7 @@ msgid &quot;&quot; @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 msgstr "" 8 msgstr ""
9 "Project-Id-Version: PACKAGE VERSION\n" 9 "Project-Id-Version: PACKAGE VERSION\n"
10 "Report-Msgid-Bugs-To: \n" 10 "Report-Msgid-Bugs-To: \n"
11 -"POT-Creation-Date: 2017-09-03 00:15-0300\n" 11 +"POT-Creation-Date: 2017-09-07 22:29-0300\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n" 14 "Language-Team: LANGUAGE <LL@li.org>\n"
reports/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @b573227
@@ -8,7 +8,7 @@ msgid &quot;&quot; @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 msgstr "" 8 msgstr ""
9 "Project-Id-Version: PACKAGE VERSION\n" 9 "Project-Id-Version: PACKAGE VERSION\n"
10 "Report-Msgid-Bugs-To: \n" 10 "Report-Msgid-Bugs-To: \n"
11 -"POT-Creation-Date: 2017-09-03 00:15-0300\n" 11 +"POT-Creation-Date: 2017-09-07 22:29-0300\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n" 14 "Language-Team: LANGUAGE <LL@li.org>\n"
security/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @b573227
@@ -8,7 +8,7 @@ msgid &quot;&quot; @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 msgstr "" 8 msgstr ""
9 "Project-Id-Version: PACKAGE VERSION\n" 9 "Project-Id-Version: PACKAGE VERSION\n"
10 "Report-Msgid-Bugs-To: \n" 10 "Report-Msgid-Bugs-To: \n"
11 -"POT-Creation-Date: 2017-09-03 00:15-0300\n" 11 +"POT-Creation-Date: 2017-09-07 22:29-0300\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n" 14 "Language-Team: LANGUAGE <LL@li.org>\n"
students_group/forms.py
  Diff comments   View file @b573227
@@ -9,7 +9,7 @@ from .models import StudentsGroup @@ -9,7 +9,7 @@ from .models import StudentsGroup
9 9
10 class StudentsGroupForm(forms.ModelForm): 10 class StudentsGroupForm(forms.ModelForm):
11 subject = None 11 subject = None
12 - participants = ParticipantsMultipleChoiceField(queryset = None) 12 + participants = ParticipantsMultipleChoiceField(queryset = None, required = False)
13 13
14 def __init__(self, *args, **kwargs): 14 def __init__(self, *args, **kwargs):
15 super(StudentsGroupForm, self).__init__(*args, **kwargs) 15 super(StudentsGroupForm, self).__init__(*args, **kwargs)
students_group/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @b573227
@@ -8,7 +8,7 @@ msgid &quot;&quot; @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 msgstr "" 8 msgstr ""
9 "Project-Id-Version: PACKAGE VERSION\n" 9 "Project-Id-Version: PACKAGE VERSION\n"
10 "Report-Msgid-Bugs-To: \n" 10 "Report-Msgid-Bugs-To: \n"
11 -"POT-Creation-Date: 2017-09-03 00:15-0300\n" 11 +"POT-Creation-Date: 2017-09-07 22:29-0300\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n" 14 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,7 +18,7 @@ msgstr &quot;&quot; @@ -18,7 +18,7 @@ msgstr &quot;&quot;
18 "Content-Transfer-Encoding: 8bit\n" 18 "Content-Transfer-Encoding: 8bit\n"
19 "Plural-Forms: nplurals=2; plural=(n > 1);\n" 19 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
20 20
21 -#: students_group/forms.py:31 21 +#: students_group/forms.py:33
22 msgid "This subject already has a group with this name" 22 msgid "This subject already has a group with this name"
23 msgstr "Esse assunto já possui um grupo com esse nome" 23 msgstr "Esse assunto já possui um grupo com esse nome"
24 24
students_group/templates/groups/_form.html
  Diff comments   View file @b573227
@@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
11 <div class="col-md-12"> 11 <div class="col-md-12">
12 <a data-parent="#professors_accordion" data-toggle="collapse" href="#group_participants"> 12 <a data-parent="#professors_accordion" data-toggle="collapse" href="#group_participants">
13 <h4 class="panel-title"> 13 <h4 class="panel-title">
14 - <button class="btn btn-default btn-xs text-center cat-selector"><i class="fa fa-angle-right fa-2x" aria-hidden="true"></i></button><label for="{{ field.auto_id }}">{{ field.label }}</label> 14 + <button class="btn btn-default btn-xs text-center cat-selector"><i class="fa fa-angle-right fa-2x" aria-hidden="true"></i></button><label for="{{ field.auto_id }}">{% trans 'Participants' %}</label>
15 </h4> 15 </h4>
16 </a> 16 </a>
17 </div> 17 </div>
subjects/forms.py
  Diff comments   View file @b573227
@@ -16,8 +16,8 @@ class ParticipantsMultipleChoiceField(forms.ModelMultipleChoiceField): @@ -16,8 +16,8 @@ class ParticipantsMultipleChoiceField(forms.ModelMultipleChoiceField):
16 class CreateSubjectForm(forms.ModelForm): 16 class CreateSubjectForm(forms.ModelForm):
17 category_id = None 17 category_id = None
18 18
19 - students = ParticipantsMultipleChoiceField(queryset = User.objects.all())  
20 - professor = ParticipantsMultipleChoiceField(queryset = User.objects.all()) 19 + students = ParticipantsMultipleChoiceField(queryset = User.objects.all(), required = False)
  20 + professor = ParticipantsMultipleChoiceField(queryset = User.objects.all(), required = False)
21 21
22 def __init__(self, *args, **kwargs): 22 def __init__(self, *args, **kwargs):
23 super(CreateSubjectForm, self).__init__(*args, **kwargs) 23 super(CreateSubjectForm, self).__init__(*args, **kwargs)
@@ -131,6 +131,9 @@ class CreateSubjectForm(forms.ModelForm): @@ -131,6 +131,9 @@ class CreateSubjectForm(forms.ModelForm):
131 return end_date 131 return end_date
132 132
133 class UpdateSubjectForm(forms.ModelForm): 133 class UpdateSubjectForm(forms.ModelForm):
  134 + students = ParticipantsMultipleChoiceField(queryset = User.objects.all(), required = False)
  135 + professor = ParticipantsMultipleChoiceField(queryset = User.objects.all(), required = False)
  136 +
134 def __init__(self, *args, **kwargs): 137 def __init__(self, *args, **kwargs):
135 super(UpdateSubjectForm, self).__init__(*args, **kwargs) 138 super(UpdateSubjectForm, self).__init__(*args, **kwargs)
136 139
subjects/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @b573227
@@ -8,7 +8,7 @@ msgid &quot;&quot; @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 msgstr "" 8 msgstr ""
9 "Project-Id-Version: PACKAGE VERSION\n" 9 "Project-Id-Version: PACKAGE VERSION\n"
10 "Report-Msgid-Bugs-To: \n" 10 "Report-Msgid-Bugs-To: \n"
11 -"POT-Creation-Date: 2017-09-03 00:15-0300\n" 11 +"POT-Creation-Date: 2017-09-07 22:29-0300\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n" 14 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,27 +18,27 @@ msgstr &quot;&quot; @@ -18,27 +18,27 @@ msgstr &quot;&quot;
18 "Content-Transfer-Encoding: 8bit\n" 18 "Content-Transfer-Encoding: 8bit\n"
19 "Plural-Forms: nplurals=2; plural=(n > 1);\n" 19 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
20 20
21 -#: subjects/forms.py:24 subjects/forms.py:128 21 +#: subjects/forms.py:37 subjects/forms.py:144
22 msgid "Tags" 22 msgid "Tags"
23 msgstr "Tags" 23 msgstr "Tags"
24 24
25 -#: subjects/forms.py:78 subjects/forms.py:183 25 +#: subjects/forms.py:91 subjects/forms.py:199
26 msgid "There is another subject with this name, try another one." 26 msgid "There is another subject with this name, try another one."
27 msgstr "Já existe um assunto com esse nome, tente outro." 27 msgstr "Já existe um assunto com esse nome, tente outro."
28 28
29 -#: subjects/forms.py:87 29 +#: subjects/forms.py:100
30 msgid "This date must be today or after" 30 msgid "This date must be today or after"
31 msgstr "Essa data deve ser hoje ou depois disso" 31 msgstr "Essa data deve ser hoje ou depois disso"
32 32
33 -#: subjects/forms.py:97 subjects/forms.py:201 33 +#: subjects/forms.py:110 subjects/forms.py:217
34 msgid "This date must be equal subscribe begin or after" 34 msgid "This date must be equal subscribe begin or after"
35 msgstr "Essa data deve ser igual ou depois de começarem as incrições" 35 msgstr "Essa data deve ser igual ou depois de começarem as incrições"
36 36
37 -#: subjects/forms.py:107 subjects/forms.py:211 37 +#: subjects/forms.py:120 subjects/forms.py:227
38 msgid "This date must be after subscribe end" 38 msgid "This date must be after subscribe end"
39 msgstr "Essa data deve ser depois do fim das inscrições" 39 msgstr "Essa data deve ser depois do fim das inscrições"
40 40
41 -#: subjects/forms.py:116 subjects/forms.py:220 41 +#: subjects/forms.py:129 subjects/forms.py:236
42 msgid "This date must be equal init date or after" 42 msgid "This date must be equal init date or after"
43 msgstr "Essa data deve ser igual ou depois da data de início" 43 msgstr "Essa data deve ser igual ou depois da data de início"
44 44
@@ -242,12 +242,12 @@ msgid &quot; Any subjects or Resources were not found on the search for &quot; @@ -242,12 +242,12 @@ msgid &quot; Any subjects or Resources were not found on the search for &quot;
242 msgstr " Nenhum assunto ou recursos foram encontrados na busca por " 242 msgstr " Nenhum assunto ou recursos foram encontrados na busca por "
243 243
244 #: subjects/templates/subjects/list_search.html:48 244 #: subjects/templates/subjects/list_search.html:48
245 -#: subjects/templates/subjects/list_search.html:51 subjects/views.py:679 245 +#: subjects/templates/subjects/list_search.html:51 subjects/views.py:676
246 msgid "Subjects" 246 msgid "Subjects"
247 msgstr "Assuntos" 247 msgstr "Assuntos"
248 248
249 #: subjects/templates/subjects/list_search.html:49 249 #: subjects/templates/subjects/list_search.html:49
250 -#: subjects/templates/subjects/list_search.html:52 subjects/views.py:686 250 +#: subjects/templates/subjects/list_search.html:52 subjects/views.py:683
251 msgid "Resources" 251 msgid "Resources"
252 msgstr "Recursos" 252 msgstr "Recursos"
253 253
@@ -415,24 +415,24 @@ msgstr &quot;&quot; @@ -415,24 +415,24 @@ msgstr &quot;&quot;
415 "Assunto não pode ser removido. Ele ainda possui alunos e objetos de " 415 "Assunto não pode ser removido. Ele ainda possui alunos e objetos de "
416 "aprendizado associados" 416 "aprendizado associados"
417 417
418 -#: subjects/views.py:605 418 +#: subjects/views.py:602
419 msgid "Subscription date is due!" 419 msgid "Subscription date is due!"
420 msgstr "O período de inscrição está encerrado!" 420 msgstr "O período de inscrição está encerrado!"
421 421
422 -#: subjects/views.py:618 422 +#: subjects/views.py:615
423 msgid "Subscription was successfull!" 423 msgid "Subscription was successfull!"
424 msgstr "Inscrição feita com sucesso!" 424 msgstr "Inscrição feita com sucesso!"
425 425
426 -#: subjects/views.py:751 426 +#: subjects/views.py:748
427 #, python-format 427 #, python-format
428 msgid "%s - Backup" 428 msgid "%s - Backup"
429 msgstr "%s - Backup" 429 msgstr "%s - Backup"
430 430
431 -#: subjects/views.py:910 431 +#: subjects/views.py:907
432 #, python-format 432 #, python-format
433 msgid "%s - Restore" 433 msgid "%s - Restore"
434 msgstr "%s - Restaurar" 434 msgstr "%s - Restaurar"
435 435
436 -#: subjects/views.py:984 436 +#: subjects/views.py:981
437 msgid "Backup restored successfully!" 437 msgid "Backup restored successfully!"
438 msgstr "Backup restaurado com sucesso!" 438 msgstr "Backup restaurado com sucesso!"
subjects/templates/subjects/_form.html
  Diff comments   View file @b573227
@@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
11 <div class="col-md-12"> 11 <div class="col-md-12">
12 <a data-parent="#coordinators_accordion" data-toggle="collapse" href="#students"> 12 <a data-parent="#coordinators_accordion" data-toggle="collapse" href="#students">
13 <h4 class="panel-title"> 13 <h4 class="panel-title">
14 - <button class="btn btn-default btn-xs text-center cat-selector"><i class="fa fa-angle-right fa-2x" aria-hidden="true"></i></button><label for="{{ field.auto_id }}">{{ field.label }}</label> 14 + <button class="btn btn-default btn-xs text-center cat-selector"><i class="fa fa-angle-right fa-2x" aria-hidden="true"></i></button><label for="{{ field.auto_id }}">{% trans 'Students' %}</label>
15 </h4> 15 </h4>
16 </a> 16 </a>
17 </div> 17 </div>
@@ -31,7 +31,7 @@ @@ -31,7 +31,7 @@
31 <div class="col-md-12"> 31 <div class="col-md-12">
32 <a data-parent="#professors_accordion" data-toggle="collapse" href="#professors"> 32 <a data-parent="#professors_accordion" data-toggle="collapse" href="#professors">
33 <h4 class="panel-title"> 33 <h4 class="panel-title">
34 - <button class="btn btn-default btn-xs text-center cat-selector"><i class="fa fa-angle-right fa-2x" aria-hidden="true"></i></button><label for="{{ field.auto_id }}">{{ field.label }}</label> 34 + <button class="btn btn-default btn-xs text-center cat-selector"><i class="fa fa-angle-right fa-2x" aria-hidden="true"></i></button><label for="{{ field.auto_id }}">{% trans 'Professor' %}</label>
35 </h4> 35 </h4>
36 </a> 36 </a>
37 </div> 37 </div>
subjects/templates/subjects/restore.html
  Diff comments   View file @b573227
@@ -72,10 +72,10 @@ @@ -72,10 +72,10 @@
72 {% csrf_token %} 72 {% csrf_token %}
73 73
74 <div class="form-group is-fileinput"> 74 <div class="form-group is-fileinput">
75 - <input type="file" id="zip_file" name="zip_file" class="form-control" accept=".zip" /> 75 + <input type="file" id="zip_file" name="zip_file" class="form-control" accept=".zip" data-mimetypes="['application/zip', 'application/octet-stream']" required />
76 76
77 <div class="input-group common-file-input"> 77 <div class="input-group common-file-input">
78 - <input type="text" readonly="" class="form-control" placeholder="{% trans 'Choose your file...' %}"> 78 + <input type="text" readonly="" class="form-control" placeholder="{% trans 'Choose your file...' %}" required>
79 <span class="input-group-btn input-group-sm"> 79 <span class="input-group-btn input-group-sm">
80 <button type="button" class="btn btn-fab btn-fab-mini"> 80 <button type="button" class="btn btn-fab btn-fab-mini">
81 <i class="material-icons">attach_file</i> 81 <i class="material-icons">attach_file</i>
@@ -88,8 +88,18 @@ @@ -88,8 +88,18 @@
88 </div> 88 </div>
89 </div> 89 </div>
90 90
  91 + <div class="col-lg-12 col-md-12 col-sm-12 alert alert-danger alert-dismissible client-file-errors" style="display:none" role="alert">
  92 + <button type="button" class="close" data-dismiss="alert" aria-label="Close">
  93 + <span aria-hidden="true">&times;</span>
  94 + </button>
  95 + <ul>
  96 + <li class="format">{% trans 'File not supported.' %}</li>
  97 + </ul>
  98 + </div>
  99 +
  100 +
91 <div class="row text-center"> 101 <div class="row text-center">
92 - <input type="submit" value="{% trans 'Restore' %}" class="btn btn-success btn-raised" /> 102 + <input type="submit" value="{% trans 'Restore' %}" disabled class="btn btn-success btn-raised" />
93 </div> 103 </div>
94 </form> 104 </form>
95 </div> 105 </div>
@@ -127,10 +137,23 @@ @@ -127,10 +137,23 @@
127 // file selection 137 // file selection
128 function FileSelectHandler(e) { 138 function FileSelectHandler(e) {
129 var files = e.target.files || e.dataTransfer.files, 139 var files = e.target.files || e.dataTransfer.files,
130 - parent = $(e.target.offsetParent); 140 + parent = $(e.target.offsetParent),
  141 + mimeTypes = $(e.target).data('mimetypes'),
  142 + submit_btn = $(e.target).closest("form").find("input[type='submit']");
  143 +
  144 + $(".client-file-errors").hide();
  145 + $(submit_btn).prop('disable', false);
  146 + $(submit_btn).prop('disabled', false);
131 147
132 // process all File objects 148 // process all File objects
133 for (var i = 0, f; f = files[i]; i++) { 149 for (var i = 0, f; f = files[i]; i++) {
  150 + if (!mimeTypes.includes(f.type)) {
  151 + $(submit_btn).prop('disable', true);
  152 + $(submit_btn).prop('disabled', true);
  153 +
  154 + $(".client-file-errors").show();
  155 + }
  156 +
134 parent.find('.filedrag').html(f.name); 157 parent.find('.filedrag').html(f.name);
135 } 158 }
136 } 159 }
themes/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @b573227
@@ -8,7 +8,7 @@ msgid &quot;&quot; @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 msgstr "" 8 msgstr ""
9 "Project-Id-Version: PACKAGE VERSION\n" 9 "Project-Id-Version: PACKAGE VERSION\n"
10 "Report-Msgid-Bugs-To: \n" 10 "Report-Msgid-Bugs-To: \n"
11 -"POT-Creation-Date: 2017-09-03 00:15-0300\n" 11 +"POT-Creation-Date: 2017-09-07 22:29-0300\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n" 14 "Language-Team: LANGUAGE <LL@li.org>\n"
topics/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @b573227
@@ -8,7 +8,7 @@ msgid &quot;&quot; @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 msgstr "" 8 msgstr ""
9 "Project-Id-Version: PACKAGE VERSION\n" 9 "Project-Id-Version: PACKAGE VERSION\n"
10 "Report-Msgid-Bugs-To: \n" 10 "Report-Msgid-Bugs-To: \n"
11 -"POT-Creation-Date: 2017-09-03 00:15-0300\n" 11 +"POT-Creation-Date: 2017-09-07 22:29-0300\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n" 14 "Language-Team: LANGUAGE <LL@li.org>\n"
users/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @b573227
@@ -8,7 +8,7 @@ msgid &quot;&quot; @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 msgstr "" 8 msgstr ""
9 "Project-Id-Version: PACKAGE VERSION\n" 9 "Project-Id-Version: PACKAGE VERSION\n"
10 "Report-Msgid-Bugs-To: \n" 10 "Report-Msgid-Bugs-To: \n"
11 -"POT-Creation-Date: 2017-09-03 00:15-0300\n" 11 +"POT-Creation-Date: 2017-09-07 22:29-0300\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n" 14 "Language-Team: LANGUAGE <LL@li.org>\n"
webconference/forms.py
  Diff comments   View file @b573227
@@ -16,7 +16,7 @@ from pendencies.models import Pendencies @@ -16,7 +16,7 @@ from pendencies.models import Pendencies
16 class WebconferenceForm(forms.ModelForm): 16 class WebconferenceForm(forms.ModelForm):
17 subject = None 17 subject = None
18 control_subject = forms.CharField(widget = forms.HiddenInput()) 18 control_subject = forms.CharField(widget = forms.HiddenInput())
19 - students = ParticipantsMultipleChoiceField(queryset = None) 19 + students = ParticipantsMultipleChoiceField(queryset = None, required = False)
20 20
21 def __init__(self, *args, **kwargs): 21 def __init__(self, *args, **kwargs):
22 super(WebconferenceForm, self).__init__(*args, **kwargs) 22 super(WebconferenceForm, self).__init__(*args, **kwargs)
webconference/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @b573227
@@ -8,7 +8,7 @@ msgid &quot;&quot; @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 msgstr "" 8 msgstr ""
9 "Project-Id-Version: PACKAGE VERSION\n" 9 "Project-Id-Version: PACKAGE VERSION\n"
10 "Report-Msgid-Bugs-To: \n" 10 "Report-Msgid-Bugs-To: \n"
11 -"POT-Creation-Date: 2017-09-03 00:15-0300\n" 11 +"POT-Creation-Date: 2017-09-07 22:29-0300\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n" 14 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,35 +18,35 @@ msgstr &quot;&quot; @@ -18,35 +18,35 @@ msgstr &quot;&quot;
18 "Content-Transfer-Encoding: 8bit\n" 18 "Content-Transfer-Encoding: 8bit\n"
19 "Plural-Forms: nplurals=2; plural=(n > 1);\n" 19 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
20 20
21 -#: webconference/forms.py:33 21 +#: webconference/forms.py:35
22 msgid "Tags" 22 msgid "Tags"
23 msgstr "Tags" 23 msgstr "Tags"
24 24
25 -#: webconference/forms.py:39 25 +#: webconference/forms.py:41
26 msgid "Web Conference Title" 26 msgid "Web Conference Title"
27 msgstr "Titulo da Web Conferência" 27 msgstr "Titulo da Web Conferência"
28 28
29 -#: webconference/forms.py:40 webconference/models.py:8 29 +#: webconference/forms.py:42 webconference/models.py:8
30 msgid "Presentation" 30 msgid "Presentation"
31 msgstr "Apresentação" 31 msgstr "Apresentação"
32 32
33 -#: webconference/forms.py:61 33 +#: webconference/forms.py:63
34 msgid "This subject already has a web conference with this name" 34 msgid "This subject already has a web conference with this name"
35 msgstr "Este assunto já tem uma web conferência com este nome" 35 msgstr "Este assunto já tem uma web conferência com este nome"
36 36
37 -#: webconference/forms.py:71 37 +#: webconference/forms.py:73
38 msgid "This date must be today or after" 38 msgid "This date must be today or after"
39 msgstr "Esta data deve ser hoje ou depois" 39 msgstr "Esta data deve ser hoje ou depois"
40 40
41 -#: webconference/forms.py:81 41 +#: webconference/forms.py:83
42 msgid "This date must be equal start date/hour or after" 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" 43 msgstr "Esta data deve ser igual ou posterior a data/hora de inicio"
44 44
45 -#: webconference/forms.py:128 webconference/models.py:35 45 +#: webconference/forms.py:130 webconference/models.py:35
46 msgid "Domain" 46 msgid "Domain"
47 msgstr "Dominio" 47 msgstr "Dominio"
48 48
49 -#: webconference/forms.py:132 49 +#: webconference/forms.py:134
50 msgid "The domain of the jitsi server, e.g. meet.jit.si" 50 msgid "The domain of the jitsi server, e.g. meet.jit.si"
51 msgstr "O dominio do servidor do jitsi, ex: meet.jit.si" 51 msgstr "O dominio do servidor do jitsi, ex: meet.jit.si"
52 52
webconference/templates/webconference/_form.html
  Diff comments   View file @b573227
@@ -250,7 +250,7 @@ @@ -250,7 +250,7 @@
250 <div class="col-md-12"> 250 <div class="col-md-12">
251 <a data-parent="#professors_accordion" data-toggle="collapse" href="#students"> 251 <a data-parent="#professors_accordion" data-toggle="collapse" href="#students">
252 <h4 class="panel-title"> 252 <h4 class="panel-title">
253 - <button class="btn btn-default btn-xs text-center cat-selector"><i class="fa fa-angle-right fa-2x" aria-hidden="true"></i></button><label for="{{ form.students.auto_id }}">{{ form.students.label }}</label> 253 + <button class="btn btn-default btn-xs text-center cat-selector"><i class="fa fa-angle-right fa-2x" aria-hidden="true"></i></button><label for="{{ form.students.auto_id }}">{% trans 'Students' %}</label>
254 </h4> 254 </h4>
255 </a> 255 </a>
256 </div> 256 </div>
webpage/forms.py
  Diff comments   View file @b573227
@@ -12,7 +12,7 @@ from resubmit.widgets import ResubmitFileWidget @@ -12,7 +12,7 @@ from resubmit.widgets import ResubmitFileWidget
12 12
13 class WebpageForm(forms.ModelForm): 13 class WebpageForm(forms.ModelForm):
14 subject = None 14 subject = None
15 - students = ParticipantsMultipleChoiceField(queryset = None) 15 + students = ParticipantsMultipleChoiceField(queryset = None, required = False)
16 16
17 def __init__(self, *args, **kwargs): 17 def __init__(self, *args, **kwargs):
18 super(WebpageForm, self).__init__(*args, **kwargs) 18 super(WebpageForm, self).__init__(*args, **kwargs)
webpage/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @b573227
@@ -8,7 +8,7 @@ msgid &quot;&quot; @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 msgstr "" 8 msgstr ""
9 "Project-Id-Version: PACKAGE VERSION\n" 9 "Project-Id-Version: PACKAGE VERSION\n"
10 "Report-Msgid-Bugs-To: \n" 10 "Report-Msgid-Bugs-To: \n"
11 -"POT-Creation-Date: 2017-09-03 00:15-0300\n" 11 +"POT-Creation-Date: 2017-09-07 22:29-0300\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n" 14 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,31 +18,31 @@ msgstr &quot;&quot; @@ -18,31 +18,31 @@ msgstr &quot;&quot;
18 "Content-Transfer-Encoding: 8bit\n" 18 "Content-Transfer-Encoding: 8bit\n"
19 "Plural-Forms: nplurals=2; plural=(n > 1);\n" 19 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
20 20
21 -#: webpage/forms.py:27 21 +#: webpage/forms.py:29
22 msgid "Tags" 22 msgid "Tags"
23 msgstr "Tags" 23 msgstr "Tags"
24 24
25 -#: webpage/forms.py:33 25 +#: webpage/forms.py:35
26 msgid "Webpage name" 26 msgid "Webpage name"
27 msgstr "Nome da Página Web" 27 msgstr "Nome da Página Web"
28 28
29 -#: webpage/forms.py:34 29 +#: webpage/forms.py:36
30 msgid "Webpage content" 30 msgid "Webpage content"
31 msgstr "Conteúdo da Página Web" 31 msgstr "Conteúdo da Página Web"
32 32
33 -#: webpage/forms.py:55 33 +#: webpage/forms.py:57
34 msgid "This subject already has a webpage with this name" 34 msgid "This subject already has a webpage with this name"
35 msgstr "Esse assunto já possui uma Página Web com esse nome" 35 msgstr "Esse assunto já possui uma Página Web com esse nome"
36 36
37 -#: webpage/forms.py:66 webpage/forms.py:112 37 +#: webpage/forms.py:68 webpage/forms.py:114
38 msgid "This field is required." 38 msgid "This field is required."
39 msgstr "Esse campo é obrigatório." 39 msgstr "Esse campo é obrigatório."
40 40
41 -#: webpage/forms.py:104 41 +#: webpage/forms.py:106
42 msgid "Message" 42 msgid "Message"
43 msgstr "Mensagem" 43 msgstr "Mensagem"
44 44
45 -#: webpage/forms.py:124 45 +#: webpage/forms.py:126
46 msgid "The image is too large. It should have less than 5MB." 46 msgid "The image is too large. It should have less than 5MB."
47 msgstr "A imagem é muito grande. Deve ser menor do que 5MB" 47 msgstr "A imagem é muito grande. Deve ser menor do que 5MB"
48 48
webpage/templates/webpages/_form.html
  Diff comments   View file @b573227
@@ -203,7 +203,7 @@ @@ -203,7 +203,7 @@
203 <div class="col-md-12"> 203 <div class="col-md-12">
204 <a data-parent="#professors_accordion" data-toggle="collapse" href="#students"> 204 <a data-parent="#professors_accordion" data-toggle="collapse" href="#students">
205 <h4 class="panel-title"> 205 <h4 class="panel-title">
206 - <button class="btn btn-default btn-xs text-center cat-selector"><i class="fa fa-angle-right fa-2x" aria-hidden="true"></i></button><label for="{{ form.students.auto_id }}">{{ form.students.label }}</label> 206 + <button class="btn btn-default btn-xs text-center cat-selector"><i class="fa fa-angle-right fa-2x" aria-hidden="true"></i></button><label for="{{ form.students.auto_id }}">{% trans 'Students' %}</label>
207 </h4> 207 </h4>
208 </a> 208 </a>
209 </div> 209 </div>
youtube_video/forms.py
  Diff comments   View file @b573227
@@ -19,7 +19,7 @@ from .models import YTVideo @@ -19,7 +19,7 @@ from .models import YTVideo
19 class YTVideoForm(forms.ModelForm): 19 class YTVideoForm(forms.ModelForm):
20 subject = None 20 subject = None
21 control_subject = forms.CharField(widget = forms.HiddenInput()) 21 control_subject = forms.CharField(widget = forms.HiddenInput())
22 - students = ParticipantsMultipleChoiceField(queryset = None) 22 + students = ParticipantsMultipleChoiceField(queryset = None, required = False)
23 23
24 def __init__(self, *args, **kwargs): 24 def __init__(self, *args, **kwargs):
25 super(YTVideoForm, self).__init__(*args, **kwargs) 25 super(YTVideoForm, self).__init__(*args, **kwargs)
youtube_video/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @b573227
@@ -8,7 +8,7 @@ msgid &quot;&quot; @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 msgstr "" 8 msgstr ""
9 "Project-Id-Version: PACKAGE VERSION\n" 9 "Project-Id-Version: PACKAGE VERSION\n"
10 "Report-Msgid-Bugs-To: \n" 10 "Report-Msgid-Bugs-To: \n"
11 -"POT-Creation-Date: 2017-09-03 00:15-0300\n" 11 +"POT-Creation-Date: 2017-09-07 22:29-0300\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n" 14 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,19 +18,19 @@ msgstr &quot;&quot; @@ -18,19 +18,19 @@ msgstr &quot;&quot;
18 "Content-Transfer-Encoding: 8bit\n" 18 "Content-Transfer-Encoding: 8bit\n"
19 "Plural-Forms: nplurals=2; plural=(n > 1);\n" 19 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
20 20
21 -#: youtube_video/forms.py:36 21 +#: youtube_video/forms.py:38
22 msgid "Tags" 22 msgid "Tags"
23 msgstr "Tags" 23 msgstr "Tags"
24 24
25 -#: youtube_video/forms.py:42 25 +#: youtube_video/forms.py:44
26 msgid "Video title" 26 msgid "Video title"
27 msgstr "Título do Vídeo" 27 msgstr "Título do Vídeo"
28 28
29 -#: youtube_video/forms.py:62 29 +#: youtube_video/forms.py:64
30 msgid "This subject already has a resource with this name" 30 msgid "This subject already has a resource with this name"
31 msgstr "Esse assunto já possui um recurso com esse nome" 31 msgstr "Esse assunto já possui um recurso com esse nome"
32 32
33 -#: youtube_video/forms.py:71 33 +#: youtube_video/forms.py:73
34 msgid "Invalid URL. It should be an YouTube link." 34 msgid "Invalid URL. It should be an YouTube link."
35 msgstr "URL inválida. Ela deve ser uma URL de um vídeo do YouTube." 35 msgstr "URL inválida. Ela deve ser uma URL de um vídeo do YouTube."
36 36
youtube_video/templates/youtube/_form.html
  Diff comments   View file @b573227
@@ -209,7 +209,7 @@ @@ -209,7 +209,7 @@
209 <div class="col-md-12"> 209 <div class="col-md-12">
210 <a data-parent="#professors_accordion" data-toggle="collapse" href="#students"> 210 <a data-parent="#professors_accordion" data-toggle="collapse" href="#students">
211 <h4 class="panel-title"> 211 <h4 class="panel-title">
212 - <button class="btn btn-default btn-xs text-center cat-selector"><i class="fa fa-angle-right fa-2x" aria-hidden="true"></i></button><label for="{{ form.students.auto_id }}">{{ form.students.label }}</label> 212 + <button class="btn btn-default btn-xs text-center cat-selector"><i class="fa fa-angle-right fa-2x" aria-hidden="true"></i></button><label for="{{ form.students.auto_id }}">{% trans 'Students' %}</label>
213 </h4> 213 </h4>
214 </a> 214 </a>
215 </div> 215 </div>