Download as
Browse Code »

Commit 69fad6bc0b31a958beeadbd7a93c33fb6f603805

Authored by Jailson Dias
1 parent 8409d422
Exists in master and in 2 other branches amadeus_univasf, refactoring

colocando as traduções do relatórios de links

Showing 4 changed files with 238 additions and 54 deletions   Show diff stats
links/locale/pt-br/LC_MESSAGES/django.po
  Diff comments   View file @69fad6b
@@ -8,7 +8,7 @@ msgid "" @@ -8,7 +8,7 @@ msgid ""
8 msgstr "" 8 msgstr ""
9 "Project-Id-Version: PACKAGE VERSION\n" 9 "Project-Id-Version: PACKAGE VERSION\n"
10 "Report-Msgid-Bugs-To: \n" 10 "Report-Msgid-Bugs-To: \n"
11 -"POT-Creation-Date: 2017-02-09 18:40-0300\n" 11 +"POT-Creation-Date: 2017-05-05 19:49-0300\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n" 14 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,106 +17,197 @@ msgstr &quot;&quot; @@ -17,106 +17,197 @@ msgstr &quot;&quot;
17 "Content-Type: text/plain; charset=UTF-8\n" 17 "Content-Type: text/plain; charset=UTF-8\n"
18 "Content-Transfer-Encoding: 8bit\n" 18 "Content-Transfer-Encoding: 8bit\n"
19 19
20 -#: links/forms.py:27 20 +#: forms.py:27
21 msgid "Tags" 21 msgid "Tags"
22 msgstr "" 22 msgstr ""
23 23
24 -#: links/forms.py:28 24 +#: forms.py:28
25 msgid "Website URL" 25 msgid "Website URL"
26 msgstr "" 26 msgstr ""
27 27
28 -#: links/forms.py:34 28 +#: forms.py:34
29 msgid "Link name" 29 msgid "Link name"
30 msgstr "" 30 msgstr ""
31 31
32 -#: links/forms.py:35 32 +#: forms.py:35
33 msgid "End View" 33 msgid "End View"
34 msgstr "" 34 msgstr ""
35 35
36 -#: links/forms.py:36 36 +#: forms.py:36
37 msgid "End View Date" 37 msgid "End View Date"
38 msgstr "" 38 msgstr ""
39 39
40 -#: links/forms.py:64 40 +#: forms.py:64
41 msgid "There is already a link with this name on this subject" 41 msgid "There is already a link with this name on this subject"
42 msgstr "" 42 msgstr ""
43 43
44 -#: links/models.py:11 44 +#: models.py:13
45 msgid "Link_URL" 45 msgid "Link_URL"
46 msgstr "" 46 msgstr ""
47 47
48 -#: links/models.py:31 links/templates/links/delete.html:9 48 +#: models.py:33 templates/links/delete.html:12
49 msgid "Are you sure you want delete the Website link" 49 msgid "Are you sure you want delete the Website link"
50 msgstr "" 50 msgstr ""
51 51
52 -#: links/templates/links/_form.html:112 52 +#: templates/links/_form.html:112
53 msgid "Pendencies Notifications" 53 msgid "Pendencies Notifications"
54 msgstr "" 54 msgstr ""
55 55
56 -#: links/templates/links/_form.html:130 56 +#: templates/links/_form.html:130
57 msgid "Action not performed by the user" 57 msgid "Action not performed by the user"
58 msgstr "" 58 msgstr ""
59 59
60 -#: links/templates/links/_form.html:156 60 +#: templates/links/_form.html:156
61 msgid "Wished period" 61 msgid "Wished period"
62 msgstr "" 62 msgstr ""
63 63
64 -#: links/templates/links/_form.html:252 64 +#: templates/links/_form.html:252
65 msgid "Attribute students to file link" 65 msgid "Attribute students to file link"
66 msgstr "" 66 msgstr ""
67 67
68 -#: links/templates/links/_form.html:272 68 +#: templates/links/_form.html:272
69 msgid "Attribute groups to file link" 69 msgid "Attribute groups to file link"
70 msgstr "" 70 msgstr ""
71 71
72 -#: links/templates/links/_form.html:320 72 +#: templates/links/_form.html:320
73 msgid "Save" 73 msgid "Save"
74 msgstr "" 74 msgstr ""
75 75
76 -#: links/templates/links/create.html:20 76 +#: templates/links/create.html:20
77 msgid "Create Website Link" 77 msgid "Create Website Link"
78 msgstr "" 78 msgstr ""
79 79
80 -#: links/templates/links/delete.html:14 80 +#: templates/links/delete.html:18 templates/links/send_message.html:62
81 msgid "Close" 81 msgid "Close"
82 msgstr "" 82 msgstr ""
83 83
84 -#: links/templates/links/delete.html:17 84 +#: templates/links/delete.html:19
85 msgid "Delete" 85 msgid "Delete"
86 msgstr "" 86 msgstr ""
87 87
88 -#: links/templates/links/update.html:20 88 +#: templates/links/relatorios.html:17 templates/links/relatorios.html:37
  89 +msgid "User"
  90 +msgstr ""
  91 +
  92 +#: templates/links/relatorios.html:17 templates/links/relatorios.html:37
  93 +msgid "Group"
  94 +msgstr ""
  95 +
  96 +#: templates/links/relatorios.html:17
  97 +msgid "Action"
  98 +msgstr ""
  99 +
  100 +#: templates/links/relatorios.html:17
  101 +msgid "Date of Action"
  102 +msgstr ""
  103 +
  104 +#: templates/links/relatorios.html:37
  105 +msgid "Send message"
  106 +msgstr ""
  107 +
  108 +#: templates/links/relatorios.html:37
  109 +msgid "Action don't realized"
  110 +msgstr ""
  111 +
  112 +#: templates/links/relatorios.html:151 templates/links/relatorios.html:171
  113 +msgid "Reports"
  114 +msgstr ""
  115 +
  116 +#: templates/links/relatorios.html:178
  117 +msgid "Report of the resource "
  118 +msgstr ""
  119 +
  120 +#: templates/links/relatorios.html:187
  121 +msgid "Select the period: "
  122 +msgstr ""
  123 +
  124 +#: templates/links/relatorios.html:196
  125 +msgid "Search"
  126 +msgstr ""
  127 +
  128 +#: templates/links/relatorios.html:220
  129 +msgid "Filter: "
  130 +msgstr ""
  131 +
  132 +#: templates/links/relatorios.html:244 templates/links/relatorios.html:329
  133 +msgid "record(s)"
  134 +msgstr ""
  135 +
  136 +#: templates/links/send_message.html:38
  137 +msgid "Click or drop the picture here"
  138 +msgstr ""
  139 +
  140 +#: templates/links/send_message.html:40
  141 +msgid "The picture could not exceed 5MB."
  142 +msgstr ""
  143 +
  144 +#: templates/links/send_message.html:63
  145 +msgid "Send"
  146 +msgstr ""
  147 +
  148 +#: templates/links/update.html:20
89 msgid "Edit: " 149 msgid "Edit: "
90 msgstr "" 150 msgstr ""
91 151
92 -#: links/views.py:51 links/views.py:64 links/views.py:224 links/views.py:226  
93 -#: links/views.py:242 links/views.py:244 152 +#: views.py:59 views.py:72 views.py:256 views.py:258 views.py:274 views.py:276
94 msgid "Visualize" 153 msgid "Visualize"
95 msgstr "" 154 msgstr ""
96 155
97 -#: links/views.py:124 156 +#: views.py:134
98 msgid "Create Webiste Link" 157 msgid "Create Webiste Link"
99 msgstr "" 158 msgstr ""
100 159
101 -#: links/views.py:135 160 +#: views.py:145
102 #, python-format 161 #, python-format
103 msgid "" 162 msgid ""
104 "The Link \"%s\" was added to the Topic \"%s\" of the virtual environment " 163 "The Link \"%s\" was added to the Topic \"%s\" of the virtual environment "
105 "\"%s\" successfully!" 164 "\"%s\" successfully!"
106 msgstr "" 165 msgstr ""
107 166
108 -#: links/views.py:163 167 +#: views.py:173
109 #, python-format 168 #, python-format
110 msgid "" 169 msgid ""
111 "The Website Link \"%s\" was removed successfully from virtual environment " 170 "The Website Link \"%s\" was removed successfully from virtual environment "
112 "\"%s\"!" 171 "\"%s\"!"
113 msgstr "" 172 msgstr ""
114 173
115 -#: links/views.py:288 174 +#: views.py:322
116 msgid "Update Website Link" 175 msgid "Update Website Link"
117 msgstr "" 176 msgstr ""
118 177
119 -#: links/views.py:299 178 +#: views.py:333
120 #, python-format 179 #, python-format
121 msgid "The Website Link \"%s\" was updated successfully!" 180 msgid "The Website Link \"%s\" was updated successfully!"
122 msgstr "" 181 msgstr ""
  182 +
  183 +#: views.py:377
  184 +msgid "Links Reports"
  185 +msgstr ""
  186 +
  187 +#: views.py:396
  188 +msgid "Realized"
  189 +msgstr ""
  190 +
  191 +#: views.py:396
  192 +msgid "Unrealized"
  193 +msgstr ""
  194 +
  195 +#: views.py:396
  196 +msgid "Historic"
  197 +msgstr ""
  198 +
  199 +#: views.py:414 views.py:423
  200 +msgid "View"
  201 +msgstr ""
  202 +
  203 +#: views.py:422
  204 +msgid "Links"
  205 +msgstr ""
  206 +
  207 +#: views.py:427
  208 +msgid "Actions about resource"
  209 +msgstr ""
  210 +
  211 +#: views.py:428
  212 +msgid "Quantity"
  213 +msgstr ""
links/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @69fad6b
@@ -8,7 +8,7 @@ msgid &quot;&quot; @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 msgstr "" 8 msgstr ""
9 "Project-Id-Version: PACKAGE VERSION\n" 9 "Project-Id-Version: PACKAGE VERSION\n"
10 "Report-Msgid-Bugs-To: \n" 10 "Report-Msgid-Bugs-To: \n"
11 -"POT-Creation-Date: 2017-04-15 00:13-0300\n" 11 +"POT-Creation-Date: 2017-05-05 19:49-0300\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n" 14 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,88 +18,147 @@ msgstr &quot;&quot; @@ -18,88 +18,147 @@ msgstr &quot;&quot;
18 "Content-Transfer-Encoding: 8bit\n" 18 "Content-Transfer-Encoding: 8bit\n"
19 "Plural-Forms: nplurals=2; plural=(n > 1);\n" 19 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
20 20
21 -#: links/forms.py:27 21 +#: forms.py:27
22 msgid "Tags" 22 msgid "Tags"
23 msgstr "" 23 msgstr ""
24 24
25 -#: links/forms.py:28 25 +#: forms.py:28
26 msgid "Website URL" 26 msgid "Website URL"
27 msgstr "URL do site:" 27 msgstr "URL do site:"
28 28
29 -#: links/forms.py:34 29 +#: forms.py:34
30 msgid "Link name" 30 msgid "Link name"
31 msgstr "Nome do Link" 31 msgstr "Nome do Link"
32 32
33 -#: links/forms.py:35 33 +#: forms.py:35
34 msgid "End View" 34 msgid "End View"
35 msgstr "" 35 msgstr ""
36 36
37 -#: links/forms.py:36 37 +#: forms.py:36
38 msgid "End View Date" 38 msgid "End View Date"
39 msgstr "" 39 msgstr ""
40 40
41 -#: links/forms.py:64 41 +#: forms.py:64
42 msgid "There is already a link with this name on this subject" 42 msgid "There is already a link with this name on this subject"
43 msgstr "Ja existe um link com este nome neste Assunto" 43 msgstr "Ja existe um link com este nome neste Assunto"
44 44
45 -#: links/models.py:11 45 +#: models.py:13
46 msgid "Link_URL" 46 msgid "Link_URL"
47 msgstr "URL do link" 47 msgstr "URL do link"
48 48
49 -#: links/models.py:31 links/templates/links/delete.html:12 49 +#: models.py:33 templates/links/delete.html:12
50 msgid "Are you sure you want delete the Website link" 50 msgid "Are you sure you want delete the Website link"
51 msgstr "Tem certeza que voce deseja remover esse Link para Website" 51 msgstr "Tem certeza que voce deseja remover esse Link para Website"
52 52
53 -#: links/templates/links/_form.html:112 53 +#: templates/links/_form.html:112
54 msgid "Pendencies Notifications" 54 msgid "Pendencies Notifications"
55 msgstr "" 55 msgstr ""
56 56
57 -#: links/templates/links/_form.html:130 57 +#: templates/links/_form.html:130
58 msgid "Action not performed by the user" 58 msgid "Action not performed by the user"
59 msgstr "" 59 msgstr ""
60 60
61 -#: links/templates/links/_form.html:156 61 +#: templates/links/_form.html:156
62 msgid "Wished period" 62 msgid "Wished period"
63 msgstr "" 63 msgstr ""
64 64
65 -#: links/templates/links/_form.html:252 65 +#: templates/links/_form.html:252
66 msgid "Attribute students to file link" 66 msgid "Attribute students to file link"
67 msgstr "" 67 msgstr ""
68 68
69 -#: links/templates/links/_form.html:272 69 +#: templates/links/_form.html:272
70 msgid "Attribute groups to file link" 70 msgid "Attribute groups to file link"
71 msgstr "" 71 msgstr ""
72 72
73 -#: links/templates/links/_form.html:320 73 +#: templates/links/_form.html:320
74 msgid "Save" 74 msgid "Save"
75 msgstr "Salvar" 75 msgstr "Salvar"
76 76
77 -#: links/templates/links/create.html:20 77 +#: templates/links/create.html:20
78 msgid "Create Website Link" 78 msgid "Create Website Link"
79 msgstr "Criar Link do Website" 79 msgstr "Criar Link do Website"
80 80
81 -#: links/templates/links/delete.html:18 81 +#: templates/links/delete.html:18 templates/links/send_message.html:62
82 msgid "Close" 82 msgid "Close"
83 msgstr "Fechar" 83 msgstr "Fechar"
84 84
85 -#: links/templates/links/delete.html:19 85 +#: templates/links/delete.html:19
86 msgid "Delete" 86 msgid "Delete"
87 msgstr "Remover" 87 msgstr "Remover"
88 88
89 -#: links/templates/links/update.html:20 89 +#: templates/links/relatorios.html:17 templates/links/relatorios.html:37
  90 +msgid "User"
  91 +msgstr "Usuário"
  92 +
  93 +#: templates/links/relatorios.html:17 templates/links/relatorios.html:37
  94 +msgid "Group"
  95 +msgstr "Grupo"
  96 +
  97 +#: templates/links/relatorios.html:17
  98 +msgid "Action"
  99 +msgstr "Ação"
  100 +
  101 +#: templates/links/relatorios.html:17
  102 +msgid "Date of Action"
  103 +msgstr "Data da ação"
  104 +
  105 +#: templates/links/relatorios.html:37
  106 +msgid "Send message"
  107 +msgstr "Enviar Mensagem"
  108 +
  109 +#: templates/links/relatorios.html:37
  110 +msgid "Action don't realized"
  111 +msgstr "Ação não realizada"
  112 +
  113 +#: templates/links/relatorios.html:151 templates/links/relatorios.html:171
  114 +msgid "Reports"
  115 +msgstr "Relatórios"
  116 +
  117 +#: templates/links/relatorios.html:178
  118 +msgid "Report of the resource "
  119 +msgstr "Relatórios do recurso "
  120 +
  121 +#: templates/links/relatorios.html:187
  122 +msgid "Select the period: "
  123 +msgstr "Selecione o período: "
  124 +
  125 +#: templates/links/relatorios.html:196
  126 +msgid "Search"
  127 +msgstr "Pesquisar"
  128 +
  129 +#: templates/links/relatorios.html:220
  130 +msgid "Filter: "
  131 +msgstr "Filtro: "
  132 +
  133 +#: templates/links/relatorios.html:244 templates/links/relatorios.html:329
  134 +msgid "record(s)"
  135 +msgstr "Relatório(s)"
  136 +
  137 +#: templates/links/send_message.html:38
  138 +msgid "Click or drop the picture here"
  139 +msgstr "Clique ou solte a imagem aqui"
  140 +
  141 +#: templates/links/send_message.html:40
  142 +msgid "The picture could not exceed 5MB."
  143 +msgstr "A imagem não pode exceder 5MB."
  144 +
  145 +#: templates/links/send_message.html:63
  146 +msgid "Send"
  147 +msgstr "Enviar"
  148 +
  149 +#: templates/links/update.html:20
90 msgid "Edit: " 150 msgid "Edit: "
91 msgstr "Editar: " 151 msgstr "Editar: "
92 152
93 -#: links/views.py:51 links/views.py:64 links/views.py:234 links/views.py:236  
94 -#: links/views.py:252 links/views.py:254 153 +#: views.py:59 views.py:72 views.py:256 views.py:258 views.py:274 views.py:276
95 msgid "Visualize" 154 msgid "Visualize"
96 msgstr "Visualizar" 155 msgstr "Visualizar"
97 156
98 -#: links/views.py:126 157 +#: views.py:134
99 msgid "Create Webiste Link" 158 msgid "Create Webiste Link"
100 msgstr "Criar Link de Website" 159 msgstr "Criar Link de Website"
101 160
102 -#: links/views.py:137 161 +#: views.py:145
103 #, python-format 162 #, python-format
104 msgid "" 163 msgid ""
105 "The Link \"%s\" was added to the Topic \"%s\" of the virtual environment " 164 "The Link \"%s\" was added to the Topic \"%s\" of the virtual environment "
@@ -108,7 +167,7 @@ msgstr &quot;&quot; @@ -108,7 +167,7 @@ msgstr &quot;&quot;
108 "O link \"%s\" foi adicionado com sucesso ao Topico \"%s\" do ambiente " 167 "O link \"%s\" foi adicionado com sucesso ao Topico \"%s\" do ambiente "
109 "virtual \"%s\" " 168 "virtual \"%s\" "
110 169
111 -#: links/views.py:165 170 +#: views.py:173
112 #, python-format 171 #, python-format
113 msgid "" 172 msgid ""
114 "The Website Link \"%s\" was removed successfully from virtual environment " 173 "The Website Link \"%s\" was removed successfully from virtual environment "
@@ -116,11 +175,45 @@ msgid &quot;&quot; @@ -116,11 +175,45 @@ msgid &quot;&quot;
116 msgstr "" 175 msgstr ""
117 "O Link do site \"%s\" foi removido com sucesso do ambiente virtual \"%s\" " 176 "O Link do site \"%s\" foi removido com sucesso do ambiente virtual \"%s\" "
118 177
119 -#: links/views.py:300 178 +#: views.py:322
120 msgid "Update Website Link" 179 msgid "Update Website Link"
121 msgstr "Atualizar Link do website" 180 msgstr "Atualizar Link do website"
122 181
123 -#: links/views.py:311 182 +#: views.py:333
124 #, python-format 183 #, python-format
125 msgid "The Website Link \"%s\" was updated successfully!" 184 msgid "The Website Link \"%s\" was updated successfully!"
126 msgstr "O link do website \"%s\" foi atualizado com sucesso! " 185 msgstr "O link do website \"%s\" foi atualizado com sucesso! "
  186 +
  187 +#: views.py:377
  188 +msgid "Links Reports"
  189 +msgstr "Relatórios de links"
  190 +
  191 +#: views.py:396
  192 +msgid "Realized"
  193 +msgstr "Realizado"
  194 +
  195 +#: views.py:396
  196 +msgid "Unrealized"
  197 +msgstr "Não Realizado"
  198 +
  199 +#: views.py:396
  200 +msgid "Historic"
  201 +msgstr "Histórico"
  202 +
  203 +#: views.py:414 views.py:423
  204 +msgid "View"
  205 +msgstr "Visualizar"
  206 +
  207 +#: views.py:422
  208 +#, fuzzy
  209 +#| msgid "Link_URL"
  210 +msgid "Links"
  211 +msgstr "Links"
  212 +
  213 +#: views.py:427
  214 +msgid "Actions about resource"
  215 +msgstr "Ações sobre o recurso"
  216 +
  217 +#: views.py:428
  218 +msgid "Quantity"
  219 +msgstr "Quantidade"
webpage/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @69fad6b
@@ -147,7 +147,7 @@ msgstr &quot;Relatório(s)&quot; @@ -147,7 +147,7 @@ msgstr &quot;Relatório(s)&quot;
147 147
148 #: templates/webpages/send_message.html:38 148 #: templates/webpages/send_message.html:38
149 msgid "Click or drop the picture here" 149 msgid "Click or drop the picture here"
150 -msgstr "Clique ou arraste a imagem aqui" 150 +msgstr "Clique ou solte a imagem aqui"
151 151
152 #: templates/webpages/send_message.html:40 152 #: templates/webpages/send_message.html:40
153 msgid "The picture could not exceed 5MB." 153 msgid "The picture could not exceed 5MB."
webpage/views.py
  Diff comments   View file @69fad6b
@@ -10,7 +10,6 @@ from amadeus.permissions import has_subject_permissions, has_resource_permission @@ -10,7 +10,6 @@ from amadeus.permissions import has_subject_permissions, has_resource_permission
10 10
11 import time 11 import time
12 import datetime 12 import datetime
13 -from log.models import Log  
14 from log.mixins import LogMixin 13 from log.mixins import LogMixin
15 14
16 from topics.models import Topic 15 from topics.models import Topic
@@ -20,6 +19,7 @@ from pendencies.forms import PendenciesForm @@ -20,6 +19,7 @@ from pendencies.forms import PendenciesForm
20 from .forms import WebpageForm 19 from .forms import WebpageForm
21 from .models import Webpage 20 from .models import Webpage
22 21
  22 +from log.models import Log
23 from chat.models import Conversation, TalkMessages 23 from chat.models import Conversation, TalkMessages
24 from users.models import User 24 from users.models import User
25 from subjects.models import Subject 25 from subjects.models import Subject