From cb160cfebad239f9347ff1d60642ffb6df46bc51 Mon Sep 17 00:00:00 2001 From: Felipe Bormann Date: Wed, 17 May 2017 15:29:11 -0300 Subject: [PATCH] fixed translations and some texts as well as general dashboards most active users and most used tags chart --- dashboards/locale/pt_BR/LC_MESSAGES/django.po | 70 ++++++++++++++++++++++++++++++++++++++++------------------------------ dashboards/static/dashboards/js/behavior.js | 3 +++ dashboards/templates/dashboards/category.html | 1 + dashboards/templates/dashboards/general.html | 6 +++--- 4 files changed, 47 insertions(+), 33 deletions(-) diff --git a/dashboards/locale/pt_BR/LC_MESSAGES/django.po b/dashboards/locale/pt_BR/LC_MESSAGES/django.po index 006b020..0062801 100644 --- a/dashboards/locale/pt_BR/LC_MESSAGES/django.po +++ b/dashboards/locale/pt_BR/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" 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 \n" "Language-Team: LANGUAGE \n" @@ -18,36 +18,41 @@ msgstr "" "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 "Dashboards Geral" 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 "Quantidade de acessos em: " 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" diff --git a/dashboards/static/dashboards/js/behavior.js b/dashboards/static/dashboards/js/behavior.js index 412bec8..293a45f 100644 --- a/dashboards/static/dashboards/js/behavior.js +++ b/dashboards/static/dashboards/js/behavior.js @@ -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){ diff --git a/dashboards/templates/dashboards/category.html b/dashboards/templates/dashboards/category.html index d052fe6..8243be3 100644 --- a/dashboards/templates/dashboards/category.html +++ b/dashboards/templates/dashboards/category.html @@ -18,6 +18,7 @@ {% trans 'Analytics Category' as category %} {% breadcrumb category 'dashboard:view_general' %} + {% endblock %} diff --git a/dashboards/templates/dashboards/general.html b/dashboards/templates/dashboards/general.html index 3ca3d9b..71e3797 100644 --- a/dashboards/templates/dashboards/general.html +++ b/dashboards/templates/dashboards/general.html @@ -74,15 +74,15 @@
-

{% trans "Most accessed categories" %}

+

{% trans "Categories" %}

-

{% trans "Most accessed subjects" %}

+

{% trans "Subjects" %}

-

{% trans "Most accessed resource" %}

+

{% trans "Resource" %}

-- libgit2 0.21.2