From 170add8989b7148e5742f58925c64466e5264311 Mon Sep 17 00:00:00 2001 From: Risto Lahtela <24460436+AuroraLS3@users.noreply.github.com> Date: Sat, 3 Jul 2021 08:46:30 +0300 Subject: [PATCH] lowercase loadServerPie in javascript to prevent locale replacement Affects issues: - Fixed #1954 --- .../src/main/resources/assets/plan/web/js/network-values.js | 3 ++- .../src/main/resources/assets/plan/web/js/server-values.js | 1 + Plan/common/src/main/resources/assets/plan/web/network.html | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Plan/common/src/main/resources/assets/plan/web/js/network-values.js b/Plan/common/src/main/resources/assets/plan/web/js/network-values.js index 14f6ffa8e..3360fb5d6 100644 --- a/Plan/common/src/main/resources/assets/plan/web/js/network-values.js +++ b/Plan/common/src/main/resources/assets/plan/web/js/network-values.js @@ -373,7 +373,8 @@ function loadHourlyUniqueAndNewGraph(json, error) { } } -function loadServerPie(json, error) { +// Lowercase due to locale translation: Server +function loadserverPie(json, error) { if (json) { serverPieSeries = { name: 'Server Playtime', diff --git a/Plan/common/src/main/resources/assets/plan/web/js/server-values.js b/Plan/common/src/main/resources/assets/plan/web/js/server-values.js index 5d7eed003..62cadcea6 100644 --- a/Plan/common/src/main/resources/assets/plan/web/js/server-values.js +++ b/Plan/common/src/main/resources/assets/plan/web/js/server-values.js @@ -47,6 +47,7 @@ function displayError(element, error) { } /* This function loads Server Overview tab */ +// Lowercase due to locale translation: Server function loadserverOverviewValues(json, error) { const tab = document.getElementById('server-overview'); diff --git a/Plan/common/src/main/resources/assets/plan/web/network.html b/Plan/common/src/main/resources/assets/plan/web/network.html index 553c084fc..a5a726040 100644 --- a/Plan/common/src/main/resources/assets/plan/web/network.html +++ b/Plan/common/src/main/resources/assets/plan/web/network.html @@ -924,7 +924,7 @@ refreshingJsonRequest("./v1/graph?type=playersOnline&server=${serverUUID}", loadPlayersOnlineGraph, 'network-overview', true); refreshingJsonRequest("./v1/graph?type=uniqueAndNew", loadUniqueAndNewGraph, 'network-overview'); refreshingJsonRequest("./v1/graph?type=hourlyUniqueAndNew", loadHourlyUniqueAndNewGraph, 'network-overview'); - refreshingJsonRequest("./v1/graph?type=serverPie", loadServerPie, 'sessions-overview'); + refreshingJsonRequest("./v1/graph?type=serverPie", loadserverPie, 'sessions-overview'); refreshingJsonRequest("./v1/graph?type=joinAddressPie", loadJoinAddressPie, 'playerbase-overview'); refreshingJsonRequest("./v1/graph?type=activity", loadActivityGraphs, 'playerbase-overview'); refreshingJsonRequest("./v1/graph?type=geolocation", loadGeolocationGraph, 'geolocations');