Remove duplicated labels

jet/dashboard/dashboard_modules/google_analytics.py

@@ -7,6 +7,7 @@ from django.forms import Widget
 from django.utils import formats
 from django.utils.html import format_html
 from django.utils.safestring import mark_safe
+from django.utils.text import capfirst
 from googleapiclient.discovery import build
 import httplib2
 from jet.dashboard.modules import DashboardModule
@@ -185,9 +186,9 @@ class GoogleAnalyticsSettingsForm(forms.Form):
 
 class GoogleAnalyticsChartSettingsForm(GoogleAnalyticsSettingsForm):
     show = forms.ChoiceField(label=_('Show'), choices=(
-        ('ga:users', _('Users')),
-        ('ga:sessions', _('Sessions')),
-        ('ga:pageviews', _('Views')),
+        ('ga:users', capfirst(_('users'))),
+        ('ga:sessions', capfirst(_('sessions'))),
+        ('ga:pageviews', capfirst(_('views'))),
     ))
     group = forms.ChoiceField(label=_('Group'), choices=(
         ('day', _('By day')),

jet/dashboard/dashboard_modules/yandex_metrika.py

@@ -7,6 +7,7 @@ from django.forms import Widget
 from django.utils import formats
 from django.utils.html import format_html
 from django.utils.safestring import mark_safe
+from django.utils.text import capfirst
 from jet.dashboard.modules import DashboardModule
 from django.utils.translation import ugettext_lazy as _
 from django.conf import settings
@@ -140,9 +141,9 @@ class YandexMetrikaSettingsForm(forms.Form):
 
 class YandexMetrikaChartSettingsForm(YandexMetrikaSettingsForm):
     show = forms.ChoiceField(label=_('Show'), choices=(
-        ('visitors', _('Visitors')),
-        ('visits', _('Visits')),
-        ('page_views', _('Views')),
+        ('visitors', capfirst(_('visitors'))),
+        ('visits', capfirst(_('visits'))),
+        ('page_views', capfirst(_('Views'))),
     ))
     group = forms.ChoiceField(label=_('Group'), choices=(
         ('day', _('By day')),

jet/dashboard/locale/en/LC_MESSAGES/django.po

@@ -199,23 +199,6 @@ msgstr ""
 msgid "Show"
 msgstr ""
 
-#: dashboard/dashboard_modules/google_analytics.py:188
-#: dashboard/templates/jet.dashboard/modules/google_analytics_period_visitors.html:15
-msgid "Users"
-msgstr ""
-
-#: dashboard/dashboard_modules/google_analytics.py:189
-#: dashboard/templates/jet.dashboard/modules/google_analytics_period_visitors.html:16
-msgid "Sessions"
-msgstr ""
-
-#: dashboard/dashboard_modules/google_analytics.py:190
-#: dashboard/dashboard_modules/yandex_metrika.py:145
-#: dashboard/templates/jet.dashboard/modules/google_analytics_period_visitors.html:17
-#: dashboard/templates/jet.dashboard/modules/yandex_metrika_period_visitors.html:17
-msgid "Views"
-msgstr ""
-
 #: dashboard/dashboard_modules/google_analytics.py:192
 #: dashboard/dashboard_modules/google_analytics.py:200
 #: dashboard/dashboard_modules/yandex_metrika.py:147
@@ -275,14 +258,22 @@ msgstr ""
 msgid "Google Analytics visitors totals"
 msgstr ""
 
+#: dashboard/dashboard_modules/google_analytics.py:188
+#: dashboard/templates/jet.dashboard/modules/google_analytics_period_visitors.html:15
 #: dashboard/dashboard_modules/google_analytics.py:325
 msgid "users"
 msgstr ""
 
+#: dashboard/dashboard_modules/google_analytics.py:189
+#: dashboard/templates/jet.dashboard/modules/google_analytics_period_visitors.html:16
 #: dashboard/dashboard_modules/google_analytics.py:326
 msgid "sessions"
 msgstr ""
 
+#: dashboard/dashboard_modules/google_analytics.py:190
+#: dashboard/dashboard_modules/yandex_metrika.py:145
+#: dashboard/templates/jet.dashboard/modules/google_analytics_period_visitors.html:17
+#: dashboard/templates/jet.dashboard/modules/yandex_metrika_period_visitors.html:17
 #: dashboard/dashboard_modules/google_analytics.py:327
 #: dashboard/dashboard_modules/yandex_metrika.py:266
 msgid "views"
@@ -317,16 +308,6 @@ msgstr ""
 msgid "Bad arguments"
 msgstr ""
 
-#: dashboard/dashboard_modules/yandex_metrika.py:143
-#: dashboard/templates/jet.dashboard/modules/yandex_metrika_period_visitors.html:15
-msgid "Visitors"
-msgstr ""
-
-#: dashboard/dashboard_modules/yandex_metrika.py:144
-#: dashboard/templates/jet.dashboard/modules/yandex_metrika_period_visitors.html:16
-msgid "Visits"
-msgstr ""
-
 #: dashboard/dashboard_modules/yandex_metrika.py:218
 #, python-format
 msgid ""
@@ -344,10 +325,14 @@ msgstr ""
 msgid "Yandex Metrika visitors totals"
 msgstr ""
 
+#: dashboard/dashboard_modules/yandex_metrika.py:143
+#: dashboard/templates/jet.dashboard/modules/yandex_metrika_period_visitors.html:15
 #: dashboard/dashboard_modules/yandex_metrika.py:264
 msgid "visitors"
 msgstr ""
 
+#: dashboard/dashboard_modules/yandex_metrika.py:144
+#: dashboard/templates/jet.dashboard/modules/yandex_metrika_period_visitors.html:16
 #: dashboard/dashboard_modules/yandex_metrika.py:265
 msgid "visits"
 msgstr ""

jet/dashboard/locale/ru/LC_MESSAGES/django.po

@@ -199,23 +199,6 @@ msgstr "не удалось загрузить счетчики"
 msgid "Show"
 msgstr "Показывать"
 
-#: dashboard/dashboard_modules/google_analytics.py:188
-#: dashboard/templates/jet.dashboard/modules/google_analytics_period_visitors.html:15
-msgid "Users"
-msgstr "Пользователи"
-
-#: dashboard/dashboard_modules/google_analytics.py:189
-#: dashboard/templates/jet.dashboard/modules/google_analytics_period_visitors.html:16
-msgid "Sessions"
-msgstr "Сессии"
-
-#: dashboard/dashboard_modules/google_analytics.py:190
-#: dashboard/dashboard_modules/yandex_metrika.py:145
-#: dashboard/templates/jet.dashboard/modules/google_analytics_period_visitors.html:17
-#: dashboard/templates/jet.dashboard/modules/yandex_metrika_period_visitors.html:17
-msgid "Views"
-msgstr "Просмотры"
-
 #: dashboard/dashboard_modules/google_analytics.py:192
 #: dashboard/dashboard_modules/google_analytics.py:200
 #: dashboard/dashboard_modules/yandex_metrika.py:147
@@ -278,14 +261,22 @@ msgstr " Попробуйте <a href=\"%s\">убрать и предостав
 msgid "Google Analytics visitors totals"
 msgstr "Данные о посещениях Google Analytics"
 
+#: dashboard/dashboard_modules/google_analytics.py:188
+#: dashboard/templates/jet.dashboard/modules/google_analytics_period_visitors.html:15
 #: dashboard/dashboard_modules/google_analytics.py:325
 msgid "users"
 msgstr "пользователи"
 
+#: dashboard/dashboard_modules/google_analytics.py:189
+#: dashboard/templates/jet.dashboard/modules/google_analytics_period_visitors.html:16
 #: dashboard/dashboard_modules/google_analytics.py:326
 msgid "sessions"
 msgstr "сессии"
 
+#: dashboard/dashboard_modules/google_analytics.py:190
+#: dashboard/dashboard_modules/yandex_metrika.py:145
+#: dashboard/templates/jet.dashboard/modules/google_analytics_period_visitors.html:17
+#: dashboard/templates/jet.dashboard/modules/yandex_metrika_period_visitors.html:17
 #: dashboard/dashboard_modules/google_analytics.py:327
 #: dashboard/dashboard_modules/yandex_metrika.py:266
 msgid "views"
@@ -320,16 +311,6 @@ msgstr "Модуль не найден"
 msgid "Bad arguments"
 msgstr "Некорректные аргументы"
 
-#: dashboard/dashboard_modules/yandex_metrika.py:143
-#: dashboard/templates/jet.dashboard/modules/yandex_metrika_period_visitors.html:15
-msgid "Visitors"
-msgstr "Посетители"
-
-#: dashboard/dashboard_modules/yandex_metrika.py:144
-#: dashboard/templates/jet.dashboard/modules/yandex_metrika_period_visitors.html:16
-msgid "Visits"
-msgstr "Визиты"
-
 #: dashboard/dashboard_modules/yandex_metrika.py:218
 #, python-format
 msgid ""
@@ -350,10 +331,14 @@ msgstr ""
 msgid "Yandex Metrika visitors totals"
 msgstr "Данные о посещениях Яндекс Метрики"
 
+#: dashboard/dashboard_modules/yandex_metrika.py:143
+#: dashboard/templates/jet.dashboard/modules/yandex_metrika_period_visitors.html:15
 #: dashboard/dashboard_modules/yandex_metrika.py:264
 msgid "visitors"
 msgstr "посетители"
 
+#: dashboard/dashboard_modules/yandex_metrika.py:144
+#: dashboard/templates/jet.dashboard/modules/yandex_metrika_period_visitors.html:16
 #: dashboard/dashboard_modules/yandex_metrika.py:265
 msgid "visits"
 msgstr "визиты"

jet/dashboard/templates/jet.dashboard/modules/google_analytics_period_visitors.html

@@ -12,9 +12,9 @@
         <thead>
             <tr>
                 <th>{% trans "Date" %}</th>
-                <th>{% trans "Users" %}</th>
-                <th>{% trans "Sessions" %}</th>
-                <th>{% trans "Views" %}</th>
+                <th>{% trans "users" as label %}{{ label|capfirst }}</th>
+                <th>{% trans "sessions" as label %}{{ label|capfirst }}</th>
+                <th>{% trans "views" as label %}{{ label|capfirst }}</th>
             </tr>
         </thead>
         <tbody>

jet/dashboard/templates/jet.dashboard/modules/yandex_metrika_period_visitors.html

@@ -12,9 +12,9 @@
         <thead>
             <tr>
                 <th>{% trans "Date" %}</th>
-                <th>{% trans "Visitors" %}</th>
-                <th>{% trans "Visits" %}</th>
-                <th>{% trans "Views" %}</th>
+                <th>{% trans "visitors" as label %}{{ label|capfirst }}</th>
+                <th>{% trans "visits" as label %}{{ label|capfirst }}</th>
+                <th>{% trans "views" as label %}{{ label|capfirst }}</th>
             </tr>
         </thead>
         <tbody>