Download as
Browse Code »

Commit e3c48c964f785c9e7c712b2e9cd6ba30a684fbd1

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

Colocando as traduções dos relatorios de webpage

Showing 3 changed files with 103 additions and 32 deletions   Show diff stats
webpage/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @e3c48c9
... ... @@ -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-15 00:13-0300\n"
  11 +"POT-Creation-Date: 2017-04-28 20:41-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,84 +18,123 @@ msgstr &quot;&quot;
18 18 "Content-Transfer-Encoding: 8bit\n"
19 19 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
20 20  
21   -#: webpage/forms.py:25
  21 +#: forms.py:25
22 22 msgid "Tags"
23 23 msgstr "Tags"
24 24  
25   -#: webpage/forms.py:31
  25 +#: forms.py:31
26 26 msgid "Webpage name"
27 27 msgstr "Nome da Página Web"
28 28  
29   -#: webpage/forms.py:32
  29 +#: forms.py:32
30 30 msgid "Webpage content"
31 31 msgstr "Conteúdo da Página Web"
32 32  
33   -#: webpage/forms.py:53
  33 +#: forms.py:53
34 34 msgid "This subject already has a webpage with this name"
35 35 msgstr "Esse assunto já possui uma Página Web com esse nome"
36 36  
37   -#: webpage/forms.py:64
  37 +#: forms.py:64
38 38 msgid "This field is required."
39 39 msgstr "Esse campo é obrigatório."
40 40  
41   -#: webpage/models.py:8
  41 +#: models.py:8
42 42 msgid "Webpage Content"
43 43 msgstr "Conteúdo da Página Web"
44 44  
45   -#: webpage/models.py:11
  45 +#: models.py:11
46 46 msgid "WebPage"
47 47 msgstr "Página Web"
48 48  
49   -#: webpage/models.py:12
  49 +#: models.py:12
50 50 msgid "WebPages"
51 51 msgstr "Páginas Web"
52 52  
53   -#: webpage/models.py:30
  53 +#: models.py:30
54 54 msgid "Are you sure you want delete the webpage"
55 55 msgstr "Você tem certeza que deseja remover a Página Web"
56 56  
57   -#: webpage/templates/webpages/_form.html:49
  57 +#: templates/webpages/_form.html:49
58 58 msgid "Common resources settings"
59 59 msgstr "Configurações comuns a todos os recursos"
60 60  
61   -#: webpage/templates/webpages/_form.html:98
  61 +#: templates/webpages/_form.html:98
62 62 msgid "Pendencies Notifications"
63 63 msgstr "Notificação de Pendências"
64 64  
65   -#: webpage/templates/webpages/_form.html:114
  65 +#: templates/webpages/_form.html:114
66 66 msgid "Action not performed by the user"
67 67 msgstr "Ação não realizada pelo usuário"
68 68  
69   -#: webpage/templates/webpages/_form.html:140
  69 +#: templates/webpages/_form.html:140
70 70 msgid "Wished period"
71 71 msgstr "Período desejado"
72 72  
73   -#: webpage/templates/webpages/_form.html:236
  73 +#: templates/webpages/_form.html:236
74 74 msgid "Attribute students to webpage"
75 75 msgstr "Atribuir estudantes à Página Web"
76 76  
77   -#: webpage/templates/webpages/_form.html:256
  77 +#: templates/webpages/_form.html:256
78 78 msgid "Attribute groups to webpage"
79 79 msgstr "Atribuir grupos de estudo à Página Web"
80 80  
81   -#: webpage/templates/webpages/_form.html:325
  81 +#: templates/webpages/_form.html:325
82 82 msgid "Save"
83 83 msgstr "Salvar"
84 84  
85   -#: webpage/templates/webpages/create.html:20 webpage/views.py:219
  85 +#: templates/webpages/create.html:20 views.py:221
86 86 msgid "Create Webpage"
87 87 msgstr "Criar Página Web"
88 88  
89   -#: webpage/templates/webpages/update.html:20
  89 +#: templates/webpages/relatorios.html:16 templates/webpages/relatorios.html:30
  90 +#: templates/webpages/relatorios.html:37
  91 +msgid "User"
  92 +msgstr "Usuário"
  93 +
  94 +#: templates/webpages/relatorios.html:16 templates/webpages/relatorios.html:30
  95 +#: templates/webpages/relatorios.html:37
  96 +msgid "Group"
  97 +msgstr "Grupo"
  98 +
  99 +#: templates/webpages/relatorios.html:16 templates/webpages/relatorios.html:30
  100 +msgid "Action"
  101 +msgstr "Ação"
  102 +
  103 +#: templates/webpages/relatorios.html:16 templates/webpages/relatorios.html:30
  104 +msgid "Date of Action"
  105 +msgstr "Data da ação"
  106 +
  107 +#: templates/webpages/relatorios.html:135
  108 +#: templates/webpages/relatorios.html:155
  109 +msgid "Reports"
  110 +msgstr "Relatórios"
  111 +
  112 +#: templates/webpages/relatorios.html:162
  113 +msgid "Report of the resource "
  114 +msgstr "Relatórios do recurso "
  115 +
  116 +#: templates/webpages/relatorios.html:165
  117 +msgid "Select the period: "
  118 +msgstr "Selecione o período: "
  119 +
  120 +#: templates/webpages/relatorios.html:179
  121 +msgid "Search"
  122 +msgstr "Pesquisar"
  123 +
  124 +#: templates/webpages/relatorios.html:201
  125 +msgid "Filter: "
  126 +msgstr "Filtro: "
  127 +
  128 +#: templates/webpages/update.html:20
90 129 msgid "Edit: "
91 130 msgstr "Editar: "
92 131  
93   -#: webpage/views.py:146 webpage/views.py:159 webpage/views.py:277
94   -#: webpage/views.py:279 webpage/views.py:295 webpage/views.py:297
  132 +#: views.py:148 views.py:161 views.py:279 views.py:281 views.py:297
  133 +#: views.py:299
95 134 msgid "Visualize"
96   -msgstr ""
  135 +msgstr "Visualizar"
97 136  
98   -#: webpage/views.py:230
  137 +#: views.py:232
99 138 #, python-format
100 139 msgid ""
101 140 "The Webpage \"%s\" was added to the Topic \"%s\" of the virtual environment "
... ... @@ -104,18 +143,50 @@ msgstr &quot;&quot;
104 143 "A Página Web \"%s\" foi adicionado ao tópico \"%s\" do ambiente virtual \"%s"
105 144 "\" com sucesso!"
106 145  
107   -#: webpage/views.py:341
  146 +#: views.py:343
108 147 msgid "Update Webpage"
109 148 msgstr "Atualizar Página Web"
110 149  
111   -#: webpage/views.py:352
  150 +#: views.py:354
112 151 #, python-format
113 152 msgid "The Webpage \"%s\" was updated successfully!"
114 153 msgstr "A Página Web \"%s\" foi atualizada com sucesso!"
115 154  
116   -#: webpage/views.py:388
  155 +#: views.py:390
117 156 #, python-format
118 157 msgid ""
119 158 "The webpage \"%s\" was removed successfully from virtual environment \"%s\"!"
120 159 msgstr ""
121 160 "A Página Web \"%s\" foi removida do ambiente virtual \"%s\" com sucesso!"
  161 +
  162 +#: views.py:460
  163 +msgid "Webpage Reports"
  164 +msgstr "Nome da Página Web"
  165 +
  166 +#: views.py:478
  167 +msgid "Users who viewed"
  168 +msgstr "Usuários que visualizaram"
  169 +
  170 +#: views.py:478
  171 +msgid "Users who did not viewed"
  172 +msgstr "Usuários que não visualizaram"
  173 +
  174 +#: views.py:478
  175 +msgid "Historic"
  176 +msgstr "Histórico"
  177 +
  178 +#: views.py:515
  179 +msgid "Webpage"
  180 +msgstr "Nome da Página Web"
  181 +
  182 +#: views.py:516
  183 +msgid "View"
  184 +msgstr "Visualizar"
  185 +
  186 +#: views.py:520
  187 +msgid "Students viewing the webpage"
  188 +msgstr "Estudantes que visualizaram a webpage"
  189 +
  190 +#: views.py:521
  191 +msgid "Quantity"
  192 +msgstr "Quantidade"
... ...
webpage/templates/webpages/relatorios.html
  Diff comments   View file @e3c48c9
... ... @@ -13,7 +13,7 @@
13 13 array_history.push(["{{data_json.0}}","{{data_json.1}}","{{data_json.2}}",{% if data_json.3 is not None %}new Date('{{data_json.3.isoformat}}'){% else%}null{% endif %}]);
14 14 {% endfor%}
15 15 var json_history = {"data":array_history};
16   - var column_history = [{"string":"User"},{"string":"Group"},{"string":"Action"},{"date":"Date of Action"}];
  16 + var column_history = [{"string":'{% trans "User" %}'},{"string":'{% trans "Group" %}'},{"string":'{% trans "Action" %}'},{"date":'{% trans "Date of Action" %}'}];
17 17  
18 18 var search = [];
19 19 for (var i in json_history["data"]){
... ... @@ -27,14 +27,14 @@
27 27 array_did.push(["{{data_json.0}}","{{data_json.1}}","{{data_json.2}}",{% if data_json.3 is not None %}new Date('{{data_json.3.isoformat}}'){% else%}null{% endif %}]);
28 28 {% endfor%}
29 29 var json_did = {"data":array_did};
30   - var column_did = [{"string":"User"},{"string":"Group"},{"string":"Number of Views"},{"date":"Date of Last View"}];
  30 + var column_did = [{"string":'{% trans "User" %}'},{"string":'{% trans "Group" %}'},{"string":'{% trans "Action" %}'},{"date":'{% trans "Date of Action" %}'}];
31 31  
32 32 var array_n_did = [];
33 33 {%for data_json in json_n_did.data%}
34 34 array_n_did.push(["{{data_json.0}}","{{data_json.1}}"]);
35 35 {% endfor%}
36 36 var json_n_did = {"data":array_n_did};
37   - var column_n_did = [{"string":"User"},{"string":"Group"}];
  37 + var column_n_did = [{"string":'{% trans "User" %}'},{"string":'{% trans "Group" %}'}];
38 38 </script>
39 39  
40 40  
... ... @@ -198,7 +198,7 @@
198 198 </li>
199 199 <li>
200 200 <ul class="list-inline text-right">
201   - <li><p>{% trans "Filtro: " %}</p></li>
  201 + <li><p>{% trans "Filter: " %}</p></li>
202 202 <li><input id="search-input" class="form-control" type="text" name="search" value=""></li>
203 203 </ul>
204 204 </li>
... ...
webpage/views.py
  Diff comments   View file @e3c48c9
... ... @@ -475,7 +475,7 @@ class StatisticsView(LoginRequiredMixin, LogMixin, generic.DetailView):
475 475 alunos = webpage.students.all()
476 476  
477 477 vis_ou = Log.objects.filter(context__contains={'webpage_id':webpage.id},resource="webpage",action="view",user_email__in=(aluno.email for aluno in alunos), datetime__range=(start_date,end_date + datetime.timedelta(minutes = 1)))
478   - did,n_did,history = str(_("Users who viewed")),str(_("Users who did not viewed")),str(_("History"))
  478 + did,n_did,history = str(_("Users who viewed")),str(_("Users who did not viewed")),str(_("Historic"))
479 479 re = []
480 480 data_did, data_n_did,data_history = [],[],[]
481 481 json_did, json_n_did, json_history = {},{},{}
... ... @@ -517,7 +517,7 @@ class StatisticsView(LoginRequiredMixin, LogMixin, generic.DetailView):
517 517 context['topic'] = webpage.topic
518 518 context['subject'] = webpage.topic.subject
519 519 context['db_data'] = re
520   - context['title_chart'] = _('Students viewing the web conference')
  520 + context['title_chart'] = _('Students viewing the webpage')
521 521 context['title_vAxis'] = _('Quantity')
522 522  
523 523 context["n_did_table"] = n_did
... ...