diff --git a/Plan/common/src/main/java/com/djrapitops/plan/settings/locale/lang/HtmlLang.java b/Plan/common/src/main/java/com/djrapitops/plan/settings/locale/lang/HtmlLang.java index 9e8055ec7..12e652a4f 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/settings/locale/lang/HtmlLang.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/settings/locale/lang/HtmlLang.java @@ -69,11 +69,14 @@ public enum HtmlLang implements Lang { TITLE_LAST_7_DAYS("html.label.last7days", "Last 7 days"), TITLE_LAST_30_DAYS("html.label.last30days", "Last 30 days"), LABEL_UNIQUE_PLAYERS("html.label.uniquePlayers", "Unique Players"), + LABEL_UNIQUE_PLAYERS_7_DAYS("html.label.uniquePlayers7days", "Unique Players (7 days)"), LABEL_NEW_PLAYERS("html.label.newPlayers", "New Players"), + LABEL_NEW_PLAYERS_7_DAYS("html.label.newPlayers7days", "New Players (7 days)"), LABEL_REGULAR_PLAYERS("html.label.regularPlayers", "Regular Players"), LABEL_TOTAL_PLAYERS("html.label.totalPlayers", "Total Players"), TITLE_NETWORK_AS_NUMBERS("html.label.networkAsNumbers", "Network as Numbers"), LABEL_PLAYERS_ONLINE("html.label.playersOnline", "Players Online"), + LABEL_PLAYERS_ONLINE_NOW("html.label.playersOnlineNow", "Players Online (Now)"), LABEL_TOTAL_PLAYTIME("html.label.totalPlaytime", "Total Playtime"), LABEL_PLAYTIME("html.label.playtime", "Playtime"), LABEL_ACTIVE_PLAYTIME("html.label.activePlaytime", "Active Playtime"), @@ -94,6 +97,7 @@ public enum HtmlLang implements Lang { TITLE_30_DAYS("html.label.thirtyDays", "30 days"), TITLE_AS_NUMBERS("html.label.asNumbers", "as Numbers"), LABEL_AVG_TPS("html.label.averageTps", "Average TPS"), + LABEL_AVG_TPS_7_DAYS("html.label.averageTps7days", "Average TPS (7 days)"), LABEL_AVG_PLAYERS("html.label.averagePlayers", "Average Players"), LABEL_CPU("html.label.cpu", "CPU"), LABEL_CPU_USAGE("html.label.cpuUsage", "CPU Usage"), @@ -104,6 +108,7 @@ public enum HtmlLang implements Lang { LABEL_AVG_ENTITIES("html.label.averageEntities", "Average Entities"), LABEL_AVG_CHUNKS("html.label.averageChunks", "Average Chunks"), LABEL_LOW_TPS("html.label.lowTpsSpikes", "Low TPS Spikes"), + LABEL_LOW_TPS_7_DAYS("html.label.lowTpsSpikes", "Low TPS Spikes (7 days)"), LABEL_DOWNTIME("html.label.downtime", "Downtime"), // Sessions tab #tab-sessions-overview TITLE_RECENT_SESSIONS("html.label.recentSessions", "Recent Sessions"), @@ -245,6 +250,7 @@ public enum HtmlLang implements Lang { LABEL_CURRENT_UPTIME("html.label.currentUptime", "Current Uptime"), LABEL_TOTAL("html.label.total", "Total"), LABEL_ALPHABETICAL("html.label.alphabetical", "Alphabetical"), + LABEL_SORT_BY("html.label.sortBy", "Sort By"), LOGIN_LOGIN("html.login.login", "Login"), LOGIN_LOGOUT("html.login.logout", "Logout"), diff --git a/Plan/react/dashboard/src/components/cards/network/ServersTableCard.js b/Plan/react/dashboard/src/components/cards/network/ServersTableCard.js index 432538181..fbb27bf63 100644 --- a/Plan/react/dashboard/src/components/cards/network/ServersTableCard.js +++ b/Plan/react/dashboard/src/components/cards/network/ServersTableCard.js @@ -44,7 +44,7 @@ const SortDropDown = ({sortBy, sortReversed, setSortBy}) => { -
Sort by
+
{t('html.label.sortBy')}
{sortOptions.map((option, i) => ( setSortBy(option)}> {t(option)} diff --git a/Plan/react/dashboard/src/components/table/ServersTable.js b/Plan/react/dashboard/src/components/table/ServersTable.js index 54d900b02..32b1c891c 100644 --- a/Plan/react/dashboard/src/components/table/ServersTable.js +++ b/Plan/react/dashboard/src/components/table/ServersTable.js @@ -74,13 +74,13 @@ const sort = (servers, sortBy, sortReversed) => { export const ServerSortOption = { ALPHABETICAL: 'html.label.alphabetical', - AVERAGE_TPS: 'html.label.averageTps', + AVERAGE_TPS: 'html.label.averageTps7days', // DOWNTIME: 'html.label.downtime', - LOW_TPS_SPIKES: 'html.label.lowTpsSpikes', - NEW_PLAYERS: 'html.label.newPlayers', - PLAYERS_ONLINE: 'html.label.playersOnline', + LOW_TPS_SPIKES: 'html.label.lowTpsSpikes7days', + NEW_PLAYERS: 'html.label.newPlayers7days', + PLAYERS_ONLINE: 'html.label.playersOnlineNow', REGISTERED_PLAYERS: 'html.label.registeredPlayers', - UNIQUE_PLAYERS: 'html.label.uniquePlayers', + UNIQUE_PLAYERS: 'html.label.uniquePlayers7days', } const ServersTable = ({servers, onSelect, sortBy, sortReversed}) => {