fixed translations and some texts as well as general dashboards most active user…

…s and most used tags chart

fixed translations and some texts as well as general dashboards most active user…
…s and most used tags chart
Felipe Bormann
1 parent a3e249ea
Showing 4 changed files with 47 additions and 33 deletions Show diff stats
dashboards/locale/pt_BR/LC_MESSAGES/django.po
dashboards/static/dashboards/js/behavior.js
dashboards/templates/dashboards/category.html
dashboards/templates/dashboards/general.html
@@ -8,7 +8,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-15 21:13-0300\n"
+"POT-Creation-Date: 2017-05-17 15:26-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,36 +18,41 @@ msgstr &quot;&quot;
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
  
-#: .\templates\dashboards\category.html:17
+#: .\templates\dashboards\category.html:18
 msgid "Analytics Category"
 msgstr "Análise de Categoria"
  
-#: .\templates\dashboards\category.html:29
+#: .\templates\dashboards\category.html:31
 #: .\templates\dashboards\general.html:30
 msgid "Platform Report"
 msgstr "Report da Plataforma"
  
-#: .\templates\dashboards\category.html:32
-#: .\templates\dashboards\category.html:44
+#: .\templates\dashboards\category.html:36
+#: .\templates\dashboards\category.html:48
 #: .\templates\dashboards\general.html:33
 msgid "Category Report"
 msgstr "Report da Categoria"
  
-#: .\templates\dashboards\category.html:35
+#: .\templates\dashboards\category.html:39
 #: .\templates\dashboards\general.html:36
 msgid "Subject Report"
 msgstr "Report do Assunto"
  
-#: .\templates\dashboards\category.html:48
+#: .\templates\dashboards\category.html:56
 #: .\templates\dashboards\general.html:49
 msgid "Focus"
 msgstr "Destaques"
  
-#: .\templates\dashboards\category.html:51
+#: .\templates\dashboards\category.html:59
 #: .\templates\dashboards\general.html:52
 msgid "Log"
 msgstr "Log"
  
+#: .\templates\dashboards\category.html:69
+#: .\templates\dashboards\general.html:62
+msgid "most used tags"
+msgstr "tags mais usadas"
+
 #: .\templates\dashboards\general.html:18
 msgid "Dashboards General"
 msgstr "Dashboards Geral"
@@ -56,25 +61,21 @@ msgstr &quot;Dashboards Geral&quot;
 msgid "Amadeus Report"
 msgstr "Report do Amadeus"
  
-#: .\templates\dashboards\general.html:62
-msgid "most used tags"
-msgstr "tags mais usadas"
-
 #: .\templates\dashboards\general.html:72
 msgid "Most accessed "
 msgstr "Mais acessadas"
  
 #: .\templates\dashboards\general.html:77
-msgid "Most accessed categories"
-msgstr "Categorias mais acessadas"
+msgid "Categories"
+msgstr "Categorias"
  
 #: .\templates\dashboards\general.html:81
-msgid "Most accessed subjects"
-msgstr "Assuntos mais acessados"
+msgid "Subjects"
+msgstr "Assuntos"
  
 #: .\templates\dashboards\general.html:85
-msgid "Most accessed resource"
-msgstr "Recursos mais acessados"
+msgid "Resource"
+msgstr "Recursos"
  
 #: .\templates\dashboards\general.html:93
 msgid "Most active users"
@@ -88,50 +89,59 @@ msgstr &quot;Quantidade de acessos em: &quot;
 msgid "Select the begin of the week: "
 msgstr "Selecione o dia da semana: "
  
-#: .\views.py:34
+#: .\views.py:36
 msgid "January"
 msgstr "Janeiro"
  
-#: .\views.py:34
+#: .\views.py:36
 msgid "February"
 msgstr "Fevereiro"
  
-#: .\views.py:34
+#: .\views.py:36
 msgid "March"
 msgstr "Março"
  
-#: .\views.py:34
+#: .\views.py:36
 msgid "April"
 msgstr "Abril"
  
-#: .\views.py:34
+#: .\views.py:36
 msgid "May"
 msgstr "Maio"
  
-#: .\views.py:34
+#: .\views.py:36
 msgid "June"
 msgstr "Junho"
  
-#: .\views.py:34
+#: .\views.py:36
 msgid "July"
 msgstr "Julho"
  
-#: .\views.py:34
+#: .\views.py:36
 msgid "August"
 msgstr "Agosto"
  
-#: .\views.py:35
+#: .\views.py:37
 msgid "September"
 msgstr "Setembro"
  
-#: .\views.py:35
+#: .\views.py:37
 msgid "October"
 msgstr "Outubro"
  
-#: .\views.py:35
+#: .\views.py:37
 msgid "November"
 msgstr "Novembro"
  
-#: .\views.py:35
+#: .\views.py:37
 msgid "December"
 msgstr "Dezembro"
+
+#~ msgid "Most accessed categories"
+#~ msgstr "Categorias mais acessadas"
+
+#~ msgid "Most accessed subjects"
+#~ msgstr "Assuntos mais acessados"
+
+#~ msgid "Most accessed resource"
+#~ msgstr "Recursos mais acessados"
@@ -4,6 +4,9 @@
 $(document).ready(function(){
 	selectors_options.init();
  
+	charts.most_used_tags('/analytics/most_used_tags');
+	charts.build_bubble_user('/analytics/most_active_users/');
+	
  
 	$('#month_selector').change(function(){
 		$.get('/analytics/amount_active_users_per_day', {month: $(this).val() }).done(function(data){
@@ -18,6 +18,7 @@
     {% trans 'Analytics Category' as category %}
  
     {% breadcrumb category 'dashboard:view_general' %}
+
 {% endblock %}
  
  
@@ -74,15 +74,15 @@
  
  
                                 <div class="selector" data-url="categories">
-                                    <p>  {% trans "Most accessed categories" %} </p>
+                                    <p>  {% trans "Categories" %} </p>
                                 </div>
  
                                 <div class="selector" data-url="subjects">
-                                   <p> {% trans "Most accessed subjects" %} </p>
+                                   <p> {% trans "Subjects" %} </p>
                                 </div>
  
                                 <div class="selector" data-url="resources">
-                                   <p> {% trans "Most accessed resource" %} </p>
+                                   <p> {% trans "Resource" %} </p>
                                 </div>
  
                     </div>
...	...	@@ -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-05-15 21:13-0300\n"
	11	+"POT-Creation-Date: 2017-05-17 15:26-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,36 +18,41 @@ msgstr ""
18	18	"Content-Transfer-Encoding: 8bit\n"
19	19	"Plural-Forms: nplurals=2; plural=(n > 1);\n"
20	20
21		-#: .\templates\dashboards\category.html:17
	21	+#: .\templates\dashboards\category.html:18
22	22	msgid "Analytics Category"
23	23	msgstr "Análise de Categoria"
24	24
25		-#: .\templates\dashboards\category.html:29
	25	+#: .\templates\dashboards\category.html:31
26	26	#: .\templates\dashboards\general.html:30
27	27	msgid "Platform Report"
28	28	msgstr "Report da Plataforma"
29	29
30		-#: .\templates\dashboards\category.html:32
31		-#: .\templates\dashboards\category.html:44
	30	+#: .\templates\dashboards\category.html:36
	31	+#: .\templates\dashboards\category.html:48
32	32	#: .\templates\dashboards\general.html:33
33	33	msgid "Category Report"
34	34	msgstr "Report da Categoria"
35	35
36		-#: .\templates\dashboards\category.html:35
	36	+#: .\templates\dashboards\category.html:39
37	37	#: .\templates\dashboards\general.html:36
38	38	msgid "Subject Report"
39	39	msgstr "Report do Assunto"
40	40
41		-#: .\templates\dashboards\category.html:48
	41	+#: .\templates\dashboards\category.html:56
42	42	#: .\templates\dashboards\general.html:49
43	43	msgid "Focus"
44	44	msgstr "Destaques"
45	45
46		-#: .\templates\dashboards\category.html:51
	46	+#: .\templates\dashboards\category.html:59
47	47	#: .\templates\dashboards\general.html:52
48	48	msgid "Log"
49	49	msgstr "Log"
50	50
	51	+#: .\templates\dashboards\category.html:69
	52	+#: .\templates\dashboards\general.html:62
	53	+msgid "most used tags"
	54	+msgstr "tags mais usadas"
	55	+
51	56	#: .\templates\dashboards\general.html:18
52	57	msgid "Dashboards General"
53	58	msgstr "Dashboards Geral"
...	...	@@ -56,25 +61,21 @@ msgstr "Dashboards Geral"
56	61	msgid "Amadeus Report"
57	62	msgstr "Report do Amadeus"
58	63
59		-#: .\templates\dashboards\general.html:62
60		-msgid "most used tags"
61		-msgstr "tags mais usadas"
62		-
63	64	#: .\templates\dashboards\general.html:72
64	65	msgid "Most accessed "
65	66	msgstr "Mais acessadas"
66	67
67	68	#: .\templates\dashboards\general.html:77
68		-msgid "Most accessed categories"
69		-msgstr "Categorias mais acessadas"
	69	+msgid "Categories"
	70	+msgstr "Categorias"
70	71
71	72	#: .\templates\dashboards\general.html:81
72		-msgid "Most accessed subjects"
73		-msgstr "Assuntos mais acessados"
	73	+msgid "Subjects"
	74	+msgstr "Assuntos"
74	75
75	76	#: .\templates\dashboards\general.html:85
76		-msgid "Most accessed resource"
77		-msgstr "Recursos mais acessados"
	77	+msgid "Resource"
	78	+msgstr "Recursos"
78	79
79	80	#: .\templates\dashboards\general.html:93
80	81	msgid "Most active users"
...	...	@@ -88,50 +89,59 @@ msgstr "Quantidade de acessos em: "
88	89	msgid "Select the begin of the week: "
89	90	msgstr "Selecione o dia da semana: "
90	91
91		-#: .\views.py:34
	92	+#: .\views.py:36
92	93	msgid "January"
93	94	msgstr "Janeiro"
94	95
95		-#: .\views.py:34
	96	+#: .\views.py:36
96	97	msgid "February"
97	98	msgstr "Fevereiro"
98	99
99		-#: .\views.py:34
	100	+#: .\views.py:36
100	101	msgid "March"
101	102	msgstr "Março"
102	103
103		-#: .\views.py:34
	104	+#: .\views.py:36
104	105	msgid "April"
105	106	msgstr "Abril"
106	107
107		-#: .\views.py:34
	108	+#: .\views.py:36
108	109	msgid "May"
109	110	msgstr "Maio"
110	111
111		-#: .\views.py:34
	112	+#: .\views.py:36
112	113	msgid "June"
113	114	msgstr "Junho"
114	115
115		-#: .\views.py:34
	116	+#: .\views.py:36
116	117	msgid "July"
117	118	msgstr "Julho"
118	119
119		-#: .\views.py:34
	120	+#: .\views.py:36
120	121	msgid "August"
121	122	msgstr "Agosto"
122	123
123		-#: .\views.py:35
	124	+#: .\views.py:37
124	125	msgid "September"
125	126	msgstr "Setembro"
126	127
127		-#: .\views.py:35
	128	+#: .\views.py:37
128	129	msgid "October"
129	130	msgstr "Outubro"
130	131
131		-#: .\views.py:35
	132	+#: .\views.py:37
132	133	msgid "November"
133	134	msgstr "Novembro"
134	135
135		-#: .\views.py:35
	136	+#: .\views.py:37
136	137	msgid "December"
137	138	msgstr "Dezembro"
	139	+
	140	+#~ msgid "Most accessed categories"
	141	+#~ msgstr "Categorias mais acessadas"
	142	+
	143	+#~ msgid "Most accessed subjects"
	144	+#~ msgstr "Assuntos mais acessados"
	145	+
	146	+#~ msgid "Most accessed resource"
	147	+#~ msgstr "Recursos mais acessados"
...	...
...	...	@@ -4,6 +4,9 @@
4	4	$(document).ready(function(){
5	5	selectors_options.init();
6	6
	7	+ charts.most_used_tags('/analytics/most_used_tags');
	8	+ charts.build_bubble_user('/analytics/most_active_users/');
	9	+
7	10
8	11	$('#month_selector').change(function(){
9	12	$.get('/analytics/amount_active_users_per_day', {month: $(this).val() }).done(function(data){
...	...
...	...	@@ -18,6 +18,7 @@
18	18	{% trans 'Analytics Category' as category %}
19	19
20	20	{% breadcrumb category 'dashboard:view_general' %}
	21	+
21	22	{% endblock %}
22	23
23	24
...	...
...	...	@@ -74,15 +74,15 @@
74	74
75	75
76	76	<div class="selector" data-url="categories">
77		- <p> {% trans "Most accessed categories" %} </p>
	77	+ <p> {% trans "Categories" %} </p>
78	78	</div>
79	79
80	80	<div class="selector" data-url="subjects">
81		- <p> {% trans "Most accessed subjects" %} </p>
	81	+ <p> {% trans "Subjects" %} </p>
82	82	</div>
83	83
84	84	<div class="selector" data-url="resources">
85		- <p> {% trans "Most accessed resource" %} </p>
	85	+ <p> {% trans "Resource" %} </p>
86	86	</div>
87	87
88	88	</div>
...	...