Kleinigheidje: missende vertalingen #497

dsmr_frontend/static/dsmr_frontend/js/dsmr-reader/dashboard/electricity.js

@@ -72,7 +72,7 @@ $(document).ready(function(){
     };
 
 
-	echarts_electricity_graph.showLoading();
+	echarts_electricity_graph.showLoading('default', echarts_loading_options);
 
 	/* Init graph. */
 	$.get(echarts_electricity_graph_url, function (xhr_data) {

dsmr_frontend/static/dsmr_frontend/js/dsmr-reader/dashboard/gas.js

@@ -1,7 +1,7 @@
 $(document).ready(function(){
 
 	var echarts_gas_graph = echarts.init(document.getElementById('echarts-gas-graph'));
-	echarts_gas_graph.showLoading();
+	echarts_gas_graph.showLoading('default', echarts_loading_options);
 
 	/* Init graph. */
 	$.get(echarts_gas_graph_url, function (xhr_data) {

dsmr_frontend/static/dsmr_frontend/js/dsmr-reader/dashboard/phases.js

@@ -80,7 +80,7 @@ $(document).ready(function(){
         ]
     };
 
-	echarts_phases_graph.showLoading();
+	echarts_phases_graph.showLoading('default', echarts_loading_options);
 
 	/* Init graph. */
 	$.get(echarts_phases_graph_url, function (xhr_data) {

dsmr_frontend/static/dsmr_frontend/js/dsmr-reader/dashboard/temperature.js

@@ -1,7 +1,7 @@
 $(document).ready(function(){
 
 	var echarts_temperature_graph = echarts.init(document.getElementById('echarts-temperature-graph'));
-	echarts_temperature_graph.showLoading();
+	echarts_temperature_graph.showLoading('default', echarts_loading_options);
 
 	/* Init graph. */
 	$.get(echarts_temperature_graph_url, function (xhr_data) {

dsmr_frontend/static/dsmr_frontend/js/dsmr-reader/trends/tariff.js

@@ -21,8 +21,10 @@ $(document).ready(function(){
         ]
     };
 
-	echarts_electricity_by_tariff_week_graph.showLoading();
-	echarts_electricity_by_tariff_month_graph.showLoading();
+
+
+	echarts_electricity_by_tariff_week_graph.showLoading('default', echarts_loading_options);
+	echarts_electricity_by_tariff_month_graph.showLoading('default', echarts_loading_options);
 
 	/* Init graphs. */
 	$.get(echarts_by_tariff_url, function (xhr_data) {

dsmr_frontend/templates/dsmr_frontend/dashboard.html

@@ -218,6 +218,7 @@
 
     <script type="text/javascript">
         var dashboard_graph_width = {{ frontend_settings.dashboard_graph_width }};
+        var echarts_loading_options = {text: '{% blocktrans %}Loading...{% endblocktrans %}'};
     </script>
 
     <script type="text/javascript" src="{% static 'dsmr_frontend/js/echarts/echarts-common-4.1.0.rc2.min.js' %}"></script>

dsmr_frontend/templates/dsmr_frontend/trends.html

@@ -103,6 +103,7 @@
     <script type="text/javascript">
         var echarts_avg_consumption_url = "{% url 'frontend:trends-xhr-avg-consumption' %}";
         var echarts_by_tariff_url = "{% url 'frontend:trends-xhr-consumption-by-tariff' %}";
+        var echarts_loading_options = {text: '{% blocktrans %}Loading...{% endblocktrans %}'};
 
         var electricity_delivered_color = "{{ frontend_settings.electricity_delivered_color }}";
         var electricity_delivered_alternate_color = "{{ frontend_settings.electricity_delivered_alternate_color }}";

dsmr_frontend/tests/webinterface/test_trends.py

@@ -83,10 +83,10 @@ def test_trends_xhr_by_tariff(self, now_mock):
 
         self.assertIn('week', json_response)
         self.assertIn('month', json_response)
-        self.assertIn({'value': 84, 'name': 'electricity1'}, json_response['week'])
-        self.assertIn({'value': 16, 'name': 'electricity2'}, json_response['week'])
-        self.assertIn({'value': 84, 'name': 'electricity1'}, json_response['month'])
-        self.assertIn({'value': 16, 'name': 'electricity2'}, json_response['month'])
+        self.assertIn({'value': 84, 'name': 'Electricity 1 (low tariff)'}, json_response['week'])
+        self.assertIn({'value': 16, 'name': 'Electricity 2 (high tariff)'}, json_response['week'])
+        self.assertIn({'value': 84, 'name': 'Electricity 1 (low tariff)'}, json_response['month'])
+        self.assertIn({'value': 16, 'name': 'Electricity 2 (high tariff)'}, json_response['month'])
 
 
 class TestViewsWithoutData(TestViews):

dsmr_frontend/views/trends.py

@@ -1,6 +1,7 @@
 import json
 
 from django.views.generic.base import TemplateView, View
+from django.utils.translation import ugettext as _
 from django.http.response import HttpResponse
 from django.utils import timezone
 from dateutil.relativedelta import relativedelta
@@ -67,6 +68,10 @@ class TrendsXhrElectricityByTariff(View):
     def get(self, request):  # noqa: C901
         capabilities = dsmr_backend.services.get_capabilities()
         data = {}
+        translation_mapping = {
+            'electricity1': _('Electricity 1 (low tariff)'),
+            'electricity2': _('Electricity 2 (high tariff)'),
+        }
 
         if not capabilities['any']:
             return HttpResponse(json.dumps(data), content_type='application/json')
@@ -76,12 +81,12 @@ def get(self, request):  # noqa: C901
         month_date = now.date() - relativedelta(months=1)
 
         data['week'] = [
-            {'name': k, 'value': v}
+            {'name': translation_mapping[k], 'value': v}
             for k, v in
             dsmr_stats.services.electricity_tariff_percentage(start_date=week_date).items()
         ]
         data['month'] = [
-            {'name': k, 'value': v}
+            {'name': translation_mapping[k], 'value': v}
             for k, v in
             dsmr_stats.services.electricity_tariff_percentage(start_date=month_date).items()
         ]

dsmrreader/locales/nl/LC_MESSAGES/django.po

@@ -15,8 +15,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.8.7.1\n"
 "X-Poedit-SourceCharset: UTF-8\n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
 
 msgid "API"
 msgstr "API"
@@ -639,6 +637,9 @@ msgstr "Recent gasverbruik (m<sup>3</sup>) in de afgelopen 24 uur"
 msgid "Recent temperatures (&deg;C) in the past 24 hours"
 msgstr "Recente temperatuurmetingen (&deg;C) in de afgelopen 24 uur"
 
+msgid "Loading..."
+msgstr "Bezig met laden..."
+
 msgid "per hour"
 msgstr "per uur"
 
@@ -1638,6 +1639,16 @@ msgstr "Nederlands"
 msgid "English"
 msgstr "Engels"
 
+#, fuzzy
+#~| msgid "Electricity"
+#~ msgid "Electricity 1"
+#~ msgstr "Elektriciteit"
+
+#, fuzzy
+#~| msgid "Electricity"
+#~ msgid "Electricity 2"
+#~ msgstr "Elektriciteit"
+
 #~ msgid "Display electricity phases"
 #~ msgstr "Toon elektriciteitsfasen"