From 6b4b2dd5116786cbab8f5e694b5e44618a529c85 Mon Sep 17 00:00:00 2001 From: Zambom Date: Wed, 13 Sep 2017 23:32:55 -0300 Subject: [PATCH] Adjusting webconference date verification --- amadeus/locale/pt_BR/LC_MESSAGES/django.po | 50 +++++++++++++++++++++++++------------------------- analytics/locale/pt_BR/LC_MESSAGES/django.po | 2 +- api/locale/pt_BR/LC_MESSAGES/django.po | 12 ++++++------ bulletin/locale/pt_BR/LC_MESSAGES/django.po | 30 +++++++++++++++--------------- categories/locale/pt_BR/LC_MESSAGES/django.po | 2 +- chat/locale/pt_BR/LC_MESSAGES/django.po | 2 +- dashboards/locale/pt_BR/LC_MESSAGES/django.po | 2 +- file_link/locale/pt_BR/LC_MESSAGES/django.po | 30 +++++++++++++++--------------- goals/locale/pt_BR/LC_MESSAGES/django.po | 2 +- links/locale/pt_BR/LC_MESSAGES/django.po | 58 +++++++++++++++++++++++++++++++--------------------------- log/locale/pt_BR/LC_MESSAGES/django.po | 2 +- mailsender/locale/pt_BR/LC_MESSAGES/django.po | 2 +- mural/locale/pt_BR/LC_MESSAGES/django.po | 2 +- news/locale/pt_BR/LC_MESSAGES/django.po | 2 +- notifications/locale/pt_BR/LC_MESSAGES/django.po | 2 +- pdf_file/locale/pt_BR/LC_MESSAGES/django.po | 30 +++++++++++++++--------------- pendencies/locale/pt_BR/LC_MESSAGES/django.po | 2 +- reports/locale/pt_BR/LC_MESSAGES/django.po | 2 +- security/locale/pt_BR/LC_MESSAGES/django.po | 2 +- students_group/locale/pt_BR/LC_MESSAGES/django.po | 2 +- subjects/locale/pt_BR/LC_MESSAGES/django.po | 22 +++++++++++----------- themes/locale/pt_BR/LC_MESSAGES/django.po | 2 +- topics/locale/pt_BR/LC_MESSAGES/django.po | 2 +- users/locale/pt_BR/LC_MESSAGES/django.po | 2 +- webconference/forms.py | 50 ++++++++++++++++++++++++++++++-------------------- webconference/locale/pt_BR/LC_MESSAGES/django.po | 124 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------- webconference/templates/webconference/_form.html | 37 +++++++++++++++++++++++++++++++++++++ webconference/views.py | 3 +-- webpage/locale/pt_BR/LC_MESSAGES/django.po | 30 +++++++++++++++--------------- youtube_video/locale/pt_BR/LC_MESSAGES/django.po | 34 +++++++++++++++++----------------- 30 files changed, 297 insertions(+), 247 deletions(-) diff --git a/amadeus/locale/pt_BR/LC_MESSAGES/django.po b/amadeus/locale/pt_BR/LC_MESSAGES/django.po index 1b8d25b..2e2f76d 100644 --- a/amadeus/locale/pt_BR/LC_MESSAGES/django.po +++ b/amadeus/locale/pt_BR/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-10 02:55-0300\n" +"POT-Creation-Date: 2017-09-13 23:29-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,99 +18,99 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: amadeus/settings.py:184 +#: amadeus/settings.py:186 msgid "Portuguese" msgstr "Português" -#: amadeus/settings.py:185 +#: amadeus/settings.py:187 msgid "English" msgstr "Inglês" -#: amadeus/templates/base.html:111 +#: amadeus/templates/base.html:112 msgid "Search for subjects and resources" msgstr "Buscar por assuntos ou recursos" -#: amadeus/templates/base.html:123 amadeus/templates/base.html:126 +#: amadeus/templates/base.html:124 amadeus/templates/base.html:127 msgid "Language Selector" msgstr "Seletor de Línguas" -#: amadeus/templates/base.html:157 +#: amadeus/templates/base.html:158 msgid "Profile" msgstr "Perfil" -#: amadeus/templates/base.html:158 +#: amadeus/templates/base.html:159 msgid "Edit Profile" msgstr "Editar Perfil" -#: amadeus/templates/base.html:159 +#: amadeus/templates/base.html:160 msgid "Change Password" msgstr "Alterar Senha" -#: amadeus/templates/base.html:160 +#: amadeus/templates/base.html:161 msgid "Delete Account" msgstr "Remover Conta" -#: amadeus/templates/base.html:161 +#: amadeus/templates/base.html:162 msgid "Logout" msgstr "Sair" -#: amadeus/templates/base.html:166 +#: amadeus/templates/base.html:167 msgid "settings" msgstr "configurações" -#: amadeus/templates/base.html:169 +#: amadeus/templates/base.html:170 msgid "Settings" msgstr "Configurações" -#: amadeus/templates/base.html:172 +#: amadeus/templates/base.html:173 msgid "Manage Users" msgstr "Gerenciar Usuários" -#: amadeus/templates/base.html:173 +#: amadeus/templates/base.html:174 msgid "Manage Categories" msgstr "Gerenciar Categorias" -#: amadeus/templates/base.html:174 +#: amadeus/templates/base.html:175 msgid "Manage News" msgstr "Gerenciar Notícias" -#: amadeus/templates/base.html:181 +#: amadeus/templates/base.html:182 msgid "System" msgstr "Sistema" -#: amadeus/templates/base.html:188 +#: amadeus/templates/base.html:189 msgid "Mail Sender" msgstr "Remetente de Email" -#: amadeus/templates/base.html:189 +#: amadeus/templates/base.html:190 msgid "Security" msgstr "Segurança" -#: amadeus/templates/base.html:190 +#: amadeus/templates/base.html:191 msgid "Theme" msgstr "Temas" -#: amadeus/templates/base.html:191 +#: amadeus/templates/base.html:192 msgid "Web Conference" msgstr "Web conferência" -#: amadeus/templates/base.html:225 amadeus/templates/base.html:280 +#: amadeus/templates/base.html:227 amadeus/templates/base.html:282 msgid "Subjects" msgstr "Assuntos" -#: amadeus/templates/base.html:230 amadeus/templates/base.html:285 +#: amadeus/templates/base.html:232 amadeus/templates/base.html:287 msgid "Mural" msgstr "Mural" -#: amadeus/templates/base.html:236 amadeus/templates/base.html:291 +#: amadeus/templates/base.html:238 amadeus/templates/base.html:293 msgid "Messages" msgstr "Mensagens" -#: amadeus/templates/base.html:242 amadeus/templates/base.html:297 +#: amadeus/templates/base.html:244 amadeus/templates/base.html:299 msgid "Pendencies" msgstr "Pendências" -#: amadeus/templates/base.html:250 amadeus/templates/base.html:305 +#: amadeus/templates/base.html:252 amadeus/templates/base.html:307 msgid "Analytics" msgstr "Analytics" diff --git a/analytics/locale/pt_BR/LC_MESSAGES/django.po b/analytics/locale/pt_BR/LC_MESSAGES/django.po index 505af86..255eef6 100644 --- a/analytics/locale/pt_BR/LC_MESSAGES/django.po +++ b/analytics/locale/pt_BR/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-10 02:55-0300\n" +"POT-Creation-Date: 2017-09-13 23:29-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/api/locale/pt_BR/LC_MESSAGES/django.po b/api/locale/pt_BR/LC_MESSAGES/django.po index fd26497..5802abb 100644 --- a/api/locale/pt_BR/LC_MESSAGES/django.po +++ b/api/locale/pt_BR/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-10 02:55-0300\n" +"POT-Creation-Date: 2017-09-13 23:29-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -26,23 +26,23 @@ msgstr "" msgid "[Photo]" msgstr "" -#: api/views.py:341 +#: api/views.py:374 #, python-format msgid "Last message in %s" msgstr "" -#: api/views.py:358 +#: api/views.py:391 msgid "Message sent successfully!" msgstr "" -#: api/views.py:364 +#: api/views.py:397 msgid "Error while sending message!" msgstr "" -#: api/views.py:371 +#: api/views.py:404 msgid "No information received!" msgstr "" -#: api/views.py:377 +#: api/views.py:410 msgid "Amadeus" msgstr "" diff --git a/bulletin/locale/pt_BR/LC_MESSAGES/django.po b/bulletin/locale/pt_BR/LC_MESSAGES/django.po index 6b1cfde..bba2b23 100644 --- a/bulletin/locale/pt_BR/LC_MESSAGES/django.po +++ b/bulletin/locale/pt_BR/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-10 02:55-0300\n" +"POT-Creation-Date: 2017-09-13 23:29-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -72,7 +72,7 @@ msgstr "Metas" msgid "Relevant Indicators" msgstr "Indicadores Relevantes" -#: bulletin/models.py:25 bulletin/views.py:934 +#: bulletin/models.py:25 bulletin/views.py:935 msgid "Bulletin" msgstr "Boletim" @@ -231,7 +231,7 @@ msgstr "para informar as dificuldades que podem prejudicar seu desempenho." msgid "Type here the dificulties that may harm your performance" msgstr "Escreva aqui as dificuldades que podem diminuir sua performance" -#: bulletin/utils.py:47 bulletin/views.py:1021 +#: bulletin/utils.py:47 bulletin/views.py:1022 #, python-format msgid "Last message in %s" msgstr "Última mensagem em %s" @@ -291,54 +291,54 @@ msgstr "" msgid "Update Bulletin" msgstr "Atualizar boletim" -#: bulletin/views.py:796 +#: bulletin/views.py:797 #, python-format msgid "The Bulletin \"%s\" was updated successfully!" msgstr "O Boletim \"%s\" foi atualizado com sucesso!" -#: bulletin/views.py:832 +#: bulletin/views.py:833 #, python-format msgid "" "The bulletin \"%s\" was removed successfully from virtual environment \"%s\"!" msgstr "O boletim \"%s\" foi removido com sucesso do ambiente virtual \"%s\"! " -#: bulletin/views.py:891 +#: bulletin/views.py:892 msgid "Bulletin Reports" msgstr "Relatórios do Boletim" -#: bulletin/views.py:910 +#: bulletin/views.py:911 msgid "Realized" msgstr "Realizada" -#: bulletin/views.py:910 +#: bulletin/views.py:911 msgid "Unrealized" msgstr "Não realizada" -#: bulletin/views.py:910 +#: bulletin/views.py:911 msgid "Historic" msgstr "Histórico" -#: bulletin/views.py:925 bulletin/views.py:933 +#: bulletin/views.py:926 bulletin/views.py:934 msgid "View" msgstr "Visualizar" -#: bulletin/views.py:939 +#: bulletin/views.py:940 msgid "Actions about resource" msgstr "Ações sobre o recurso" -#: bulletin/views.py:940 +#: bulletin/views.py:941 msgid "Quantity" msgstr "Quantidade" -#: bulletin/views.py:1009 +#: bulletin/views.py:1010 msgid "[Photo]" msgstr "[Foto]" -#: bulletin/views.py:1030 +#: bulletin/views.py:1031 msgid "The message was successfull sent!" msgstr "A mensagem foi enviada com sucesso!" -#: bulletin/views.py:1032 +#: bulletin/views.py:1033 msgid "No user selected!" msgstr "Nenhum usuário selecionado!" diff --git a/categories/locale/pt_BR/LC_MESSAGES/django.po b/categories/locale/pt_BR/LC_MESSAGES/django.po index fb7790f..58ac296 100644 --- a/categories/locale/pt_BR/LC_MESSAGES/django.po +++ b/categories/locale/pt_BR/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-10 02:55-0300\n" +"POT-Creation-Date: 2017-09-13 23:29-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/chat/locale/pt_BR/LC_MESSAGES/django.po b/chat/locale/pt_BR/LC_MESSAGES/django.po index c4e5279..8d11a0f 100644 --- a/chat/locale/pt_BR/LC_MESSAGES/django.po +++ b/chat/locale/pt_BR/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-10 02:55-0300\n" +"POT-Creation-Date: 2017-09-13 23:29-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/dashboards/locale/pt_BR/LC_MESSAGES/django.po b/dashboards/locale/pt_BR/LC_MESSAGES/django.po index 018bf72..c7b75db 100644 --- a/dashboards/locale/pt_BR/LC_MESSAGES/django.po +++ b/dashboards/locale/pt_BR/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-10 02:55-0300\n" +"POT-Creation-Date: 2017-09-13 23:29-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/file_link/locale/pt_BR/LC_MESSAGES/django.po b/file_link/locale/pt_BR/LC_MESSAGES/django.po index 4712cf7..81c2a1a 100644 --- a/file_link/locale/pt_BR/LC_MESSAGES/django.po +++ b/file_link/locale/pt_BR/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-10 02:55-0300\n" +"POT-Creation-Date: 2017-09-13 23:29-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -206,12 +206,12 @@ msgstr "" msgid "Update File Link" msgstr "Atualizar Link para Arquivo" -#: file_link/views.py:321 +#: file_link/views.py:322 #, python-format msgid "The File Link \"%s\" was updated successfully!" msgstr "O Link para Arquivo \"%s\" foi atualizado com sucesso!" -#: file_link/views.py:348 +#: file_link/views.py:349 #, python-format msgid "" "The File Link \"%s\" was removed successfully from virtual environment \"%s" @@ -220,52 +220,52 @@ msgstr "" "O Link para Arquivo \"%s\" foi removido do ambiente virtual \"%s\" com " "sucesso!" -#: file_link/views.py:407 +#: file_link/views.py:408 msgid "File Link Reports" msgstr "Relatŕios de Link para Arquivo" -#: file_link/views.py:426 +#: file_link/views.py:427 msgid "Realized" msgstr "Realizada" -#: file_link/views.py:426 +#: file_link/views.py:427 msgid "Unrealized" msgstr "Não Realizada" -#: file_link/views.py:426 +#: file_link/views.py:427 msgid "Historic" msgstr "Histórico" -#: file_link/views.py:441 file_link/views.py:449 +#: file_link/views.py:442 file_link/views.py:450 msgid "View" msgstr "Visualizar" -#: file_link/views.py:450 +#: file_link/views.py:451 msgid "File link" msgstr "Link para Arquivo" -#: file_link/views.py:455 +#: file_link/views.py:456 msgid "Actions about resource" msgstr "Ações sobre o recurso" -#: file_link/views.py:456 +#: file_link/views.py:457 msgid "Quantity" msgstr "Quantidade" -#: file_link/views.py:503 +#: file_link/views.py:504 msgid "[Photo]" msgstr "[Imagem]" -#: file_link/views.py:515 +#: file_link/views.py:516 #, python-format msgid "Last message in %s" msgstr "Última mensagem em %s" -#: file_link/views.py:524 +#: file_link/views.py:525 msgid "The message was successfull sent!" msgstr "A mensagem foi enviada com sucesso!" -#: file_link/views.py:526 +#: file_link/views.py:527 msgid "No user selected!" msgstr "Nenhum usuário selecionado!" diff --git a/goals/locale/pt_BR/LC_MESSAGES/django.po b/goals/locale/pt_BR/LC_MESSAGES/django.po index 284a01f..d5d5c42 100644 --- a/goals/locale/pt_BR/LC_MESSAGES/django.po +++ b/goals/locale/pt_BR/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-10 02:55-0300\n" +"POT-Creation-Date: 2017-09-13 23:29-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/links/locale/pt_BR/LC_MESSAGES/django.po b/links/locale/pt_BR/LC_MESSAGES/django.po index fa424c1..20d68ca 100644 --- a/links/locale/pt_BR/LC_MESSAGES/django.po +++ b/links/locale/pt_BR/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-10 02:55-0300\n" +"POT-Creation-Date: 2017-09-13 23:29-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,30 +18,34 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: links/forms.py:31 +#: links/forms.py:33 msgid "Tags" msgstr "Tags" -#: links/forms.py:32 +#: links/forms.py:34 msgid "Website URL" msgstr "URL do site:" -#: links/forms.py:38 +#: links/forms.py:40 msgid "Link name" msgstr "Nome do Link" -#: links/forms.py:39 +#: links/forms.py:41 msgid "End View" msgstr "" -#: links/forms.py:40 +#: links/forms.py:42 msgid "End View Date" msgstr "Data final para visualizar" -#: links/forms.py:68 +#: links/forms.py:62 msgid "There is already a link with this name on this subject" msgstr "Ja existe um link com este nome neste Assunto" +#: links/forms.py:74 +msgid "Invalid URL. It should be an valid link." +msgstr "" + #: links/models.py:13 msgid "Link_URL" msgstr "URL do link" @@ -50,31 +54,31 @@ msgstr "URL do link" msgid "Are you sure you want delete the Website link" msgstr "Tem certeza que voce deseja remover esse Link para Website" -#: links/templates/links/_form.html:112 +#: links/templates/links/_form.html:99 msgid "Pendencies Notifications" msgstr "Notificações de pendências" -#: links/templates/links/_form.html:130 +#: links/templates/links/_form.html:117 msgid "Action not performed by the user" msgstr "Ação não realizada pelo usuário" -#: links/templates/links/_form.html:156 +#: links/templates/links/_form.html:143 msgid "Wished period" msgstr "Período desejado" -#: links/templates/links/_form.html:222 +#: links/templates/links/_form.html:209 msgid "Students" msgstr "" -#: links/templates/links/_form.html:252 +#: links/templates/links/_form.html:239 msgid "Attribute students to file link" msgstr "Atribuir estudantes para o link de arquivo" -#: links/templates/links/_form.html:272 +#: links/templates/links/_form.html:259 msgid "Attribute groups to file link" msgstr "Atribuir grupos para o link de arquivo" -#: links/templates/links/_form.html:320 +#: links/templates/links/_form.html:307 msgid "Save" msgstr "Salvar" @@ -189,56 +193,56 @@ msgstr "" msgid "Update Website Link" msgstr "Atualizar Link do website" -#: links/views.py:341 +#: links/views.py:342 #, python-format msgid "The Website Link \"%s\" was updated successfully!" msgstr "O link do website \"%s\" foi atualizado com sucesso! " -#: links/views.py:385 +#: links/views.py:386 msgid "Links Reports" msgstr "Relatórios de links" -#: links/views.py:404 +#: links/views.py:405 msgid "Realized" msgstr "Realizada" -#: links/views.py:404 +#: links/views.py:405 msgid "Unrealized" msgstr "Não Realizada" -#: links/views.py:404 +#: links/views.py:405 msgid "Historic" msgstr "Histórico" -#: links/views.py:419 links/views.py:427 +#: links/views.py:420 links/views.py:428 msgid "View" msgstr "Visualizar" -#: links/views.py:428 +#: links/views.py:429 msgid "Links" msgstr "Links" -#: links/views.py:433 +#: links/views.py:434 msgid "Actions about resource" msgstr "Ações sobre o recurso" -#: links/views.py:434 +#: links/views.py:435 msgid "Quantity" msgstr "Quantidade" -#: links/views.py:481 +#: links/views.py:482 msgid "[Photo]" msgstr "[Imagem]" -#: links/views.py:493 +#: links/views.py:494 #, python-format msgid "Last message in %s" msgstr "Última mensagem em %s" -#: links/views.py:502 +#: links/views.py:503 msgid "The message was successfull sent!" msgstr "A mensagem foi enviada com sucesso!" -#: links/views.py:504 +#: links/views.py:505 msgid "No user selected!" msgstr "Nenhum usuário selecionado!" diff --git a/log/locale/pt_BR/LC_MESSAGES/django.po b/log/locale/pt_BR/LC_MESSAGES/django.po index 9c2a9ca..239e93c 100644 --- a/log/locale/pt_BR/LC_MESSAGES/django.po +++ b/log/locale/pt_BR/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-10 02:55-0300\n" +"POT-Creation-Date: 2017-09-13 23:29-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/mailsender/locale/pt_BR/LC_MESSAGES/django.po b/mailsender/locale/pt_BR/LC_MESSAGES/django.po index 55c1dfd..3757479 100644 --- a/mailsender/locale/pt_BR/LC_MESSAGES/django.po +++ b/mailsender/locale/pt_BR/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-10 02:55-0300\n" +"POT-Creation-Date: 2017-09-13 23:29-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/mural/locale/pt_BR/LC_MESSAGES/django.po b/mural/locale/pt_BR/LC_MESSAGES/django.po index 67e05f0..53231f4 100644 --- a/mural/locale/pt_BR/LC_MESSAGES/django.po +++ b/mural/locale/pt_BR/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-10 02:55-0300\n" +"POT-Creation-Date: 2017-09-13 23:29-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/news/locale/pt_BR/LC_MESSAGES/django.po b/news/locale/pt_BR/LC_MESSAGES/django.po index a2d0412..f8181ac 100644 --- a/news/locale/pt_BR/LC_MESSAGES/django.po +++ b/news/locale/pt_BR/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-10 02:55-0300\n" +"POT-Creation-Date: 2017-09-13 23:29-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/notifications/locale/pt_BR/LC_MESSAGES/django.po b/notifications/locale/pt_BR/LC_MESSAGES/django.po index db5cd62..c98c86e 100644 --- a/notifications/locale/pt_BR/LC_MESSAGES/django.po +++ b/notifications/locale/pt_BR/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-10 02:55-0300\n" +"POT-Creation-Date: 2017-09-13 23:29-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/pdf_file/locale/pt_BR/LC_MESSAGES/django.po b/pdf_file/locale/pt_BR/LC_MESSAGES/django.po index f81cd3f..04313f3 100644 --- a/pdf_file/locale/pt_BR/LC_MESSAGES/django.po +++ b/pdf_file/locale/pt_BR/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-10 02:55-0300\n" +"POT-Creation-Date: 2017-09-13 23:29-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -202,63 +202,63 @@ msgstr "" msgid "Update PDF File" msgstr "Atualize arquivo PDF" -#: pdf_file/views.py:328 +#: pdf_file/views.py:329 #, python-format msgid "The PDF File \"%s\" was updated successfully!" msgstr "O arquivo PDF \"%s\" foi atualizado com sucesso!" -#: pdf_file/views.py:355 +#: pdf_file/views.py:356 #, python-format msgid "" "The PDF File \"%s\" was removed successfully from virtual environment \"%s\"!" msgstr "" "O arquivo PDF \"%s\" foi removido com sucesso do ambiente virtual \"%s\" " -#: pdf_file/views.py:413 +#: pdf_file/views.py:414 msgid "PDF File Reports" msgstr "Relatórios do arquivo de PDF" -#: pdf_file/views.py:433 +#: pdf_file/views.py:434 msgid "Realized" msgstr "Realizada" -#: pdf_file/views.py:433 +#: pdf_file/views.py:434 msgid "Unrealized" msgstr "Não Realizada" -#: pdf_file/views.py:433 +#: pdf_file/views.py:434 msgid "Historic" msgstr "Histórico" -#: pdf_file/views.py:449 pdf_file/views.py:457 +#: pdf_file/views.py:450 pdf_file/views.py:458 msgid "View" msgstr "Visualizar" -#: pdf_file/views.py:458 +#: pdf_file/views.py:459 msgid "PDF File" msgstr "Criar o arquivo PDF" -#: pdf_file/views.py:463 +#: pdf_file/views.py:464 msgid "Actions about resource" msgstr "Ações sobre o recurso" -#: pdf_file/views.py:464 +#: pdf_file/views.py:465 msgid "Quantity" msgstr "Quantidade" -#: pdf_file/views.py:511 +#: pdf_file/views.py:512 msgid "[Photo]" msgstr "[Imagem]" -#: pdf_file/views.py:523 +#: pdf_file/views.py:524 #, python-format msgid "Last message in %s" msgstr "Última mensagem em %s" -#: pdf_file/views.py:532 +#: pdf_file/views.py:533 msgid "The message was successfull sent!" msgstr "A mensagem foi enviada com sucesso!" -#: pdf_file/views.py:534 +#: pdf_file/views.py:535 msgid "No user selected!" msgstr "Nenhum usuário selecionado!" diff --git a/pendencies/locale/pt_BR/LC_MESSAGES/django.po b/pendencies/locale/pt_BR/LC_MESSAGES/django.po index 31f8309..91ffee6 100644 --- a/pendencies/locale/pt_BR/LC_MESSAGES/django.po +++ b/pendencies/locale/pt_BR/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-10 02:55-0300\n" +"POT-Creation-Date: 2017-09-13 23:29-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/reports/locale/pt_BR/LC_MESSAGES/django.po b/reports/locale/pt_BR/LC_MESSAGES/django.po index 3a13f1f..8ffc629 100644 --- a/reports/locale/pt_BR/LC_MESSAGES/django.po +++ b/reports/locale/pt_BR/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-10 02:55-0300\n" +"POT-Creation-Date: 2017-09-13 23:29-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/security/locale/pt_BR/LC_MESSAGES/django.po b/security/locale/pt_BR/LC_MESSAGES/django.po index a5b6765..92ac213 100644 --- a/security/locale/pt_BR/LC_MESSAGES/django.po +++ b/security/locale/pt_BR/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-10 02:55-0300\n" +"POT-Creation-Date: 2017-09-13 23:29-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/students_group/locale/pt_BR/LC_MESSAGES/django.po b/students_group/locale/pt_BR/LC_MESSAGES/django.po index a995978..832fb3d 100644 --- a/students_group/locale/pt_BR/LC_MESSAGES/django.po +++ b/students_group/locale/pt_BR/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-10 02:55-0300\n" +"POT-Creation-Date: 2017-09-13 23:29-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/subjects/locale/pt_BR/LC_MESSAGES/django.po b/subjects/locale/pt_BR/LC_MESSAGES/django.po index c4c9b3f..e9a38ef 100644 --- a/subjects/locale/pt_BR/LC_MESSAGES/django.po +++ b/subjects/locale/pt_BR/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-10 02:55-0300\n" +"POT-Creation-Date: 2017-09-13 23:29-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -248,12 +248,12 @@ msgid " Any subjects or Resources were not found on the search for " msgstr " Nenhum assunto ou recursos foram encontrados na busca por " #: subjects/templates/subjects/list_search.html:48 -#: subjects/templates/subjects/list_search.html:51 subjects/views.py:676 +#: subjects/templates/subjects/list_search.html:51 subjects/views.py:677 msgid "Subjects" msgstr "Assuntos" #: subjects/templates/subjects/list_search.html:49 -#: subjects/templates/subjects/list_search.html:52 subjects/views.py:683 +#: subjects/templates/subjects/list_search.html:52 subjects/views.py:684 msgid "Resources" msgstr "Recursos" @@ -407,17 +407,17 @@ msgstr "Assunto \"%s\" foi registrado na categoria \"%s\" com sucesso!" msgid "Update Subject" msgstr "Atualizar Assunto" -#: subjects/views.py:430 +#: subjects/views.py:431 #, python-format msgid "The Subject \"%s\" was updated on \"%s\" Category successfully!" msgstr "Assunto \"%s\" foi atualizado na categoria \"%s\" com sucesso!" -#: subjects/views.py:471 subjects/views.py:515 +#: subjects/views.py:472 subjects/views.py:516 #, python-format msgid "Subject \"%s\" removed successfully!" msgstr "Assunto \"%s\" removido com sucesso!" -#: subjects/views.py:479 subjects/views.py:483 +#: subjects/views.py:480 subjects/views.py:484 msgid "" "Subject can't be removed. The subject still possess students and learning " "objects associated" @@ -425,24 +425,24 @@ msgstr "" "Assunto não pode ser removido. Ele ainda possui alunos e objetos de " "aprendizado associados" -#: subjects/views.py:602 +#: subjects/views.py:603 msgid "Subscription date is due!" msgstr "O período de inscrição está encerrado!" -#: subjects/views.py:615 +#: subjects/views.py:616 msgid "Subscription was successfull!" msgstr "Inscrição feita com sucesso!" -#: subjects/views.py:748 +#: subjects/views.py:749 #, python-format msgid "%s - Backup" msgstr "%s - Backup" -#: subjects/views.py:907 +#: subjects/views.py:908 #, python-format msgid "%s - Restore" msgstr "%s - Restaurar" -#: subjects/views.py:981 +#: subjects/views.py:982 msgid "Backup restored successfully!" msgstr "Backup restaurado com sucesso!" diff --git a/themes/locale/pt_BR/LC_MESSAGES/django.po b/themes/locale/pt_BR/LC_MESSAGES/django.po index f80d9c8..a1a2ba4 100644 --- a/themes/locale/pt_BR/LC_MESSAGES/django.po +++ b/themes/locale/pt_BR/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-10 02:55-0300\n" +"POT-Creation-Date: 2017-09-13 23:29-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/topics/locale/pt_BR/LC_MESSAGES/django.po b/topics/locale/pt_BR/LC_MESSAGES/django.po index 58c02cc..dd2cb05 100644 --- a/topics/locale/pt_BR/LC_MESSAGES/django.po +++ b/topics/locale/pt_BR/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-10 02:55-0300\n" +"POT-Creation-Date: 2017-09-13 23:29-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/users/locale/pt_BR/LC_MESSAGES/django.po b/users/locale/pt_BR/LC_MESSAGES/django.po index a9c43f2..18821d5 100644 --- a/users/locale/pt_BR/LC_MESSAGES/django.po +++ b/users/locale/pt_BR/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-10 02:55-0300\n" +"POT-Creation-Date: 2017-09-13 23:29-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/webconference/forms.py b/webconference/forms.py index 0f28611..c597430 100644 --- a/webconference/forms.py +++ b/webconference/forms.py @@ -10,7 +10,7 @@ from subjects.forms import ParticipantsMultipleChoiceField from .models import Webconference, ConferenceSettings -from pendencies.forms import PendenciesForm +from pendencies.forms import PendenciesLimitedForm from pendencies.models import Pendencies class WebconferenceForm(forms.ModelForm): @@ -48,9 +48,14 @@ class WebconferenceForm(forms.ModelForm): 'groups': forms.SelectMultiple, } - def clean_name(self): - name = self.cleaned_data.get('name', '') + def clean(self): + cleaned_data = super(WebconferenceForm, self).clean() + + start = cleaned_data.get('start', None) + end = cleaned_data.get('end', None) + name = self.cleaned_data.get('name', '') + topics = self.subject.topic_subject.all() for topic in topics: @@ -60,30 +65,35 @@ class WebconferenceForm(forms.ModelForm): same_name = topic.resource_topic.filter(name__unaccent__iexact = name).count() if same_name > 0: - self._errors['name'] = [_('This subject already has a web conference with this name')] + self.add_error('name', _('This subject already has a web conference with this name')) - return ValueError + if start and end: + if not start == ValueError and not end == ValueError: + if start > end: + self.add_error('start', _('This input should be filled with a date equal or before the End.')) + self.add_error('end', _('This input should be filled with a date equal or after the Start.')) - return name + if not start == ValueError: + if not self.instance.id and start.date() < datetime.datetime.today().date(): + self.add_error('start', _("This input should be filled with a date equal or after today's date.")) + if start.date() < self.subject.init_date: + self.add_error('start', _('This input should be filled with a date equal or after the subject begin date.("%s")')%(self.subject.init_date)) - def clean_start(self): - start = self.cleaned_data['start'] - if start.date() < datetime.datetime.now().date(): - self._errors['start'] = [_('This date must be today or after')] - return ValueError + if start.date() > self.subject.end_date: + self.add_error('start', _('This input should be filled with a date equal or before the subject end date.("%s")')%(self.subject.end_date)) - return start + if not end == ValueError: + if not self.instance.id and end.date() < datetime.datetime.today().date(): + self.add_error('end', _("This input should be filled with a date equal or after today's date.")) - def clean_end(self): - end = self.cleaned_data['end'] - start = self.cleaned_data['start'] + if end.date() < self.subject.init_date: + self.add_error('end', _('This input should be filled with a date equal or after the subject begin date.("%s")')%(self.subject.init_date)) - if start is ValueError or end < start: - self._errors['end'] = [_('This date must be equal start date/hour or after')] - return ValueError + if end.date() > self.subject.end_date: + self.add_error('end', _('This input should be filled with a date equal or before the subject end date.("%s")')%(self.subject.end_date)) - return end + return cleaned_data def save(self, commit = True): super(WebconferenceForm, self).save(commit = True) @@ -134,4 +144,4 @@ class SettingsForm(forms.ModelForm): 'domain': _('The domain of the jitsi server, e.g. meet.jit.si'), } -InlinePendenciesFormset = inlineformset_factory(Webconference, Pendencies, form = PendenciesForm, extra = 1, max_num = 3, validate_max = True, can_delete = True) +InlinePendenciesFormset = inlineformset_factory(Webconference, Pendencies, form = PendenciesLimitedForm, extra = 1, max_num = 3, validate_max = True, can_delete = True) diff --git a/webconference/locale/pt_BR/LC_MESSAGES/django.po b/webconference/locale/pt_BR/LC_MESSAGES/django.po index 798e9ff..fe89b9f 100644 --- a/webconference/locale/pt_BR/LC_MESSAGES/django.po +++ b/webconference/locale/pt_BR/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-10 02:55-0300\n" +"POT-Creation-Date: 2017-09-13 23:29-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -30,23 +30,41 @@ msgstr "Titulo da Web Conferência" msgid "Presentation" msgstr "Apresentação" -#: webconference/forms.py:63 +#: webconference/forms.py:68 msgid "This subject already has a web conference with this name" msgstr "Este assunto já tem uma web conferência com este nome" #: webconference/forms.py:73 -msgid "This date must be today or after" -msgstr "Esta data deve ser hoje ou depois" +msgid "This input should be filled with a date equal or before the End." +msgstr "Esse campo deve ser preenchido com uma data igual ou anterior à Final." -#: webconference/forms.py:83 -msgid "This date must be equal start date/hour or after" -msgstr "Esta data deve ser igual ou posterior a data/hora de inicio" +#: webconference/forms.py:74 +msgid "This input should be filled with a date equal or after the Start." +msgstr "Esse campo deve ser preenchido com uma data igual ou anterior à de Início." -#: webconference/forms.py:130 webconference/models.py:35 +#: webconference/forms.py:78 webconference/forms.py:88 +msgid "This input should be filled with a date equal or after today's date." +msgstr "" + +#: webconference/forms.py:81 webconference/forms.py:91 +#, python-format +msgid "" +"This input should be filled with a date equal or after the subject begin " +"date.(\"%s\")" +msgstr "" + +#: webconference/forms.py:84 webconference/forms.py:94 +#, python-format +msgid "" +"This input should be filled with a date equal or before the subject end date." +"(\"%s\")" +msgstr "" + +#: webconference/forms.py:140 webconference/models.py:35 msgid "Domain" msgstr "Dominio" -#: webconference/forms.py:134 +#: webconference/forms.py:144 msgid "The domain of the jitsi server, e.g. meet.jit.si" msgstr "O dominio do servidor do jitsi, ex: meet.jit.si" @@ -97,28 +115,28 @@ msgstr "Ação não executada pelo usuário" msgid "Wished period" msgstr "Período desejado" -#: webconference/templates/webconference/_form.html:253 +#: webconference/templates/webconference/_form.html:279 msgid "Students" msgstr "" -#: webconference/templates/webconference/_form.html:283 +#: webconference/templates/webconference/_form.html:309 msgid "Attribute students to Web Conference" msgstr "Atribuir alunos à web conferência" -#: webconference/templates/webconference/_form.html:303 +#: webconference/templates/webconference/_form.html:329 msgid "Attribute groups to Web Conference" msgstr "Atribuir grupos à web conferência" -#: webconference/templates/webconference/_form.html:372 +#: webconference/templates/webconference/_form.html:398 #: webconference/templates/webconference/config.html:42 msgid "Save" msgstr "Salvar" -#: webconference/templates/webconference/_form.html:379 +#: webconference/templates/webconference/_form.html:405 msgid "Add new notification" msgstr "Notificações Pendentes" -#: webconference/templates/webconference/_form.html:380 +#: webconference/templates/webconference/_form.html:406 msgid "Remove this" msgstr "Remover isto" @@ -127,7 +145,7 @@ msgid "Settings: Conference" msgstr "Configurações: Web Conferência" #: webconference/templates/webconference/create.html:21 -#: webconference/views.py:340 +#: webconference/views.py:342 msgid "Create Web Conference" msgstr "Criar Web Conferência" @@ -206,25 +224,25 @@ msgstr "Editar: " #: webconference/templates/webconference/view.html:68 #: webconference/templates/webconference/window_view.html:43 -#: webconference/views.py:260 webconference/views.py:273 -#: webconference/views.py:294 webconference/views.py:395 -#: webconference/views.py:408 webconference/views.py:417 -#: webconference/views.py:620 +#: webconference/views.py:262 webconference/views.py:275 +#: webconference/views.py:296 webconference/views.py:397 +#: webconference/views.py:410 webconference/views.py:419 +#: webconference/views.py:623 msgid "Participate" msgstr "Participar" -#: webconference/views.py:61 webconference/views.py:106 +#: webconference/views.py:60 webconference/views.py:105 #, python-format msgid "%s - Web Conference" msgstr "%s - Web Conferência" -#: webconference/views.py:260 webconference/views.py:273 -#: webconference/views.py:294 webconference/views.py:395 -#: webconference/views.py:408 webconference/views.py:417 +#: webconference/views.py:262 webconference/views.py:275 +#: webconference/views.py:296 webconference/views.py:397 +#: webconference/views.py:410 webconference/views.py:419 msgid "Visualize" msgstr "Visualizar" -#: webconference/views.py:351 +#: webconference/views.py:353 #, python-format msgid "" "The Web conference \"%s\" was added to the Topic \"%s\" of the virtual " @@ -233,16 +251,16 @@ msgstr "" "A web conferência '%s' foi adicionada ao tópico '%s' do ambiente virtual " "'%s' com sucesso!" -#: webconference/views.py:458 +#: webconference/views.py:460 msgid "Update Web Conference" msgstr "Atualizar a web conferência" -#: webconference/views.py:469 +#: webconference/views.py:472 #, python-format msgid "The Web conference \"%s\" was updated successfully!" msgstr "A web conferência '%s' foi atualizada com sucesso!" -#: webconference/views.py:505 +#: webconference/views.py:508 #, python-format msgid "" "The web conference \"%s\" was removed successfully from virtual environment " @@ -250,81 +268,63 @@ msgid "" msgstr "" "A web conferência '%s' foi removida com sucesso do ambiente virtual '%s'!" -#: webconference/views.py:539 +#: webconference/views.py:542 msgid "Conference settings updated successfully!" msgstr "Configurações de segurança atualizadas com sucesso!" -#: webconference/views.py:546 +#: webconference/views.py:549 msgid "Web Conference Settings" msgstr "Configurações da Web Conferência" -#: webconference/views.py:589 +#: webconference/views.py:592 msgid "Youtube Video Reports" msgstr "Relatórios do Video do Youtube" -#: webconference/views.py:608 +#: webconference/views.py:611 msgid "Realized" msgstr "Realizada" -#: webconference/views.py:608 +#: webconference/views.py:611 msgid "Unrealized" msgstr "Não Realizada" -#: webconference/views.py:608 +#: webconference/views.py:611 msgid "Historic" msgstr "Histórico" -#: webconference/views.py:620 +#: webconference/views.py:623 msgid "View" msgstr "Visualizar" -#: webconference/views.py:620 +#: webconference/views.py:623 msgid "Enter" msgstr "Entrar" -#: webconference/views.py:646 +#: webconference/views.py:649 msgid "Webconference" msgstr "Web Conferência" -#: webconference/views.py:659 +#: webconference/views.py:662 msgid "Actions about resource" msgstr "Ações sobre o recurso" -#: webconference/views.py:660 +#: webconference/views.py:663 msgid "Quantity" msgstr "Quantidade" -#: webconference/views.py:707 +#: webconference/views.py:710 msgid "[Photo]" msgstr "[Foto]" -#: webconference/views.py:719 +#: webconference/views.py:722 #, python-format msgid "Last message in %s" msgstr "Última mensagem em %s" -#: webconference/views.py:728 +#: webconference/views.py:731 msgid "The message was successfull sent!" msgstr "A mensagem foi enviada com sucesso!" -#: webconference/views.py:730 +#: webconference/views.py:733 msgid "No user selected!" -msgstr "Nenhum usuário selecionado!" - -#~ msgid "Conference Settings" -#~ msgstr "Configurações da web conferência" - -#~ msgid "Don't allow users to self-register" -#~ msgstr "Não permitir que usuários se auto-cadastrem" - -#~ msgid "Put system in maintenance mode" -#~ msgstr "Colocar sistema em modo de manutenção" - -#~ msgid "Security configuration" -#~ msgstr "Configuração de Securação" - -#~ msgid "Security configurations" -#~ msgstr "Configurações de Segurança" - -#~ msgid "Security" -#~ msgstr "Segurança" +msgstr "Nenhum usuário selecionado!" \ No newline at end of file diff --git a/webconference/templates/webconference/_form.html b/webconference/templates/webconference/_form.html index df0a648..8be3e10 100644 --- a/webconference/templates/webconference/_form.html +++ b/webconference/templates/webconference/_form.html @@ -238,6 +238,32 @@ {% endif %} +
+
+ +
+
+ {% render_field notify.limit_date class='form-control datetime-picker limit_date_input' %} +
+
+
+ {{ notify.limit_date.help_text }} + + {% if notify.limit_date.errors %} + + {% endif %} +
{% endfor %} @@ -395,6 +421,10 @@ var checkbox = $(this).parent().parent().find('.end_date'); $(checkbox).prop('checked', true); }); + $('.limit_date_input').on('click', function () { + var checkbox = $(this).parent().parent().find('.limit_date'); + $(checkbox).prop('checked', true); + }); var subject = $("#id_control_subject").val(); @@ -418,6 +448,13 @@ $(this).parent().parent().find('.end_date').prop('checked', false); } }); + $('.limit_date_input').each(function () { + if ($(this).val() != '') { + $(this).parent().parent().find('.limit_date').prop('checked', true); + } else { + $(this).parent().parent().find('.limit_date').prop('checked', false); + } + }); var subject = $("#id_control_subject").val(); diff --git a/webconference/views.py b/webconference/views.py index 4f839f7..2aa4392 100644 --- a/webconference/views.py +++ b/webconference/views.py @@ -28,7 +28,6 @@ from log.decorators import log_decorator from topics.models import Topic -from pendencies.forms import PendenciesForm from braces import views as braces_mixins from .forms import WebconferenceForm, SettingsForm, InlinePendenciesFormset, WebConferenceUpdateForm @@ -261,7 +260,7 @@ class CreateView(LoginRequiredMixin, LogMixin, generic.edit.CreateView): slug = self.kwargs.get('slug', '') topic = get_object_or_404(Topic, slug = slug) pendencies_form = InlinePendenciesFormset(initial = [{'subject': topic.subject.id, 'actions': [("", "-------"),("view", _("Visualize")), ("participate", _("Participate"))]}]) - print (pendencies_form) + return self.render_to_response(self.get_context_data(form = form, pendencies_form = pendencies_form)) def post(self, request, *args, **kwargs): diff --git a/webpage/locale/pt_BR/LC_MESSAGES/django.po b/webpage/locale/pt_BR/LC_MESSAGES/django.po index 4fa9a74..50202c0 100644 --- a/webpage/locale/pt_BR/LC_MESSAGES/django.po +++ b/webpage/locale/pt_BR/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-10 02:55-0300\n" +"POT-Creation-Date: 2017-09-13 23:29-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -188,64 +188,64 @@ msgstr "" msgid "Update Webpage" msgstr "Atualizar Página Web" -#: webpage/views.py:367 +#: webpage/views.py:368 #, python-format msgid "The Webpage \"%s\" was updated successfully!" msgstr "A Página Web \"%s\" foi atualizada com sucesso!" -#: webpage/views.py:403 +#: webpage/views.py:404 #, python-format msgid "" "The webpage \"%s\" was removed successfully from virtual environment \"%s\"!" msgstr "" "A Página Web \"%s\" foi removida do ambiente virtual \"%s\" com sucesso!" -#: webpage/views.py:462 +#: webpage/views.py:463 msgid "Webpage Reports" msgstr "Relatórios da Webpage" -#: webpage/views.py:481 +#: webpage/views.py:482 msgid "Realized" msgstr "Realizado" -#: webpage/views.py:481 +#: webpage/views.py:482 msgid "Unrealized" msgstr "Não Realizado" -#: webpage/views.py:481 +#: webpage/views.py:482 msgid "Historic" msgstr "Histórico" -#: webpage/views.py:496 webpage/views.py:504 +#: webpage/views.py:497 webpage/views.py:505 msgid "View" msgstr "Visualizar" -#: webpage/views.py:505 +#: webpage/views.py:506 msgid "Webpage" msgstr "Nome da Página Web" -#: webpage/views.py:510 +#: webpage/views.py:511 msgid "Actions about resource" msgstr "Ações sobre o recurso" -#: webpage/views.py:511 +#: webpage/views.py:512 msgid "Quantity" msgstr "Quantidade" -#: webpage/views.py:560 +#: webpage/views.py:561 msgid "[Photo]" msgstr "[Imagem]" -#: webpage/views.py:572 +#: webpage/views.py:573 #, python-format msgid "Last message in %s" msgstr "Última mensagem em %s" -#: webpage/views.py:581 +#: webpage/views.py:582 msgid "The message was successfull sent!" msgstr "A mensagem foi enviada com sucesso!" -#: webpage/views.py:583 +#: webpage/views.py:584 msgid "No user selected!" msgstr "Nenhum usuário selecionado!" diff --git a/youtube_video/locale/pt_BR/LC_MESSAGES/django.po b/youtube_video/locale/pt_BR/LC_MESSAGES/django.po index 823ca69..5bf370d 100644 --- a/youtube_video/locale/pt_BR/LC_MESSAGES/django.po +++ b/youtube_video/locale/pt_BR/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-10 02:55-0300\n" +"POT-Creation-Date: 2017-09-13 23:29-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -181,7 +181,7 @@ msgstr "Visualizar" #: youtube_video/views.py:164 youtube_video/views.py:177 #: youtube_video/views.py:196 youtube_video/views.py:299 #: youtube_video/views.py:312 youtube_video/views.py:321 -#: youtube_video/views.py:552 +#: youtube_video/views.py:553 msgid "Finish" msgstr "Finalizar" @@ -202,12 +202,12 @@ msgstr "" msgid "Update YouTube Video" msgstr "Atualizar Vídeo do YouTube" -#: youtube_video/views.py:373 +#: youtube_video/views.py:374 #, python-format msgid "The YouTube Video \"%s\" was updated successfully!" msgstr "O Vídeo do YouTube \"%s\" foi atualizado com sucesso!" -#: youtube_video/views.py:409 +#: youtube_video/views.py:410 #, python-format msgid "" "The YouTube Video \"%s\" was removed successfully from virtual environment " @@ -216,55 +216,55 @@ msgstr "" "O Vídeo do YouTube \"%s\" foi removido do ambiente virtual \"%s\" com " "sucesso!" -#: youtube_video/views.py:521 +#: youtube_video/views.py:522 msgid "Youtube Video Reports" msgstr "Relatórios de Vídeo do YouTube" -#: youtube_video/views.py:540 +#: youtube_video/views.py:541 msgid "Realized" msgstr "Realizada" -#: youtube_video/views.py:540 +#: youtube_video/views.py:541 msgid "Unrealized" msgstr "Não Realizada" -#: youtube_video/views.py:540 +#: youtube_video/views.py:541 msgid "Historic" msgstr "Histórico" -#: youtube_video/views.py:552 +#: youtube_video/views.py:553 msgid "View" msgstr "Visualizar" -#: youtube_video/views.py:552 +#: youtube_video/views.py:553 msgid "Watch" msgstr "Assistir" -#: youtube_video/views.py:578 +#: youtube_video/views.py:579 msgid "Youtube Video" msgstr "Vídeo do YouTube" -#: youtube_video/views.py:591 +#: youtube_video/views.py:592 msgid "Actions about resource" msgstr "Ações sobre o recurso" -#: youtube_video/views.py:592 +#: youtube_video/views.py:593 msgid "Quantity" msgstr "Quantidade" -#: youtube_video/views.py:639 +#: youtube_video/views.py:640 msgid "[Photo]" msgstr "[Imagem]" -#: youtube_video/views.py:651 +#: youtube_video/views.py:652 #, python-format msgid "Last message in %s" msgstr "Última mensagem em %s" -#: youtube_video/views.py:659 +#: youtube_video/views.py:660 msgid "The message was successfull sent!" msgstr "A mensagem foi enviada com sucesso!" -#: youtube_video/views.py:661 +#: youtube_video/views.py:662 msgid "No user selected!" msgstr "Nenhum usuário selecionado!" -- libgit2 0.21.2