Download as
Browse Code »

Commit c1c5ed668bfd1351b25d3652cc368a1ba59cb879

Authored by fbormann
1 parent 59c770e2
Exists in master and in 3 other branches amadeus_univasf, image-crop, refactoring

updated translation and GUI

Showing 4 changed files with 48 additions and 38 deletions   Show diff stats
amadeus/static/css/base/amadeus.css
  Diff comments   View file @c1c5ed6
... ... @@ -448,6 +448,7 @@ a:focus {
448 448 padding-bottom: 200px;
449 449 }
450 450 .panel-info{
  451 + margin-top: 10px;
451 452 }
452 453 .panel-default{
453 454 }
... ...
reports/forms.py
  Diff comments   View file @c1c5ed6
... ... @@ -33,12 +33,12 @@ class ResourceAndTagForm(forms.Form):
33 33  
34 34  
35 35 class CreateInteractionReportForm(forms.Form):
36   - topic = forms.ChoiceField( label= _("Topics to select data from"))
37   - init_date = forms.DateField()
38   - end_date = forms.DateField()
  36 + topic = forms.ChoiceField( label= _("Topics to select data from"), required=True)
  37 + init_date = forms.DateField(required=True)
  38 + end_date = forms.DateField(required=True)
39 39  
40   - from_mural = forms.BooleanField(required=False)
41   - from_messages = forms.BooleanField(required=False)
  40 + from_mural = forms.BooleanField(required=False, label=_("From Mural"))
  41 + from_messages = forms.BooleanField(required=False, label=_("Messages"))
42 42  
43 43 class Meta:
44 44 fields = ('topic', 'init_date', 'end_date', 'from_mural' , 'from_messages')
... ...
reports/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @c1c5ed6
... ... @@ -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-03-16 15:36-0300\n"
  11 +"POT-Creation-Date: 2017-03-16 16:47-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"
... ... @@ -30,6 +30,14 @@ msgstr &quot;Tag&quot;
30 30 msgid "Topics to select data from"
31 31 msgstr "Tópico do qual os dados serão retirados"
32 32  
  33 +#: forms.py:40
  34 +msgid "From Mural"
  35 +msgstr "Mural da disciplina"
  36 +
  37 +#: forms.py:41
  38 +msgid "Messages"
  39 +msgstr "Mensagens"
  40 +
33 41 #: forms.py:52
34 42 msgid "All"
35 43 msgstr "Todos"
... ... @@ -68,11 +76,19 @@ msgstr &quot;Dados de Interação&quot;
68 76  
69 77 #: templates/reports/create.html:40 templates/reports/view.html:46
70 78 msgid "Report Card"
71   -msgstr "Boletim"
  79 +msgstr "Boletim da Etapa"
72 80  
73 81 #: templates/reports/create.html:43 templates/reports/view.html:49
74 82 msgid "Participation"
75   -msgstr "Participação"
  83 +msgstr "Participações"
  84 +
  85 +#: templates/reports/create.html:55
  86 +msgid "add data source"
  87 +msgstr "Adicionar nova fonte de dados"
  88 +
  89 +#: templates/reports/create.html:56
  90 +msgid "remove data source"
  91 +msgstr "Remover esta fonte"
76 92  
77 93 #: templates/reports/view.html:56
78 94 msgid "Subject"
... ... @@ -164,34 +180,6 @@ msgid &quot;Number of access to mural between 0 a.m to 6a.m. .&quot;
164 180 msgstr ""
165 181 "Número de acessos ao ambiente virtual da disciplina no horário de 24h às 06h."
166 182  
167   -#: views.py:233
168   -msgid "sunday"
169   -msgstr "domingo"
170   -
171   -#: views.py:233
172   -msgid "monday"
173   -msgstr "segunda-feira"
174   -
175   -#: views.py:233
176   -msgid "tuesday"
177   -msgstr "terça-feira"
178   -
179   -#: views.py:233
180   -msgid "wednesday"
181   -msgstr "quarta-feira"
182   -
183   -#: views.py:233
184   -msgid "thursday"
185   -msgstr "quinta-feira"
186   -
187   -#: views.py:233
188   -msgid "friday"
189   -msgstr "sexta-feira"
190   -
191   -#: views.py:233
192   -msgid "saturday"
193   -msgstr "sábado"
194   -
195 183 #: views.py:236 views.py:239
196 184 msgid "Number of access to the subject on "
197 185 msgstr "Número de acesso ao subject no "
... ... @@ -207,3 +195,24 @@ msgstr &quot;Classe&quot;
207 195 #: views.py:244
208 196 msgid "Performance"
209 197 msgstr "Desempenho"
  198 +
  199 +#~ msgid "sunday"
  200 +#~ msgstr "domingo"
  201 +
  202 +#~ msgid "monday"
  203 +#~ msgstr "segunda-feira"
  204 +
  205 +#~ msgid "tuesday"
  206 +#~ msgstr "terça-feira"
  207 +
  208 +#~ msgid "wednesday"
  209 +#~ msgstr "quarta-feira"
  210 +
  211 +#~ msgid "thursday"
  212 +#~ msgstr "quinta-feira"
  213 +
  214 +#~ msgid "friday"
  215 +#~ msgstr "sexta-feira"
  216 +
  217 +#~ msgid "saturday"
  218 +#~ msgstr "sábado"
... ...
reports/templates/reports/create.html
  Diff comments   View file @c1c5ed6
... ... @@ -52,8 +52,8 @@
52 52  
53 53  
54 54 $('.resource-tag-formset').formset({
55   - addText: 'add data source',
56   - deleteText: 'remove data source',
  55 + addText: "{% trans "add data source" %}",
  56 + deleteText: "{% trans "remove data source" %}",
57 57 added: function(object){
58 58 var form_topic = $("select#id_topic :selected").filter(":selected").val(); //get user selected topic option
59 59  
... ...