Skip to content

Commit 9d9883c

Browse files
AuroraLS3AuroraLS3
committed
Translate more stuff
- Geolocation tooltip on world map - Lots of time amounts in Online overview, Playerbase overview, Session insights, Performance as Numbers - Ping 'ms'
1 parent dc3b9ae commit 9d9883c

25 files changed

+150
-133
lines changed

‎Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/JSONFactory.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,6 @@ public Map<String, Object> serversAsJSONMaps() {
272272
long weekAgo = now - TimeUnit.DAYS.toMillis(7L);
273273

274274
Formatter<Double> decimals = formatters.decimals();
275-
Formatter<Long> timeAmount = formatters.timeAmount();
276275

277276
Map<ServerUUID, Server> serverInformation = db.query(ServerQueries.fetchPlanServerInformation());
278277
ServerUUID proxyUUID = serverInformation.values().stream()
@@ -322,8 +321,8 @@ public Map<String, Object> serversAsJSONMaps() {
322321
double averageTPS = tpsWeek.averageTPS();
323322
server.put("avg_tps", averageTPS != -1 ? decimals.apply(averageTPS) : HtmlLang.UNIT_NO_DATA.getKey());
324323
server.put("low_tps_spikes", tpsWeek.lowTpsSpikeCount(config.get(DisplaySettings.GRAPH_TPS_THRESHOLD_MED)));
325-
server.put("downtime", timeAmount.apply(tpsWeek.serverDownTime()));
326-
server.put("current_uptime", serverUptimeCalculator.getServerUptimeMillis(serverUUID).map(timeAmount)
324+
server.put("downtime", tpsWeek.serverDownTime());
325+
server.put("current_uptime", serverUptimeCalculator.getServerUptimeMillis(serverUUID).map(Object.class::cast)
327326
.orElse(GenericLang.UNAVAILABLE.getKey()));
328327

329328
Optional<TPS> online = tpsWeek.getLast();

‎Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/OnlineActivityOverviewJSONCreator.java‎

Lines changed: 17 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ public class OnlineActivityOverviewJSONCreator implements ServerTabJSONCreator<M
5555
private final PlanConfig config;
5656
private final DBSystem dbSystem;
5757

58-
private final Formatter<Long> timeAmountFormatter;
5958
private final Formatter<Double> decimalFormatter;
6059
private final Formatter<Double> percentageFormatter;
6160

@@ -68,7 +67,6 @@ public OnlineActivityOverviewJSONCreator(
6867
this.config = config;
6968
this.dbSystem = dbSystem;
7069

71-
timeAmountFormatter = formatters.timeAmount();
7270
decimalFormatter = formatters.decimals();
7371
percentageFormatter = formatters.percentage();
7472
}
@@ -154,20 +152,19 @@ private Map<String, Object> createNumbersMap(ServerUUID serverUUID) {
154152
Long playtimeDay = db.query(SessionQueries.playtime(dayAgo, now, serverUUID));
155153
Long playtimeBefore = db.query(SessionQueries.playtime(monthAgo, halfMonthAgo, serverUUID));
156154
Long playtimeAfter = db.query(SessionQueries.playtime(halfMonthAgo, now, serverUUID));
157-
numbers.put("playtime_30d", timeAmountFormatter.apply(playtimeMonth));
158-
numbers.put("playtime_30d_trend", new Trend(playtimeBefore, playtimeAfter, false, timeAmountFormatter));
159-
numbers.put("playtime_7d", timeAmountFormatter.apply(playtimeWeek));
160-
numbers.put("playtime_24h", timeAmountFormatter.apply(playtimeDay));
155+
numbers.put("playtime_30d", playtimeMonth);
156+
numbers.put("playtime_30d_trend", new Trend(playtimeBefore, playtimeAfter, false));
157+
numbers.put("playtime_7d", playtimeWeek);
158+
numbers.put("playtime_24h", playtimeDay);
161159

162-
numbers.put("playtime_30d_avg", timeAmountFormatter.apply(db.query(SessionQueries.averagePlaytimePerDay(monthAgo, now, timeZoneOffset, serverUUID))));
160+
numbers.put("playtime_30d_avg", db.query(SessionQueries.averagePlaytimePerDay(monthAgo, now, timeZoneOffset, serverUUID)));
163161
numbers.put("playtime_30d_avg_trend", new Trend(
164162
db.query(SessionQueries.averagePlaytimePerDay(monthAgo, halfMonthAgo, timeZoneOffset, serverUUID)),
165163
db.query(SessionQueries.averagePlaytimePerDay(halfMonthAgo, now, timeZoneOffset, serverUUID)),
166-
false,
167-
timeAmountFormatter
164+
false
168165
));
169-
numbers.put("playtime_7d_avg", timeAmountFormatter.apply(db.query(SessionQueries.averagePlaytimePerDay(weekAgo, now, timeZoneOffset, serverUUID))));
170-
numbers.put("playtime_24h_avg", timeAmountFormatter.apply(db.query(SessionQueries.playtime(dayAgo, now, serverUUID))));
166+
numbers.put("playtime_7d_avg", db.query(SessionQueries.averagePlaytimePerDay(weekAgo, now, timeZoneOffset, serverUUID)));
167+
numbers.put("playtime_24h_avg", db.query(SessionQueries.playtime(dayAgo, now, serverUUID)));
171168

172169
Long sessionsMonth = db.query(SessionQueries.sessionCount(monthAgo, now, serverUUID));
173170
Long sessionsWeek = db.query(SessionQueries.sessionCount(weekAgo, now, serverUUID));
@@ -182,20 +179,19 @@ private Map<String, Object> createNumbersMap(ServerUUID serverUUID) {
182179
Long sessionLengthAvgMonth = sessionsMonth != 0 ? playtimeMonth / sessionsMonth : 0;
183180
Long sessionLengthAvgWeek = sessionsWeek != 0 ? playtimeWeek / sessionsWeek : 0;
184181
Long sessionLengthAvgDay = sessionsDay != 0 ? playtimeDay / sessionsDay : 0;
185-
numbers.put("session_length_30d_avg", timeAmountFormatter.apply(sessionLengthAvgMonth));
182+
numbers.put("session_length_30d_avg", sessionLengthAvgMonth);
186183
numbers.put("session_length_30d_trend", new Trend(
187184
sessionsBefore != 0 ? playtimeBefore / sessionsBefore : 0,
188185
sessionsAfter != 0 ? playtimeAfter / sessionsAfter : 0,
189-
false,
190-
timeAmountFormatter
186+
false
191187
));
192-
numbers.put("session_length_7d_avg", timeAmountFormatter.apply(sessionLengthAvgWeek));
193-
numbers.put("session_length_24h_avg", timeAmountFormatter.apply(sessionLengthAvgDay));
188+
numbers.put("session_length_7d_avg", sessionLengthAvgWeek);
189+
numbers.put("session_length_24h_avg", sessionLengthAvgDay);
194190

195191
TPSMutator tpsMutator = new TPSMutator(db.query(TPSQueries.fetchTPSDataOfServer(monthAgo, now, serverUUID)));
196192
numbers.put("average_tps", decimalFormatter.apply(tpsMutator.averageTPS()));
197193
numbers.put("low_tps_spikes", tpsMutator.lowTpsSpikeCount(config.get(DisplaySettings.GRAPH_TPS_THRESHOLD_MED)));
198-
numbers.put("downtime", timeAmountFormatter.apply(tpsMutator.serverDownTime()));
194+
numbers.put("downtime", tpsMutator.serverDownTime());
199195

200196
return numbers;
201197
}
@@ -224,14 +220,14 @@ private Map<String, Object> createInsightsMap(ServerUUID serverUUID) {
224220
long avgFirstSessionLength = firstSessions.toAverageSessionLength();
225221
long avgFirstSessionLengthBefore = firstSessionsBefore.toAverageSessionLength();
226222
long avgFirstSessionLengthAfter = firstSessionsAfter.toAverageSessionLength();
227-
insights.put("first_session_length_avg", timeAmountFormatter.apply(avgFirstSessionLength));
228-
insights.put("first_session_length_trend", new Trend(avgFirstSessionLengthBefore, avgFirstSessionLengthAfter, false, timeAmountFormatter));
223+
insights.put("first_session_length_avg", avgFirstSessionLength);
224+
insights.put("first_session_length_trend", new Trend(avgFirstSessionLengthBefore, avgFirstSessionLengthAfter, false));
229225

230226
long medianFirstSessionLength = firstSessions.toMedianSessionLength();
231227
long medianFirstSessionLengthBefore = firstSessionsBefore.toMedianSessionLength();
232228
long medianFirstSessionLengthAfter = firstSessionsAfter.toMedianSessionLength();
233-
insights.put("first_session_length_median", timeAmountFormatter.apply(medianFirstSessionLength));
234-
insights.put("first_session_length_median_trend", new Trend(medianFirstSessionLengthBefore, medianFirstSessionLengthAfter, false, timeAmountFormatter));
229+
insights.put("first_session_length_median", medianFirstSessionLength);
230+
insights.put("first_session_length_median_trend", new Trend(medianFirstSessionLengthBefore, medianFirstSessionLengthAfter, false));
235231

236232
int lonelyJoins = playersOnlineResolver.findLonelyJoins(sessions.toSessionStarts());
237233
int loneJoinsBefore = playersOnlineResolver.findLonelyJoins(sessions.filterSessionsBetween(monthAgo, halfMonthAgo).toSessionStarts());

‎Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/PerformanceJSONCreator.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ public class PerformanceJSONCreator implements ServerTabJSONCreator<Map<String,
4848
private final DBSystem dbSystem;
4949

5050
private final Formatter<Double> decimals;
51-
private final Formatter<Long> timeAmount;
5251
private final Formatter<Double> percentage;
5352
private final Formatter<Double> byteSize;
5453

@@ -63,7 +62,6 @@ public PerformanceJSONCreator(
6362

6463
decimals = formatters.decimals();
6564
percentage = formatters.percentage();
66-
timeAmount = formatters.timeAmount();
6765
byteSize = formatters.byteSize();
6866
}
6967

@@ -96,9 +94,9 @@ private Map<String, Object> createNumbersMap(List<TPS> tpsData) {
9694
numbers.put("low_tps_spikes_7d", tpsDataWeek.lowTpsSpikeCount(tpsThreshold));
9795
numbers.put("low_tps_spikes_24h", tpsDataDay.lowTpsSpikeCount(tpsThreshold));
9896

99-
numbers.put("server_downtime_30d", timeAmount.apply(tpsDataMonth.serverDownTime()));
100-
numbers.put("server_downtime_7d", timeAmount.apply(tpsDataWeek.serverDownTime()));
101-
numbers.put("server_downtime_24h", timeAmount.apply(tpsDataDay.serverDownTime()));
97+
numbers.put("server_downtime_30d", tpsDataMonth.serverDownTime());
98+
numbers.put("server_downtime_7d", tpsDataWeek.serverDownTime());
99+
numbers.put("server_downtime_24h", tpsDataDay.serverDownTime());
102100

103101
numbers.put("players_30d", format(tpsDataMonth.averagePlayers()));
104102
numbers.put("players_7d", format(tpsDataWeek.averagePlayers()));

‎Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/PlayerBaseOverviewJSONCreator.java‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ public class PlayerBaseOverviewJSONCreator implements ServerTabJSONCreator<Map<S
4545
private final PlanConfig config;
4646
private final DBSystem dbSystem;
4747

48-
private final Formatter<Long> timeAmount;
4948
private final Formatter<Double> percentage;
5049

5150
@Inject
@@ -57,7 +56,6 @@ public PlayerBaseOverviewJSONCreator(
5756
this.config = config;
5857
this.dbSystem = dbSystem;
5958

60-
timeAmount = formatters.timeAmount();
6159
percentage = formatters.percentage();
6260
}
6361

@@ -91,9 +89,9 @@ private Map<String, Object> createTrendsMap(ServerUUID serverUUID) {
9189

9290
Long avgPlaytimeBefore = db.query(SessionQueries.averagePlaytimePerPlayer(twoMonthsAgo, monthAgo, serverUUID));
9391
Long avgPlaytimeAfter = db.query(SessionQueries.averagePlaytimePerPlayer(monthAgo, now, serverUUID));
94-
trends.put("playtime_avg_then", timeAmount.apply(avgPlaytimeBefore));
95-
trends.put("playtime_avg_now", timeAmount.apply(avgPlaytimeAfter));
96-
trends.put("playtime_avg_trend", new Trend(avgPlaytimeBefore, avgPlaytimeAfter, false, timeAmount));
92+
trends.put("playtime_avg_then", avgPlaytimeBefore);
93+
trends.put("playtime_avg_now", avgPlaytimeAfter);
94+
trends.put("playtime_avg_trend", new Trend(avgPlaytimeBefore, avgPlaytimeAfter, false));
9795

9896
Long avgAfkBefore = db.query(SessionQueries.averageAfkPerPlayer(twoMonthsAgo, monthAgo, serverUUID));
9997
Long avgAfkAfter = db.query(SessionQueries.averageAfkPerPlayer(monthAgo, now, serverUUID));
@@ -105,15 +103,15 @@ private Map<String, Object> createTrendsMap(ServerUUID serverUUID) {
105103

106104
Long avgRegularPlaytimeBefore = db.query(ActivityIndexQueries.averagePlaytimePerRegularPlayer(twoMonthsAgo, monthAgo, serverUUID, playThreshold));
107105
Long avgRegularPlaytimeAfter = db.query(ActivityIndexQueries.averagePlaytimePerRegularPlayer(monthAgo, now, serverUUID, playThreshold));
108-
trends.put("regular_playtime_avg_then", timeAmount.apply(avgRegularPlaytimeBefore));
109-
trends.put("regular_playtime_avg_now", timeAmount.apply(avgRegularPlaytimeAfter));
110-
trends.put("regular_playtime_avg_trend", new Trend(avgRegularPlaytimeBefore, avgRegularPlaytimeAfter, false, timeAmount));
106+
trends.put("regular_playtime_avg_then", avgRegularPlaytimeBefore);
107+
trends.put("regular_playtime_avg_now", avgRegularPlaytimeAfter);
108+
trends.put("regular_playtime_avg_trend", new Trend(avgRegularPlaytimeBefore, avgRegularPlaytimeAfter, false));
111109

112110
Long avgRegularSessionLengthBefore = db.query(ActivityIndexQueries.averageSessionLengthPerRegularPlayer(twoMonthsAgo, monthAgo, serverUUID, playThreshold));
113111
Long avgRegularSessionLengthAfter = db.query(ActivityIndexQueries.averageSessionLengthPerRegularPlayer(monthAgo, now, serverUUID, playThreshold));
114-
trends.put("regular_session_avg_then", timeAmount.apply(avgRegularSessionLengthBefore));
115-
trends.put("regular_session_avg_now", timeAmount.apply(avgRegularSessionLengthAfter));
116-
trends.put("regular_session_avg_trend", new Trend(avgRegularSessionLengthBefore, avgRegularSessionLengthAfter, false, timeAmount));
112+
trends.put("regular_session_avg_then", avgRegularSessionLengthBefore);
113+
trends.put("regular_session_avg_now", avgRegularSessionLengthAfter);
114+
trends.put("regular_session_avg_trend", new Trend(avgRegularSessionLengthBefore, avgRegularSessionLengthAfter, false));
117115

118116
Long avgRegularAfkBefore = db.query(ActivityIndexQueries.averageAFKPerRegularPlayer(twoMonthsAgo, monthAgo, serverUUID, playThreshold));
119117
Long avgRegularAfkAfter = db.query(ActivityIndexQueries.averageAFKPerRegularPlayer(monthAgo, now, serverUUID, playThreshold));

‎Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/SessionsOverviewJSONCreator.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ public class SessionsOverviewJSONCreator implements ServerTabJSONCreator<Map<Str
4545

4646
private final DBSystem dbSystem;
4747

48-
private final Formatter<Long> timeAmount;
4948
private final Formatter<Double> percentage;
5049

5150
@Inject
@@ -55,7 +54,6 @@ public SessionsOverviewJSONCreator(
5554
) {
5655
this.dbSystem = dbSystem;
5756

58-
timeAmount = formatters.timeAmount();
5957
percentage = formatters.percentage();
6058
}
6159

@@ -75,13 +73,13 @@ private Map<String, Object> createInsightsMap(ServerUUID serverUUID) {
7573

7674
long uptime = TimeUnit.DAYS.toMillis(30L) - tpsMutator.serverDownTime();
7775
long occupied = tpsMutator.serverOccupiedTime();
78-
insights.put("server_occupied", timeAmount.apply(occupied));
76+
insights.put("server_occupied", occupied);
7977
insights.put("server_occupied_perc", percentage.apply(Percentage.calculate(occupied, uptime, -1)));
8078

8179
Long playtime = db.query(SessionQueries.playtime(monthAgo, now, serverUUID));
8280
Long afkTime = db.query(SessionQueries.afkTime(monthAgo, now, serverUUID));
83-
insights.put("total_playtime", timeAmount.apply(playtime));
84-
insights.put("afk_time", timeAmount.apply(afkTime));
81+
insights.put("total_playtime", playtime);
82+
insights.put("afk_time", afkTime);
8583
insights.put("afk_time_perc", percentage.apply(Percentage.calculate(afkTime, playtime, -1)));
8684

8785
GMTimes gmTimes = db.query(WorldTimesQueries.fetchGMTimes(monthAgo, now, serverUUID));

‎Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/network/NetworkPlayerBaseOverviewJSONCreator.java‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ public class NetworkPlayerBaseOverviewJSONCreator implements NetworkTabJSONCreat
4545
private final PlanConfig config;
4646
private final DBSystem dbSystem;
4747

48-
private final Formatter<Long> timeAmount;
4948
private final Formatter<Double> percentage;
5049

5150
@Inject
@@ -57,7 +56,6 @@ public NetworkPlayerBaseOverviewJSONCreator(
5756
this.config = config;
5857
this.dbSystem = dbSystem;
5958

60-
timeAmount = formatters.timeAmount();
6159
percentage = formatters.percentage();
6260
}
6361

@@ -91,9 +89,9 @@ private Map<String, Object> createTrendsMap() {
9189

9290
long avgPlaytimeBefore = db.query(SessionQueries.averagePlaytimePerPlayer(twoMonthsAgo, monthAgo));
9391
long avgPlaytimeAfter = db.query(SessionQueries.averagePlaytimePerPlayer(monthAgo, now));
94-
trends.put("playtime_avg_then", timeAmount.apply(avgPlaytimeBefore));
95-
trends.put("playtime_avg_now", timeAmount.apply(avgPlaytimeAfter));
96-
trends.put("playtime_avg_trend", new Trend(avgPlaytimeBefore, avgPlaytimeAfter, false, timeAmount));
92+
trends.put("playtime_avg_then", avgPlaytimeBefore);
93+
trends.put("playtime_avg_now", avgPlaytimeAfter);
94+
trends.put("playtime_avg_trend", new Trend(avgPlaytimeBefore, avgPlaytimeAfter, false));
9795

9896
long avgAfkBefore = db.query(SessionQueries.averageAfkPerPlayer(twoMonthsAgo, monthAgo));
9997
long avgAfkAfter = db.query(SessionQueries.averageAfkPerPlayer(monthAgo, now));
@@ -105,15 +103,15 @@ private Map<String, Object> createTrendsMap() {
105103

106104
long avgRegularPlaytimeBefore = db.query(NetworkActivityIndexQueries.averagePlaytimePerRegularPlayer(twoMonthsAgo, monthAgo, playThreshold));
107105
long avgRegularPlaytimeAfter = db.query(NetworkActivityIndexQueries.averagePlaytimePerRegularPlayer(monthAgo, now, playThreshold));
108-
trends.put("regular_playtime_avg_then", timeAmount.apply(avgRegularPlaytimeBefore));
109-
trends.put("regular_playtime_avg_now", timeAmount.apply(avgRegularPlaytimeAfter));
110-
trends.put("regular_playtime_avg_trend", new Trend(avgRegularPlaytimeBefore, avgRegularPlaytimeAfter, false, timeAmount));
106+
trends.put("regular_playtime_avg_then", avgRegularPlaytimeBefore);
107+
trends.put("regular_playtime_avg_now", avgRegularPlaytimeAfter);
108+
trends.put("regular_playtime_avg_trend", new Trend(avgRegularPlaytimeBefore, avgRegularPlaytimeAfter, false));
111109

112110
long avgRegularSessionLengthBefore = db.query(NetworkActivityIndexQueries.averageSessionLengthPerRegularPlayer(twoMonthsAgo, monthAgo, playThreshold));
113111
long avgRegularSessionLengthAfter = db.query(NetworkActivityIndexQueries.averageSessionLengthPerRegularPlayer(monthAgo, now, playThreshold));
114-
trends.put("regular_session_avg_then", timeAmount.apply(avgRegularSessionLengthBefore));
115-
trends.put("regular_session_avg_now", timeAmount.apply(avgRegularSessionLengthAfter));
116-
trends.put("regular_session_avg_trend", new Trend(avgRegularSessionLengthBefore, avgRegularSessionLengthAfter, false, timeAmount));
112+
trends.put("regular_session_avg_then", avgRegularSessionLengthBefore);
113+
trends.put("regular_session_avg_now", avgRegularSessionLengthAfter);
114+
trends.put("regular_session_avg_trend", new Trend(avgRegularSessionLengthBefore, avgRegularSessionLengthAfter, false));
117115

118116
long avgRegularAfkBefore = db.query(NetworkActivityIndexQueries.averageAFKPerRegularPlayer(twoMonthsAgo, monthAgo, playThreshold));
119117
long avgRegularAfkAfter = db.query(NetworkActivityIndexQueries.averageAFKPerRegularPlayer(monthAgo, now, playThreshold));

‎Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/network/NetworkSessionsOverviewJSONCreator.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ public class NetworkSessionsOverviewJSONCreator implements NetworkTabJSONCreator
4040

4141
private final DBSystem dbSystem;
4242

43-
private final Formatter<Long> timeAmount;
4443
private final Formatter<Double> percentage;
4544

4645
@Inject
@@ -50,7 +49,6 @@ public NetworkSessionsOverviewJSONCreator(
5049
) {
5150
this.dbSystem = dbSystem;
5251

53-
timeAmount = formatters.timeAmount();
5452
percentage = formatters.percentage();
5553
}
5654

@@ -67,8 +65,8 @@ private Map<String, Object> createInsightsMap() {
6765

6866
Long playtime = db.query(SessionQueries.playtime(monthAgo, now));
6967
Long afkTime = db.query(SessionQueries.afkTime(monthAgo, now));
70-
insights.put("total_playtime", timeAmount.apply(playtime));
71-
insights.put("afk_time", timeAmount.apply(afkTime));
68+
insights.put("total_playtime", playtime);
69+
insights.put("afk_time", afkTime);
7270
insights.put("afk_time_perc", percentage.apply(Percentage.calculate(afkTime, playtime, -1)));
7371

7472
return insights;

0 commit comments

Comments
 (0)