Download as
Browse Code »

Commit 3b1703b5d15af3928ff34be6910d0ec9ce8badcf

Authored by Zambom
1 parent 06fa13d4
Exists in master and in 2 other branches amadeus_univasf, refactoring

Some pendencies adjusts

Showing 30 changed files with 284 additions and 155 deletions   Show diff stats
amadeus/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @3b1703b
... ... @@ -8,7 +8,7 @@ msgid ""
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-04-09 21:59-0300\n"
  11 +"POT-Creation-Date: 2017-04-11 19:17-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -18,107 +18,107 @@ msgstr &quot;&quot;
18 18 "Content-Transfer-Encoding: 8bit\n"
19 19 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
20 20  
21   -#: .\local_settings.py:107 .\settings.py:179
  21 +#: amadeus/settings.py:179
22 22 msgid "Portuguese"
23 23 msgstr ""
24 24  
25   -#: .\local_settings.py:108 .\settings.py:180
  25 +#: amadeus/settings.py:180
26 26 msgid "English"
27 27 msgstr ""
28 28  
29   -#: .\templates\base.html:93
  29 +#: amadeus/templates/base.html:93
30 30 msgid "Search for subjects and resources"
31 31 msgstr "Buscar por assuntos ou recursos"
32 32  
33   -#: .\templates\base.html:106 .\templates\base.html:111
  33 +#: amadeus/templates/base.html:106 amadeus/templates/base.html:111
34 34 msgid "Language Selector"
35 35 msgstr ""
36 36  
37   -#: .\templates\base.html:152
  37 +#: amadeus/templates/base.html:152
38 38 msgid "Profile"
39 39 msgstr "Perfil"
40 40  
41   -#: .\templates\base.html:153
  41 +#: amadeus/templates/base.html:153
42 42 msgid "Edit Profile"
43 43 msgstr "Editar Perfil"
44 44  
45   -#: .\templates\base.html:154
  45 +#: amadeus/templates/base.html:154
46 46 msgid "Change Password"
47 47 msgstr "Alterar Senha"
48 48  
49   -#: .\templates\base.html:155
  49 +#: amadeus/templates/base.html:155
50 50 msgid "Delete Account"
51 51 msgstr "Remover Conta"
52 52  
53   -#: .\templates\base.html:156
  53 +#: amadeus/templates/base.html:156
54 54 msgid "Logout"
55 55 msgstr "Sair"
56 56  
57   -#: .\templates\base.html:161
  57 +#: amadeus/templates/base.html:161
58 58 msgid "settings"
59 59 msgstr "configurações"
60 60  
61   -#: .\templates\base.html:164
  61 +#: amadeus/templates/base.html:164
62 62 msgid "Settings"
63 63 msgstr "Configurações"
64 64  
65   -#: .\templates\base.html:167
  65 +#: amadeus/templates/base.html:167
66 66 msgid "Manage Users"
67 67 msgstr "Gerenciar Usuários"
68 68  
69   -#: .\templates\base.html:168
  69 +#: amadeus/templates/base.html:168
70 70 msgid "Manage Categories"
71 71 msgstr "Gerenciar Categorias"
72 72  
73   -#: .\templates\base.html:169
  73 +#: amadeus/templates/base.html:169
74 74 msgid "Manage News"
75 75 msgstr "Gerenciar Notícias"
76 76  
77   -#: .\templates\base.html:176
  77 +#: amadeus/templates/base.html:176
78 78 msgid "System"
79 79 msgstr "Sistema"
80 80  
81   -#: .\templates\base.html:183
  81 +#: amadeus/templates/base.html:183
82 82 msgid "Mail Sender"
83 83 msgstr "Remetente de Email"
84 84  
85   -#: .\templates\base.html:184
  85 +#: amadeus/templates/base.html:184
86 86 msgid "Security"
87 87 msgstr "Segurança"
88 88  
89   -#: .\templates\base.html:185
  89 +#: amadeus/templates/base.html:185
90 90 msgid "Theme"
91 91 msgstr "Temas"
92 92  
93   -#: .\templates\base.html:186
  93 +#: amadeus/templates/base.html:186
94 94 #, fuzzy
95 95 #| msgid "Web Conference Settings"
96 96 msgid "Web Conference"
97 97 msgstr "Web conferência"
98 98  
99   -#: .\templates\base.html:206 .\templates\base.html:261
  99 +#: amadeus/templates/base.html:206 amadeus/templates/base.html:261
100 100 msgid "Subjects"
101 101 msgstr "Assuntos"
102 102  
103   -#: .\templates\base.html:211 .\templates\base.html:266
  103 +#: amadeus/templates/base.html:211 amadeus/templates/base.html:266
104 104 msgid "Mural"
105 105 msgstr ""
106 106  
107   -#: .\templates\base.html:217 .\templates\base.html:272
  107 +#: amadeus/templates/base.html:217 amadeus/templates/base.html:272
108 108 msgid "Messages"
109 109 msgstr "Mensagens"
110 110  
111   -#: .\templates\base.html:223 .\templates\base.html:278
  111 +#: amadeus/templates/base.html:223 amadeus/templates/base.html:278
112 112 #, fuzzy
113 113 #| msgid "Pendencias"
114 114 msgid "Pendencies"
115 115 msgstr "Pendências"
116 116  
117   -#: .\templates\base.html:231 .\templates\base.html:286
  117 +#: amadeus/templates/base.html:231 amadeus/templates/base.html:286
118 118 msgid "Analytics"
119 119 msgstr "Analytics"
120 120  
121   -#: .\templates\recover_pass_email_template.html:7
  121 +#: amadeus/templates/recover_pass_email_template.html:7
122 122 #, python-format
123 123 msgid ""
124 124 "You're receiving this email because you requested a password reset for your "
... ... @@ -127,11 +127,11 @@ msgstr &quot;&quot;
127 127 "Você está recebendo esse email porque você solicitou uma alteração de senha "
128 128 "para a sua conta em %(site_name)s."
129 129  
130   -#: .\templates\recover_pass_email_template.html:9
  130 +#: amadeus/templates/recover_pass_email_template.html:9
131 131 msgid "Please go to the following page and choose a new password:"
132 132 msgstr "Por favor vá até a seguinte página e escolha uma nova senha:"
133 133  
134   -#: .\templates\recover_pass_email_template.html:15
  134 +#: amadeus/templates/recover_pass_email_template.html:15
135 135 #, python-format
136 136 msgid "The %(site_name)s team"
137 137 msgstr "Time %(site_name)s"
... ...
amadeus/static/js/pendencies.js
  Diff comments   View file @3b1703b
... ... @@ -300,6 +300,8 @@ function searchHistory(panel_id) {
300 300  
301 301 var items = $("#history_table_" + panel_id).children(":visible").length;
302 302  
  303 + holder.jPages("destroy");
  304 +
303 305 if (items > 10) {
304 306 holder.jPages({
305 307 containerID : "history_table_" + panel_id,
... ... @@ -382,7 +384,10 @@ function metaFunctions() {
382 384 popover.popover('hide');
383 385 });
384 386  
385   - save.on("click", function () {
  387 + save.on("click", function (e) {
  388 + e.preventDefault();
  389 + e.stopImmediatePropagation();
  390 +
386 391 var meta = datetime.data('date'),
387 392 url = form.attr('action'),
388 393 method = form.attr('method'),
... ...
categories/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @3b1703b
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-04-06 22:17-0300\n"
  11 +"POT-Creation-Date: 2017-04-11 19:18-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ...
chat/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @3b1703b
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-04-06 22:17-0300\n"
  11 +"POT-Creation-Date: 2017-04-11 19:17-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -17,6 +17,7 @@ msgstr &quot;&quot;
17 17 "Content-Type: text/plain; charset=UTF-8\n"
18 18 "Content-Transfer-Encoding: 8bit\n"
19 19 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
  20 +
20 21 #: chat/forms.py:19
21 22 msgid "This field is required."
22 23 msgstr "Esse campo é obrigatório."
... ... @@ -29,7 +30,9 @@ msgstr &quot;A imagem é muito grande. Ela deve possuir 5MB ou menos.&quot;
29 30 msgid ""
30 31 "Select a valid file. The file must posses one of this extensions: .jpg, ."
31 32 "png, .gif"
32   -msgstr "Selecione um arquivo válido. O arquivo deve possuir uma das extensões a seguir: .jpg, .png, .gif"
  33 +msgstr ""
  34 +"Selecione um arquivo válido. O arquivo deve possuir uma das extensões a "
  35 +"seguir: .jpg, .png, .gif"
33 36  
34 37 #: chat/models.py:25
35 38 msgid "User One"
... ...
file_link/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @3b1703b
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-04-06 22:17-0300\n"
  11 +"POT-Creation-Date: 2017-04-11 19:18-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ...
goals/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @3b1703b
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-04-06 22:17-0300\n"
  11 +"POT-Creation-Date: 2017-04-11 19:17-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ...
links/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @3b1703b
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-04-06 22:17-0300\n"
  11 +"POT-Creation-Date: 2017-04-11 19:17-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ...
log/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @3b1703b
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-04-06 22:17-0300\n"
  11 +"POT-Creation-Date: 2017-04-11 19:18-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ...
mailsender/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @3b1703b
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-04-06 22:17-0300\n"
  11 +"POT-Creation-Date: 2017-04-11 19:17-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ...
mural/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @3b1703b
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-04-06 22:17-0300\n"
  11 +"POT-Creation-Date: 2017-04-11 19:17-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -150,48 +150,60 @@ msgstr &quot;Marcar Usuário&quot;
150 150 msgid "No results found."
151 151 msgstr "Nenhum resultado encontrado."
152 152  
153   -#: mural/templates/mural/_view.html:22
154   -#: mural/templates/mural/_view_comment.html:22
  153 +#: mural/templates/mural/_view.html:17
  154 +#: mural/templates/mural/_view_comment.html:18
  155 +#: mural/templates/mural/delete.html:16
  156 +msgid "Close"
  157 +msgstr "Fechar"
  158 +
  159 +#: mural/templates/mural/_view.html:30
  160 +#: mural/templates/mural/_view_comment.html:31
  161 +msgid "See Profile"
  162 +msgstr ""
  163 +
  164 +#: mural/templates/mural/_view.html:33
  165 +#: mural/templates/mural/_view_comment.html:34
  166 +msgid "Send Message"
  167 +msgstr ""
  168 +
  169 +#: mural/templates/mural/_view.html:52
  170 +#: mural/templates/mural/_view_comment.html:52
155 171 #: mural/templates/mural/list_category.html:59
156 172 #: mural/templates/mural/list_subject.html:58
157 173 #: mural/templates/mural/subject_view.html:39
158 174 msgid "Edit"
159 175 msgstr "Editar"
160 176  
161   -#: mural/templates/mural/_view.html:24
162   -#: mural/templates/mural/_view_comment.html:24
  177 +#: mural/templates/mural/_view.html:54
  178 +#: mural/templates/mural/_view_comment.html:54
163 179 #: mural/templates/mural/list_category.html:61
164 180 #: mural/templates/mural/list_subject.html:60
165 181 #: mural/templates/mural/subject_view.html:41
166 182 msgid "Remove"
167 183 msgstr "Remover"
168 184  
169   -#: mural/templates/mural/_view.html:36
170   -#: mural/templates/mural/_view_comment.html:31
  185 +#: mural/templates/mural/_view.html:66
  186 +#: mural/templates/mural/_view_comment.html:61
171 187 msgid "In"
172 188 msgstr "Em"
173 189  
174   -#: mural/templates/mural/_view.html:47
  190 +#: mural/templates/mural/_view.html:77
175 191 msgid "See complete post"
176 192 msgstr "Ver postagem completa"
177 193  
178   -#: mural/templates/mural/_view.html:50
  194 +#: mural/templates/mural/_view.html:80
179 195 msgid "See more comments..."
180 196 msgstr "Ver mais comentários..."
181 197  
182   -#: mural/templates/mural/_view.html:61
  198 +#: mural/templates/mural/_view.html:91
183 199 msgid "Make a comment..."
184 200 msgstr "Faça um comentário..."
185 201  
186   -#: mural/templates/mural/_view_comment.html:14
  202 +#: mural/templates/mural/_view_comment.html:44
187 203 msgctxt "view"
188 204 msgid "Comment"
189 205 msgstr "Comentou"
190 206  
191   -#: mural/templates/mural/delete.html:16
192   -msgid "Close"
193   -msgstr "Fechar"
194   -
195 207 #: mural/templates/mural/delete.html:17
196 208 msgid "Delete"
197 209 msgstr "Deletar"
... ... @@ -310,22 +322,34 @@ msgstr &quot;Grupos&quot;
310 322 msgid "Mural"
311 323 msgstr "Mural"
312 324  
313   -#: mural/templatetags/mural_filters.py:12
  325 +#: mural/templatetags/mural_filters.py:17
314 326 msgid "(Edited)"
315 327 msgstr "(Editado)"
316 328  
317   -#: mural/templatetags/mural_filters.py:30 mural/views.py:1226
  329 +#: mural/templatetags/mural_filters.py:35 mural/views.py:1226
318 330 msgid "Unfavorite"
319 331 msgstr "Desfavoritar"
320 332  
321   -#: mural/templatetags/mural_filters.py:32 mural/views.py:1230
  333 +#: mural/templatetags/mural_filters.py:37 mural/views.py:1230
322 334 msgid "Favorite"
323 335 msgstr "Favoritar"
324 336  
325   -#: mural/templatetags/mural_filters.py:106
  337 +#: mural/templatetags/mural_filters.py:111
326 338 msgid "about"
327 339 msgstr "sobre"
328 340  
  341 +#: mural/templatetags/mural_filters.py:136
  342 +msgid "Online"
  343 +msgstr ""
  344 +
  345 +#: mural/templatetags/mural_filters.py:138
  346 +msgid "Away"
  347 +msgstr ""
  348 +
  349 +#: mural/templatetags/mural_filters.py:140
  350 +msgid "Offline"
  351 +msgstr ""
  352 +
329 353 #: mural/views.py:154
330 354 #, python-format
331 355 msgid "%s has made a post in General"
... ...
news/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @3b1703b
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-04-09 13:24-0300\n"
  11 +"POT-Creation-Date: 2017-04-11 19:18-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -18,81 +18,106 @@ msgstr &quot;&quot;
18 18 "Content-Transfer-Encoding: 8bit\n"
19 19 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
20 20  
21   -#: .\forms.py:22
  21 +#: news/forms.py:22
22 22 msgid "This field is required"
23 23 msgstr "Este campo é obrigatório."
24 24  
25   -#: .\forms.py:33
  25 +#: news/forms.py:33
26 26 msgid "The image is too large. It should have less than 5MB."
27 27 msgstr "A imagem é muito grande. Ela deve ter menos que 5MB."
28 28  
29   -#: .\forms.py:36
  29 +#: news/forms.py:36
30 30 msgid "This field is required."
31 31 msgstr "Este campo é obrigatório."
32 32  
33   -#: .\models.py:15
  33 +#: news/models.py:15
34 34 msgid "File not supported."
35 35 msgstr "Arquivo não suportado"
36 36  
37   -#: .\models.py:18
  37 +#: news/models.py:18
38 38 msgid "Title"
39 39 msgstr "Título"
40 40  
41   -#: .\models.py:19
  41 +#: news/models.py:19
42 42 msgid "Slug"
43 43 msgstr ""
44 44  
45   -#: .\models.py:20
  45 +#: news/models.py:20
46 46 msgid "News Image"
47 47 msgstr "Imagem de apresentação da notícia"
48 48  
49   -#: .\models.py:21
  49 +#: news/models.py:21
50 50 msgid "News Content"
51 51 msgstr "Conteúdo da notícia"
52 52  
53   -#: .\models.py:22
  53 +#: news/models.py:22
54 54 msgid "Create Date"
55 55 msgstr "Data de criação"
56 56  
57   -#: .\models.py:23
  57 +#: news/models.py:23
58 58 msgid "Creator"
59 59 msgstr "Autor"
60 60  
61   -#: .\models.py:25 .\models.py:26
  61 +#: news/models.py:25 news/models.py:26
62 62 msgid "News"
63 63 msgstr "Notícia"
64 64  
65   -#: .\templates\news\_form.html:12
  65 +#: news/templates/news/_form.html:12
66 66 msgid "Choose your photo..."
67 67 msgstr "Escolha a foto"
68 68  
69   -#: .\templates\news\_form.html:59
  69 +#: news/templates/news/_form.html:59
70 70 msgid "Save"
71 71 msgstr "Salvar"
72 72  
73   -#: .\templates\news\_form.html:62
  73 +#: news/templates/news/_form.html:62
74 74 msgid "Cancel"
75 75 msgstr "Cancelar"
76 76  
77   -#: .\templates\news\create.html:7
  77 +#: news/templates/news/create.html:7
78 78 msgid "Register News"
79 79 msgstr "Cadastrar notícia"
80 80  
81   -#: .\templates\news\list.html:7
  81 +#: news/templates/news/list.html:7 news/views.py:47
82 82 msgid "Manage News"
83 83 msgstr "Gerenciar notícias"
84 84  
85   -#: .\templates\news\list.html:31
86   -msgid "Create news"
  85 +#: news/templates/news/list.html:34
  86 +msgid "Search..."
  87 +msgstr ""
  88 +
  89 +#: news/templates/news/list.html:45 news/views.py:74
  90 +msgid "Create News"
  91 +msgstr "Criar notícia"
  92 +
  93 +#: news/templates/news/list.html:59
  94 +msgid "Edit"
  95 +msgstr ""
  96 +
  97 +#: news/templates/news/list.html:60
  98 +msgid "Delete"
  99 +msgstr ""
  100 +
  101 +#: news/templates/news/list.html:71
  102 +msgid "No news found"
  103 +msgstr ""
  104 +
  105 +#: news/templates/news/update.html:7 news/views.py:92
  106 +#, fuzzy
  107 +#| msgid "Create News"
  108 +msgid "Update News"
87 109 msgstr "Criar notícia"
88 110  
89   -#: .\views.py:50
  111 +#: news/views.py:22
  112 +msgid "Visualize News"
  113 +msgstr ""
  114 +
  115 +#: news/views.py:68 news/views.py:86
90 116 msgid "News successfully created!"
91 117 msgstr "Notícia criada com sucesso"
92 118  
93   -#: .\views.py:55
94   -msgid "Create News"
95   -msgstr "Criar notícia"
  119 +#~ msgid "Create news"
  120 +#~ msgstr "Criar notícia"
96 121  
97 122 #~ msgid "There is already a news with this name"
98 123 #~ msgstr "Já existe uma notícia com esse nome"
... ...
notifications/cron.py
  Diff comments   View file @3b1703b
... ... @@ -3,6 +3,9 @@ from django_cron import CronJobBase, Schedule
3 3  
4 4 from .utils import set_notifications
5 5  
  6 +from log.models import Log
  7 +from users.models import User
  8 +
6 9 class Notify(CronJobBase):
7 10 RUN_EVERY_MINS = 1440 # every day
8 11  
... ... @@ -11,6 +14,22 @@ class Notify(CronJobBase):
11 14  
12 15 def do(self):
13 16 set_notifications()
  17 +
  18 + admins = User.objects.filter(is_staff = True)
  19 +
  20 + if admins.count() > 0:
  21 + admin = admins[0]
  22 +
  23 + log = Log(component = "notifications", action = "cron", resource = "notifications", user = str(admin), user_id = admin.id, user_email = admin.email, context = {})
  24 + log.save()
  25 +
14 26  
15 27 def notification_cron():
16   - set_notifications()
17 28 \ No newline at end of file
  29 + set_notifications()
  30 +
  31 + admins = User.objects.filter(is_staff = True)
  32 +
  33 + if admins.count() > 0:
  34 + admin = admins[0]
  35 +
  36 + Log.objects.create(component = "notifications", action = "cron", resource = "notifications", user = str(admin), user_id = admin.id, user_email = admin.email, context = {})
18 37 \ No newline at end of file
... ...
notifications/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @3b1703b
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-04-06 22:17-0300\n"
  11 +"POT-Creation-Date: 2017-04-11 19:18-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -127,62 +127,72 @@ msgstr &quot;Sua meta é realizar essa tarefa em&quot;
127 127 msgid "Task finished in"
128 128 msgstr "Tarefa finalizada em"
129 129  
130   -#: notifications/templates/notifications/_view.html:36
  130 +#: notifications/templates/notifications/_view.html:37
131 131 msgid "of the participants already realized this task."
132 132 msgstr "dos participantes já realizaram essa tarefa."
133 133  
134   -#: notifications/templates/notifications/_view.html:48
  134 +#: notifications/templates/notifications/_view.html:50
135 135 msgid "Access the task"
136 136 msgstr "Acessar a Tarefa"
137 137  
138   -#: notifications/templates/notifications/_view.html:50
  138 +#: notifications/templates/notifications/_view.html:52
139 139 msgid "Realize the task"
140 140 msgstr "Realizar a Tarefa"
141 141  
142   -#: notifications/templates/notifications/_view.html:55
  142 +#: notifications/templates/notifications/_view.html:57
143 143 msgid "or"
144 144 msgstr "ou"
145 145  
146   -#: notifications/templates/notifications/_view.html:58
  146 +#: notifications/templates/notifications/_view.html:60
147 147 msgid "Define goal to realization"
148 148 msgstr "Definir meta para realização"
149 149  
150   -#: notifications/templates/notifications/_view.html:60
  150 +#: notifications/templates/notifications/_view.html:62
151 151 msgid "Define new goal"
152 152 msgstr "Definir nova meta"
153 153  
154   -#: notifications/templates/notifications/_view.html:82
  154 +#: notifications/templates/notifications/_view.html:84
155 155 msgid "Save Goal"
156 156 msgstr "Salvar Meta"
157 157  
158   -#: notifications/templates/notifications/_view.html:85
  158 +#: notifications/templates/notifications/_view.html:87
159 159 msgid "Cancel"
160 160 msgstr "Cancelar"
161 161  
162   -#: notifications/templates/notifications/index.html:20
  162 +#: notifications/templates/notifications/index.html:19
  163 +#: notifications/templates/notifications/subject.html:13
  164 +msgid "This pendencies list is updated every 24 hours. Last update was in:"
  165 +msgstr "Esta lista de pendências é atualizada a cada 24 horas. A última atualização ocorreu em:"
  166 +
  167 +#: notifications/templates/notifications/index.html:19
  168 +#: notifications/templates/notifications/subject.html:13
  169 +msgid "Not determined"
  170 +msgstr "Não Determinado"
  171 +
  172 +#: notifications/templates/notifications/index.html:21
163 173 msgid "You got pendencies in the following subjects"
164 174 msgstr "Você possui pendências nos seguintes assuntos"
165 175  
166   -#: notifications/templates/notifications/index.html:38
167   -#: notifications/templates/notifications/subject.html:31
  176 +#: notifications/templates/notifications/index.html:39
  177 +#: notifications/templates/notifications/subject.html:32
168 178 msgid "Actual Pendencies"
169 179 msgstr "Pendências Atuais"
170 180  
171   -#: notifications/templates/notifications/index.html:39
172   -#: notifications/templates/notifications/subject.html:32
  181 +#: notifications/templates/notifications/index.html:40
  182 +#: notifications/templates/notifications/subject.html:33
173 183 msgid "Notifications History"
174 184 msgstr "Histórico de Notificações"
175 185  
176   -#: notifications/templates/notifications/index.html:69
  186 +#: notifications/templates/notifications/index.html:70
177 187 msgid "You do not posses any pendency."
178 188 msgstr "Você não possui nenhuma pendência."
179 189  
180   -#: notifications/templates/notifications/subject.html:23
181   -#: notifications/views.py:198
  190 +#: notifications/templates/notifications/subject.html:24
  191 +#: notifications/views.py:204
182 192 msgid "Pendencies"
183 193 msgstr "Pendências"
184 194  
185   -#: notifications/templates/notifications/subject.html:44
  195 +#: notifications/templates/notifications/subject.html:46
186 196 msgid "You do not posses any pendency in this subject"
187 197 msgstr "Você não possui nenhuma pendência nesse assunto"
188 198  
... ... @@ -210,37 +220,37 @@ msgstr &quot;Meta definida para realização da tarefa: %s&quot;
210 220 msgid "New goal defined to task realization: %s"
211 221 msgstr "Nova meta definida para realização da tarefa: %s"
212 222  
213   -#: notifications/views.py:69 notifications/views.py:148
  223 +#: notifications/views.py:69 notifications/views.py:154
214 224 #, python-format
215 225 msgid "%s - Pendencies"
216 226 msgstr "%s - Pendências"
217 227  
218   -#: notifications/views.py:282
  228 +#: notifications/views.py:294
219 229 msgid "No goal date received"
220 230 msgstr "Nenhuma data para meta recebida"
221 231  
222   -#: notifications/views.py:289
  232 +#: notifications/views.py:301
223 233 msgid "Could not identify the notification"
224 234 msgstr "Não foi possível identificar a notificação"
225 235  
226   -#: notifications/views.py:296
  236 +#: notifications/views.py:308
227 237 msgid "The goal date should be equal or after today's date"
228 238 msgstr ""
229 239 "A meta de realização da tarefa deve ser uma data igual ou posterior à data "
230 240 "atual"
231 241  
232   -#: notifications/views.py:299
  242 +#: notifications/views.py:311
233 243 msgid "The goal date should be equal or before subject's date"
234 244 msgstr ""
235 245 "A meta de realização da tarefa deve ser uma data igual ou anterior à data "
236 246 "final do assunto"
237 247  
238   -#: notifications/views.py:311
  248 +#: notifications/views.py:323
239 249 #, python-format
240 250 msgid "Your new goal to realize the task %s is %s"
241 251 msgstr "Sua nova meta para realizar a tarefa %s é %s"
242 252  
243   -#: notifications/views.py:313
  253 +#: notifications/views.py:325
244 254 #, python-format
245 255 msgid "Your goal to realize the task %s is %s"
246 256 msgstr "Sua meta para realizar a tarefa %s é %s"
... ...
notifications/templates/notifications/_view.html
  Diff comments   View file @3b1703b
... ... @@ -33,7 +33,9 @@
33 33 <p class="meta">{% trans 'Task finished in' %}: {{ notification.task.limit_date }}</p>
34 34 {% endif %}
35 35  
36   - <b>{{ notification|done_percent|floatformat:2 }}%</b> {% trans 'of the participants already realized this task.' %}
  36 + {% if notification|done_percent >= 30 %}
  37 + <b>{{ notification|done_percent|floatformat:2 }}%</b> {% trans 'of the participants already realized this task.' %}
  38 + {% endif %}
37 39 </div>
38 40 <div class="col-md-6">
39 41 <div class="alert {{ notification.level|warning_class }}">
... ...
notifications/templates/notifications/index.html
  Diff comments   View file @3b1703b
... ... @@ -16,6 +16,7 @@
16 16  
17 17 {% block content %}
18 18 <input type="hidden" id="pend_url" value="{% url 'notifications:manage' %}" />
  19 + <h5>{% trans 'This pendencies list is updated every 24 hours. Last update was in:' %} {{ last_update|default:_('Not determined') }}</h5>
19 20 {% if notifications.count > 0 %}
20 21 <p>{% trans 'You got pendencies in the following subjects' %}: </p>
21 22 <div class="panel-group" id="subject-accordion" role="tablist" aria-multiselectable="true">
... ...
notifications/templates/notifications/subject.html
  Diff comments   View file @3b1703b
... ... @@ -10,6 +10,7 @@
10 10 {% endblock %}
11 11  
12 12 {% block content %}
  13 + <h5>{% trans 'This pendencies list is updated every 24 hours. Last update was in:' %} {{ last_update|default:_('Not determined') }}</h5>
13 14 {% if subject.visible %}
14 15 <div class="panel panel-info subject-panel">
15 16 <div class="panel-heading">
... ... @@ -34,6 +35,7 @@
34 35 </div>
35 36  
36 37 {% if not history %}
  38 +
37 39 {% if notifications.count > 0 %}
38 40 {% include 'notifications/_view.html' %}
39 41  
... ...
notifications/utils.py
  Diff comments   View file @3b1703b
... ... @@ -2,6 +2,8 @@ from datetime import date
2 2 from django.utils import timezone
3 3 from django.db.models import Q
4 4 from dateutil.parser import parse
  5 +from datetime import datetime
  6 +from django.utils import formats
5 7  
6 8 from log.models import Log
7 9 from pendencies.models import Pendencies
... ... @@ -99,8 +101,28 @@ def get_order_by(order):
99 101 return ["meta"]
100 102  
101 103 def is_date(string):
102   - try:
103   - parse(string)
104   - return True
105   - except ValueError:
106   - return False
107 104 \ No newline at end of file
  105 + try:
  106 + parse(string)
  107 + return True
  108 + except ValueError:
  109 + return False
  110 +
  111 +def strToDate(string):
  112 + correct_format = formats.get_format("SHORT_DATE_FORMAT")
  113 + correct_format = correct_format.split('/')
  114 + correct_format = ["%" + x for x in correct_format]
  115 +
  116 + slash_format = '/'.join(correct_format)
  117 + hiphen_format = '-'.join(correct_format)
  118 +
  119 + try:
  120 + search_date = datetime.strptime(string, slash_format)
  121 + search_date = timezone.make_aware(search_date, timezone.get_current_timezone())
  122 + except ValueError:
  123 + try:
  124 + search_date = datetime.strptime(string, hiphen_format)
  125 + search_date = timezone.make_aware(search_date, timezone.get_current_timezone())
  126 + except ValueError:
  127 + search_date = datetime.fromtimestamp(0)
  128 +
  129 + return search_date
108 130 \ No newline at end of file
... ...
notifications/views.py
  Diff comments   View file @3b1703b
... ... @@ -23,7 +23,7 @@ from log.decorators import log_decorator, log_decorator_ajax
23 23 import time
24 24  
25 25 from .models import Notification
26   -from .utils import get_order_by, is_date
  26 +from .utils import get_order_by, is_date, strToDate
27 27  
28 28 class SubjectNotifications(LoginRequiredMixin, LogMixin, generic.ListView):
29 29 log_component = 'pendencies'
... ... @@ -70,6 +70,13 @@ class SubjectNotifications(LoginRequiredMixin, LogMixin, generic.ListView):
70 70 context['subject'] = subject
71 71 context['total'] = self.total
72 72  
  73 + update_pendencies = Log.objects.filter(action = "cron", component = "notifications").order_by('-datetime')
  74 +
  75 + if update_pendencies.count() > 0:
  76 + last_update = update_pendencies[0]
  77 +
  78 + context['last_update'] = last_update.datetime
  79 +
73 80 self.log_context['subject_id'] = subject.id
74 81 self.log_context['subject_name'] = subject.name
75 82 self.log_context['subject_slug'] = subject.slug
... ... @@ -125,8 +132,7 @@ class SubjectHistory(LoginRequiredMixin, LogMixin, generic.ListView):
125 132 queries |= Q(level = search)
126 133  
127 134 if is_date(search):
128   - search_date = parser.parse(search)
129   - search_date = timezone.make_aware(search_date, timezone.get_current_timezone())
  135 + search_date = strToDate(search)
130 136  
131 137 queries |= Q(creation_date = search_date)
132 138 queries |= Q(task__limit_date = search_date)
... ... @@ -197,6 +203,13 @@ class IndexView(LoginRequiredMixin, generic.ListView):
197 203  
198 204 context['title'] = _('Pendencies')
199 205  
  206 + update_pendencies = Log.objects.filter(action = "cron", component = "notifications").order_by('-datetime')
  207 +
  208 + if update_pendencies.count() > 0:
  209 + last_update = update_pendencies[0]
  210 +
  211 + context['last_update'] = last_update.datetime
  212 +
200 213 cat = self.kwargs.get('slug', None)
201 214  
202 215 if cat:
... ... @@ -246,8 +259,7 @@ class AjaxHistory(LoginRequiredMixin, generic.ListView):
246 259 queries |= Q(level = search)
247 260  
248 261 if is_date(search):
249   - search_date = parser.parse(search)
250   - search_date = timezone.make_aware(search_date, timezone.get_current_timezone())
  262 + search_date = strToDate(search)
251 263  
252 264 queries |= Q(creation_date = search_date)
253 265 queries |= Q(task__limit_date = search_date)
... ...
pdf_file/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @3b1703b
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-04-06 22:17-0300\n"
  11 +"POT-Creation-Date: 2017-04-11 19:18-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ...
pendencies/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @3b1703b
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-04-08 18:18-0300\n"
  11 +"POT-Creation-Date: 2017-04-11 19:17-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -18,28 +18,31 @@ msgstr &quot;&quot;
18 18 "Content-Transfer-Encoding: 8bit\n"
19 19 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
20 20  
21   -#: forms.py:49 forms.py:52 forms.py:55 forms.py:128 forms.py:131 forms.py:134
22   -#: forms.py:137
  21 +#: pendencies/forms.py:49 pendencies/forms.py:52 pendencies/forms.py:55
  22 +#: pendencies/forms.py:128 pendencies/forms.py:131 pendencies/forms.py:134
  23 +#: pendencies/forms.py:137
23 24 msgid "This field is required."
24 25 msgstr "Esse campo é obrigatório."
25 26  
26   -#: forms.py:60 forms.py:142
  27 +#: pendencies/forms.py:60 pendencies/forms.py:142
27 28 msgid "This input should be filled with a date equal or before the End Date."
28 29 msgstr ""
29 30 "Esse campo deve ser preenchido com uma data igual ou anterior à Data Final."
30 31  
31   -#: forms.py:61 forms.py:143 forms.py:149
  32 +#: pendencies/forms.py:61 pendencies/forms.py:143 pendencies/forms.py:149
32 33 msgid "This input should be filled with a date equal or after the Begin Date."
33 34 msgstr ""
34 35 "Esse campo deve ser preenchido com uma data igual ou posterior à Data "
35 36 "Inicial."
36 37  
37   -#: forms.py:68 forms.py:78 forms.py:162 forms.py:172 forms.py:182
  38 +#: pendencies/forms.py:68 pendencies/forms.py:78 pendencies/forms.py:162
  39 +#: pendencies/forms.py:172 pendencies/forms.py:182
38 40 msgid "This input should be filled with a date equal or after today's date."
39 41 msgstr ""
40 42 "Esse campo deve ser preenchido com uma data igual ou posterior à data atual."
41 43  
42   -#: forms.py:71 forms.py:81 forms.py:165 forms.py:175 forms.py:185
  44 +#: pendencies/forms.py:71 pendencies/forms.py:81 pendencies/forms.py:165
  45 +#: pendencies/forms.py:175 pendencies/forms.py:185
43 46 #, python-format
44 47 msgid ""
45 48 "This input should be filled with a date equal or after the subject begin "
... ... @@ -48,7 +51,8 @@ msgstr &quot;&quot;
48 51 "Esse campo deve ser preenchido com uma data igual ou posterior à data "
49 52 "inicial do assunto.(\"%s\")"
50 53  
51   -#: forms.py:74 forms.py:84 forms.py:168 forms.py:178 forms.py:188
  54 +#: pendencies/forms.py:74 pendencies/forms.py:84 pendencies/forms.py:168
  55 +#: pendencies/forms.py:178 pendencies/forms.py:188
52 56 #, python-format
53 57 msgid ""
54 58 "This input should be filled with a date equal or before the subject end date."
... ... @@ -57,18 +61,18 @@ msgstr &quot;&quot;
57 61 "Esse campo deve ser preenchido com uma data igual ou anterior à data final "
58 62 "do assunto.(\"%s\")"
59 63  
60   -#: forms.py:148 forms.py:154
  64 +#: pendencies/forms.py:148 pendencies/forms.py:154
61 65 msgid "This input should be filled with a date equal or before the Limit Date."
62 66 msgstr ""
63 67 "Esse campo deve ser preenchido com uma data igual ou anterior à Data Final."
64 68  
65   -#: forms.py:155
  69 +#: pendencies/forms.py:155
66 70 msgid "This input should be filled with a date equal or after the End Date."
67 71 msgstr ""
68 72 "Esse campo deve ser preenchido com uma data igual ou posterior à Data "
69 73 "Inicial."
70 74  
71   -#: forms.py:196 forms.py:200 forms.py:204
  75 +#: pendencies/forms.py:196 pendencies/forms.py:200 pendencies/forms.py:204
72 76 #, python-format
73 77 msgid ""
74 78 "This input should be filled with a date equal or before the goals submission "
... ... @@ -77,50 +81,50 @@ msgstr &quot;&quot;
77 81 "Esse campo deve ser preenchido com uma data igual ou anterior à data final "
78 82 "do assunto.(\"%s\")"
79 83  
80   -#: models.py:8
  84 +#: pendencies/models.py:8
81 85 msgid "Action"
82 86 msgstr "Ação"
83 87  
84   -#: models.py:8
  88 +#: pendencies/models.py:8
85 89 msgid "Visualize"
86 90 msgstr "Visualizar"
87 91  
88   -#: models.py:8
  92 +#: pendencies/models.py:8
89 93 msgid "Create"
90 94 msgstr "Criar"
91 95  
92   -#: models.py:8
  96 +#: pendencies/models.py:8
93 97 msgid "Answer"
94 98 msgstr "Responder"
95 99  
96   -#: models.py:8
  100 +#: pendencies/models.py:8
97 101 msgid "Access"
98 102 msgstr "Acessar"
99 103  
100   -#: models.py:8
  104 +#: pendencies/models.py:8
101 105 msgid "Participate"
102 106 msgstr "Participar"
103 107  
104   -#: models.py:8
  108 +#: pendencies/models.py:8
105 109 msgid "Finish"
106 110 msgstr "Fim"
107 111  
108   -#: models.py:8
  112 +#: pendencies/models.py:8
109 113 msgid "Submit"
110 114 msgstr "Enviar"
111 115  
112   -#: models.py:9
  116 +#: pendencies/models.py:9
113 117 msgid "Begin Date"
114 118 msgstr "Data Inicial"
115 119  
116   -#: models.py:10
  120 +#: pendencies/models.py:10
117 121 msgid "End Date"
118 122 msgstr "Data Final"
119 123  
120   -#: models.py:11
  124 +#: pendencies/models.py:11
121 125 msgid "Limit Date"
122 126 msgstr "Data Limite"
123 127  
124   -#: models.py:12
  128 +#: pendencies/models.py:12
125 129 msgid "Resource"
126 130 msgstr "Recurso"
... ...
reports/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @3b1703b
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-04-06 22:17-0300\n"
  11 +"POT-Creation-Date: 2017-04-11 19:18-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ...
security/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @3b1703b
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-04-06 22:17-0300\n"
  11 +"POT-Creation-Date: 2017-04-11 19:17-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ...
students_group/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @3b1703b
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-04-06 22:17-0300\n"
  11 +"POT-Creation-Date: 2017-04-11 19:18-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ...
subjects/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @3b1703b
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-04-06 22:17-0300\n"
  11 +"POT-Creation-Date: 2017-04-11 19:18-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -26,7 +26,7 @@ msgstr &quot;Tags&quot;
26 26 msgid "There is another subject with this name, try another one."
27 27 msgstr "Já existe um assunto com esse nome, tente outro."
28 28  
29   -#: subjects/forms.py:76 subjects/forms.py:179
  29 +#: subjects/forms.py:76
30 30 msgid "This date must be today or after"
31 31 msgstr "Essa data deve ser hoje ou depois disso"
32 32  
... ...
themes/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @3b1703b
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-04-06 22:17-0300\n"
  11 +"POT-Creation-Date: 2017-04-11 19:17-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ...
topics/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @3b1703b
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-04-06 22:17-0300\n"
  11 +"POT-Creation-Date: 2017-04-11 19:18-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ...
users/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @3b1703b
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-04-06 22:17-0300\n"
  11 +"POT-Creation-Date: 2017-04-11 19:17-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -153,11 +153,11 @@ msgstr &quot;Não é administrador&quot;
153 153 msgid "Choose your photo..."
154 154 msgstr "Escolha sua foto..."
155 155  
156   -#: users/templates/users/_form.html:70
  156 +#: users/templates/users/_form.html:76
157 157 msgid "Save"
158 158 msgstr "Salvar"
159 159  
160   -#: users/templates/users/_form.html:73 users/templates/users/modal_crop.html:24
  160 +#: users/templates/users/_form.html:79 users/templates/users/modal_crop.html:24
161 161 msgid "Cancel"
162 162 msgstr "Cancelar"
163 163  
... ... @@ -198,7 +198,7 @@ msgstr &quot;Recuperar&quot;
198 198  
199 199 #: users/templates/users/forgot_password.html:75
200 200 #: users/templates/users/new_password.html:80
201   -#: users/templates/users/register.html:92
  201 +#: users/templates/users/register.html:93
202 202 msgid "Back"
203 203 msgstr "Voltar"
204 204  
... ... @@ -275,7 +275,7 @@ msgstr &quot;Estudante em&quot;
275 275 msgid "User Register"
276 276 msgstr "Cadastro de Usuário"
277 277  
278   -#: users/templates/users/register.html:89
  278 +#: users/templates/users/register.html:90
279 279 msgid "Register"
280 280 msgstr "Cadastrar"
281 281  
... ...
webconference/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @3b1703b
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-04-06 22:17-0300\n"
  11 +"POT-Creation-Date: 2017-04-11 19:18-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ...
webpage/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @3b1703b
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-04-06 22:17-0300\n"
  11 +"POT-Creation-Date: 2017-04-11 19:18-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ...
youtube_video/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @3b1703b
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-04-06 22:17-0300\n"
  11 +"POT-Creation-Date: 2017-04-11 19:17-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ...