From 4e668fd062c9bfb185d03465b3abf071f86c4d9c Mon Sep 17 00:00:00 2001
From: Anton Romanov <romanov73@gmail.com>
Date: Fri, 20 Aug 2021 15:41:55 +0400
Subject: [PATCH] #9 -- fix messages

---
 src/main/resources/messages.properties    |  9 ++++++++-
 src/main/resources/messages_en.properties |  9 ++++++++-
 src/main/resources/messages_ru.properties |  9 ++++++++-
 src/main/resources/templates/index.html   | 22 +++++++++++++++-------
 4 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/src/main/resources/messages.properties b/src/main/resources/messages.properties
index 6ada86a..fa6f94f 100644
--- a/src/main/resources/messages.properties
+++ b/src/main/resources/messages.properties
@@ -4,4 +4,11 @@
 #
 #
 messages.app-name=Time Series Smoothing
-messages.menu.home=Main
\ No newline at end of file
+messages.menu.home=Main
+messages.time_series_forecast=Time series forecast
+messages.date=Date
+messages.value=Value
+messages.time_series_test_forecast=Test forecast
+messages.time_series_model=Model
+messages.time_series=Time series
+messages.time_series_forecast_short=Forecast
\ No newline at end of file
diff --git a/src/main/resources/messages_en.properties b/src/main/resources/messages_en.properties
index 6ada86a..fa6f94f 100644
--- a/src/main/resources/messages_en.properties
+++ b/src/main/resources/messages_en.properties
@@ -4,4 +4,11 @@
 #
 #
 messages.app-name=Time Series Smoothing
-messages.menu.home=Main
\ No newline at end of file
+messages.menu.home=Main
+messages.time_series_forecast=Time series forecast
+messages.date=Date
+messages.value=Value
+messages.time_series_test_forecast=Test forecast
+messages.time_series_model=Model
+messages.time_series=Time series
+messages.time_series_forecast_short=Forecast
\ No newline at end of file
diff --git a/src/main/resources/messages_ru.properties b/src/main/resources/messages_ru.properties
index 53783c6..2998898 100644
--- a/src/main/resources/messages_ru.properties
+++ b/src/main/resources/messages_ru.properties
@@ -4,4 +4,11 @@
 #
 #
 messages.app-name=Time Series Smoothing
-messages.menu.home=На главную
\ No newline at end of file
+messages.menu.home=На главную
+messages.time_series_forecast=Прогноз временного ряда
+messages.date=Дата
+messages.value=Уровень
+messages.time_series_test_forecast=Тестовый прогноз
+messages.time_series_model=Модель
+messages.time_series=Временной ряд
+messages.time_series_forecast_short=Прогноз
\ No newline at end of file
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
index f6c2f8b..bd9bccf 100644
--- a/src/main/resources/templates/index.html
+++ b/src/main/resources/templates/index.html
@@ -16,14 +16,21 @@
     <script src="/webjars/highcharts/7.0.0/highcharts.js"></script>
     <script th:inline="javascript" th:if="${timeSeries != null}">
         $(document).ready(function () {
+            var chart = {
+                renderTo: 'container',
+                style: {
+                    fontFamily: 'arial'
+                }
+            };
+
             var title = {
-                text: 'Прогноз временного ряда'
+                text: [[#{messages.time_series_forecast}]]
             };
             var xAxis = {
                 categories: [[${dates}]],
                 title: {
                     enabled: true,
-                    text: 'Дата'
+                    text: [[#{messages.date}]]
                 },
                 startOnTick: true,
                 endOnTick: true,
@@ -31,7 +38,7 @@
             };
             var yAxis = {
                 title: {
-                    text: 'Уровень'
+                    text: [[#{messages.value}]]
                 }
             };
             var plotOptions = {
@@ -60,28 +67,29 @@
             };
             var series = [
                 {
-                    name: 'Временной ряд',
+                    name: [[#{messages.time_series}]],
                     color: 'rgba(119,152,191,0.5)',
                     data: [[${timeSeries}]]
                 },
                 {
-                    name: 'Модель',
+                    name: [[#{messages.time_series_model}]],
                     color: 'rgba(255,200,0,0.5)',
                     data: [[${model}]]
                 },
                 {
-                    name: 'Тестовый прогноз',
+                    name: [[#{messages.time_series_test_forecast}]],
                     color: 'rgba(255,0,0,0.5)',
                     data: [[${testForecast}]]
                 },
                 {
-                    name: 'Прогноз',
+                    name: [[#{messages.time_series_forecast_short}]],
                     color: 'rgba(255,0,0,0.5)',
                     data: [[${forecast}]]
                 }
             ];
 
             var json = {};
+            json.chart = chart;
             json.title = title;
             json.xAxis = xAxis;
             json.yAxis = yAxis;