mirror/Plan
2
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2025-01-24 16:14:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed js worlds getting translated

Browse Source 
- Deaths
- Ended
- Length

This bug can easily regress!

Affects issues:
- Fixed #1293
This commit is contained in:
Rsl1122 2020-01-17 20:55:50 +02:00
parent 0cfd98a127
commit 287eaf9b12
18 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Plan/common/src/main/java/com/djrapitops/plan/delivery/export/NetworkPageExporter.java
View File

@ -168,15 +168,15 @@ public class NetworkPageExporter extends FileExporter {
"vendor/highcharts/no-data-to-display.js",
"vendor/fontawesome-free/css/all.min.css",
"vendor/fontawesome-free/webfonts/fa-brands-400.eot",
"vendor/fontawesome-free/webfonts/fa-brands-400.tff",
"vendor/fontawesome-free/webfonts/fa-brands-400.ttf",
"vendor/fontawesome-free/webfonts/fa-brands-400.woff",
"vendor/fontawesome-free/webfonts/fa-brands-400.woff2",
"vendor/fontawesome-free/webfonts/fa-regular-400.eot",
"vendor/fontawesome-free/webfonts/fa-regular-400.tff",
"vendor/fontawesome-free/webfonts/fa-regular-400.ttf",
"vendor/fontawesome-free/webfonts/fa-regular-400.woff",
"vendor/fontawesome-free/webfonts/fa-regular-400.woff2",
"vendor/fontawesome-free/webfonts/fa-solid-900.eot",
"vendor/fontawesome-free/webfonts/fa-solid-900.tff",
"vendor/fontawesome-free/webfonts/fa-solid-900.ttf",
"vendor/fontawesome-free/webfonts/fa-solid-900.woff",
"vendor/fontawesome-free/webfonts/fa-solid-900.woff2",
"js/sb-admin-2.js",

6
Plan/common/src/main/java/com/djrapitops/plan/delivery/export/PlayerPageExporter.java
View File

@ -155,15 +155,15 @@ public class PlayerPageExporter extends FileExporter {
"vendor/fullcalendar/fullcalendar.min.js",
"vendor/fontawesome-free/css/all.min.css",
"vendor/fontawesome-free/webfonts/fa-brands-400.eot",
"vendor/fontawesome-free/webfonts/fa-brands-400.tff",
"vendor/fontawesome-free/webfonts/fa-brands-400.ttf",
"vendor/fontawesome-free/webfonts/fa-brands-400.woff",
"vendor/fontawesome-free/webfonts/fa-brands-400.woff2",
"vendor/fontawesome-free/webfonts/fa-regular-400.eot",
"vendor/fontawesome-free/webfonts/fa-regular-400.tff",
"vendor/fontawesome-free/webfonts/fa-regular-400.ttf",
"vendor/fontawesome-free/webfonts/fa-regular-400.woff",
"vendor/fontawesome-free/webfonts/fa-regular-400.woff2",
"vendor/fontawesome-free/webfonts/fa-solid-900.eot",
"vendor/fontawesome-free/webfonts/fa-solid-900.tff",
"vendor/fontawesome-free/webfonts/fa-solid-900.ttf",
"vendor/fontawesome-free/webfonts/fa-solid-900.woff",
"vendor/fontawesome-free/webfonts/fa-solid-900.woff2",
"js/sb-admin-2.js",

6
Plan/common/src/main/java/com/djrapitops/plan/delivery/export/ServerPageExporter.java
View File

@ -184,15 +184,15 @@ public class ServerPageExporter extends FileExporter {
"vendor/fullcalendar/fullcalendar.min.js",
"vendor/fontawesome-free/css/all.min.css",
"vendor/fontawesome-free/webfonts/fa-brands-400.eot",
"vendor/fontawesome-free/webfonts/fa-brands-400.tff",
"vendor/fontawesome-free/webfonts/fa-brands-400.ttf",
"vendor/fontawesome-free/webfonts/fa-brands-400.woff",
"vendor/fontawesome-free/webfonts/fa-brands-400.woff2",
"vendor/fontawesome-free/webfonts/fa-regular-400.eot",
"vendor/fontawesome-free/webfonts/fa-regular-400.tff",
"vendor/fontawesome-free/webfonts/fa-regular-400.ttf",
"vendor/fontawesome-free/webfonts/fa-regular-400.woff",
"vendor/fontawesome-free/webfonts/fa-regular-400.woff2",
"vendor/fontawesome-free/webfonts/fa-solid-900.eot",
"vendor/fontawesome-free/webfonts/fa-solid-900.tff",
"vendor/fontawesome-free/webfonts/fa-solid-900.ttf",
"vendor/fontawesome-free/webfonts/fa-solid-900.woff",
"vendor/fontawesome-free/webfonts/fa-solid-900.woff2",
"js/sb-admin-2.js",

2
Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/ResponseResolver.java
View File

@ -133,7 +133,7 @@ public class ResponseResolver extends CompositePageResolver {
if (target.endsWith("favicon.ico")) {
return responseFactory.faviconResponse();
}
if (target.endsWithAny(".woff", ".woff2", ".eot", ".tff")) {
if (target.endsWithAny(".woff", ".woff2", ".eot", ".ttf")) {
return responseFactory.fontResponse(resource);
}

4
Plan/common/src/main/java/com/djrapitops/plan/settings/locale/lang/HtmlLang.java
View File

@ -91,8 +91,8 @@ public enum HtmlLang implements Lang {
TITLE_RECENT_SESSIONS("Recent Sessions"),
TITLE_PLAYER("Player"),
TITLE_SESSION_START("Session Started"),
TITLE_LENGTH("Length"),
TITLE_SERVER("Server"),
TITLE_LENGTH(" Length"),
TITLE_SERVER("Server"), // Can cause issue with jquery.dataTables.js
TITLE_MOST_PLAYED_WORLD("Most played World"),
TEXT_CLICK_TO_EXPAND("Click to expand"),
TITLE_SERVER_PLAYTIME_30("Server Playtime for 30 days"),

2
Plan/common/src/main/java/com/djrapitops/plan/settings/locale/lang/JSLang.java
View File

@ -30,7 +30,7 @@ public enum JSLang implements Lang {
LINK_SERVER_ANALYSIS("Server Analysis"),
LINK_QUICK_VIEW("Quick view"),
TEXT_FIRST_SESSION("First session"),
LABEL_SESSION_ENDED("Ended"),
LABEL_SESSION_ENDED(" Ended"),
LINK_PLAYER_PAGE("Player Page"),
LABEL_NO_SESSION_KILLS("None"),
UNIT_ENTITIES("Entities"),

4
Plan/common/src/main/resources/assets/plan/locale/locale_CN.txt
View File

@ -162,7 +162,7 @@ HTML - LABEL_RELATIVE_JOIN_ACTIVITY || Relative Join Activity
HTML - LABEL_RETENTION || 新玩家留坑率
HTML - LABEL_SERVER_DOWNTIME || 关服时间
HTML - LABEL_SERVER_OCCUPIED || 开服时间
HTML - LABEL_SESSION_ENDED || 时域之末
HTML - LABEL_SESSION_ENDED || 时域之末
HTML - LABEL_SESSION_MEDIAN || 平均时域
HTML - LABEL_TIMES_KICKED || 被踢次数
HTML - LABEL_TOTAL_PLAYERS || 总玩家数
@ -242,7 +242,7 @@ HTML - TITLE_LAST_24_HOURS || 过去 24 小时
HTML - TITLE_LAST_30_DAYS || 过去 30 天
HTML - TITLE_LAST_7_DAYS || 过去 7 天
HTML - TITLE_LAST_CONNECTED || 最后连接
HTML - TITLE_LENGTH || 长度
HTML - TITLE_LENGTH || 长度
HTML - TITLE_MOST_PLAYED_WORLD || 最多玩家的世界
HTML - TITLE_NETWORK || 服务器网络
HTML - TITLE_NETWORK_AS_NUMBERS || Network as Numbers

4
Plan/common/src/main/resources/assets/plan/locale/locale_DE.txt
View File

@ -162,7 +162,7 @@ HTML - LABEL_RELATIVE_JOIN_ACTIVITY || Relative Join Activity
HTML - LABEL_RETENTION || Erhaltung neuer Spieler
HTML - LABEL_SERVER_DOWNTIME || Server Downtime
HTML - LABEL_SERVER_OCCUPIED || Server occupied
HTML - LABEL_SESSION_ENDED || Session beendet
HTML - LABEL_SESSION_ENDED || Session beendet
HTML - LABEL_SESSION_MEDIAN || Session Durchschnitt
HTML - LABEL_TIMES_KICKED || Mal gekickt
HTML - LABEL_TOTAL_PLAYERS || Total Players
@ -242,7 +242,7 @@ HTML - TITLE_LAST_24_HOURS || Letzte 24 Stunden
HTML - TITLE_LAST_30_DAYS || Letzte 30 Tage
HTML - TITLE_LAST_7_DAYS || Letzte 7 Tage
HTML - TITLE_LAST_CONNECTED || Letzte Verbindung
HTML - TITLE_LENGTH || Length
HTML - TITLE_LENGTH || Length
HTML - TITLE_MOST_PLAYED_WORLD || Most played World
HTML - TITLE_NETWORK || Netzwerk
HTML - TITLE_NETWORK_AS_NUMBERS || Network as Numbers

4
Plan/common/src/main/resources/assets/plan/locale/locale_EN.txt
View File

@ -162,7 +162,7 @@ HTML - LABEL_RELATIVE_JOIN_ACTIVITY || Relative Join Activity
HTML - LABEL_RETENTION || New Player Retention
HTML - LABEL_SERVER_DOWNTIME || Server Downtime
HTML - LABEL_SERVER_OCCUPIED || Server occupied
HTML - LABEL_SESSION_ENDED || Ended
HTML - LABEL_SESSION_ENDED || Ended
HTML - LABEL_SESSION_MEDIAN || Session Median
HTML - LABEL_TIMES_KICKED || Times Kicked
HTML - LABEL_TOTAL_PLAYERS || Total Players
@ -242,7 +242,7 @@ HTML - TITLE_LAST_24_HOURS || Last 24 hours
HTML - TITLE_LAST_30_DAYS || Last 30 days
HTML - TITLE_LAST_7_DAYS || Last 7 days
HTML - TITLE_LAST_CONNECTED || Last Connected
HTML - TITLE_LENGTH || Length
HTML - TITLE_LENGTH || Length
HTML - TITLE_MOST_PLAYED_WORLD || Most played World
HTML - TITLE_NETWORK || Network
HTML - TITLE_NETWORK_AS_NUMBERS || Network as Numbers

4
Plan/common/src/main/resources/assets/plan/locale/locale_FI.txt
View File

@ -162,7 +162,7 @@ HTML - LABEL_RELATIVE_JOIN_ACTIVITY || Relative Join Activity
HTML - LABEL_RETENTION || Uusien pysyvyys
HTML - LABEL_SERVER_DOWNTIME || Palvelin pois päältä
HTML - LABEL_SERVER_OCCUPIED || Palvelin pelaajien käytössä
HTML - LABEL_SESSION_ENDED || Istunto Päättyi
HTML - LABEL_SESSION_ENDED || Istunto Päättyi
HTML - LABEL_SESSION_MEDIAN || Istuntojen Mediaani
HTML - LABEL_TIMES_KICKED || Heitetty pihalle
HTML - LABEL_TOTAL_PLAYERS || Pelaajia
@ -242,7 +242,7 @@ HTML - TITLE_LAST_24_HOURS || Viimeiset 24 tuntia
HTML - TITLE_LAST_30_DAYS || Viimeiset 30 päivää
HTML - TITLE_LAST_7_DAYS || Viimeiset 7 päivää
HTML - TITLE_LAST_CONNECTED || Viimeisin yhteys
HTML - TITLE_LENGTH || Pituus
HTML - TITLE_LENGTH || Pituus
HTML - TITLE_MOST_PLAYED_WORLD || Eniten pelattu maailma
HTML - TITLE_NETWORK || Verkosto
HTML - TITLE_NETWORK_AS_NUMBERS || Verkosto Numeroina

4
Plan/common/src/main/resources/assets/plan/locale/locale_FR.txt
View File

@ -162,7 +162,7 @@ HTML - LABEL_RELATIVE_JOIN_ACTIVITY || Relative Join Activity
HTML - LABEL_RETENTION || Rétention des nouveaux joueurs
HTML - LABEL_SERVER_DOWNTIME || Temps hors-ligne du serveur
HTML - LABEL_SERVER_OCCUPIED || Serveur inoccupé
HTML - LABEL_SESSION_ENDED || Session terminée
HTML - LABEL_SESSION_ENDED || Session terminée
HTML - LABEL_SESSION_MEDIAN || Session médiane
HTML - LABEL_TIMES_KICKED || Nombre d'éjections
HTML - LABEL_TOTAL_PLAYERS || Joueurs totaux
@ -242,7 +242,7 @@ HTML - TITLE_LAST_24_HOURS || 24 Dernières heures
HTML - TITLE_LAST_30_DAYS || 30 Derniers jours
HTML - TITLE_LAST_7_DAYS || 7 Derniers jours
HTML - TITLE_LAST_CONNECTED || Dernier connecté
HTML - TITLE_LENGTH || Longueur
HTML - TITLE_LENGTH || Longueur
HTML - TITLE_MOST_PLAYED_WORLD || Monde le plus joué
HTML - TITLE_NETWORK || Réseau
HTML - TITLE_NETWORK_AS_NUMBERS || Réseau en Nombres

4
Plan/common/src/main/resources/assets/plan/locale/locale_IT.txt
View File

@ -162,7 +162,7 @@ HTML - LABEL_RELATIVE_JOIN_ACTIVITY || Attività Entrate Relative
HTML - LABEL_RETENTION || Retenzione Nuovo Giocatore
HTML - LABEL_SERVER_DOWNTIME || Server Downtime
HTML - LABEL_SERVER_OCCUPIED || Server occupato
HTML - LABEL_SESSION_ENDED || Fine
HTML - LABEL_SESSION_ENDED || Fine
HTML - LABEL_SESSION_MEDIAN || Media Sessioni
HTML - LABEL_TIMES_KICKED || Cacciato
HTML - LABEL_TOTAL_PLAYERS || Giocatori Totali
@ -242,7 +242,7 @@ HTML - TITLE_LAST_24_HOURS || Ultime 24 ore
HTML - TITLE_LAST_30_DAYS || Ultimi 30 giorni
HTML - TITLE_LAST_7_DAYS || Ultimi 7 giorni
HTML - TITLE_LAST_CONNECTED || Ultima connessione
HTML - TITLE_LENGTH || Durata
HTML - TITLE_LENGTH || Durata
HTML - TITLE_MOST_PLAYED_WORLD || Mondo più giocato
HTML - TITLE_NETWORK || Network
HTML - TITLE_NETWORK_AS_NUMBERS || Statistiche Network

4
Plan/common/src/main/resources/assets/plan/locale/locale_JA.txt
View File

@ -162,7 +162,7 @@ HTML - LABEL_RELATIVE_JOIN_ACTIVITY || オンラインと活動と
HTML - LABEL_RETENTION || 新規プレイヤーの継続率
HTML - LABEL_SERVER_DOWNTIME || サーバーダウンタイム
HTML - LABEL_SERVER_OCCUPIED || サーバーの占有時間
HTML - LABEL_SESSION_ENDED || ログアウト時間
HTML - LABEL_SESSION_ENDED || ログアウト時間
HTML - LABEL_SESSION_MEDIAN || 平均オンライン
HTML - LABEL_TIMES_KICKED || キック回数
HTML - LABEL_TOTAL_PLAYERS || トータルプレイヤー数
@ -242,7 +242,7 @@ HTML - TITLE_LAST_24_HOURS || 直近24時間以内
HTML - TITLE_LAST_30_DAYS || 直近30日以内
HTML - TITLE_LAST_7_DAYS || 一週間以内
HTML - TITLE_LAST_CONNECTED || 直近の接続
HTML - TITLE_LENGTH || 長さ
HTML - TITLE_LENGTH || 長さ
HTML - TITLE_MOST_PLAYED_WORLD || よくプレイしているワールド
HTML - TITLE_NETWORK || ネットワーク
HTML - TITLE_NETWORK_AS_NUMBERS || ネットワーク数

4
Plan/common/src/main/resources/assets/plan/locale/locale_PT_BR.txt
View File

@ -162,7 +162,7 @@ HTML - LABEL_RELATIVE_JOIN_ACTIVITY || Relative Join Activity
HTML - LABEL_RETENTION || Retenção de Novos Jogadores
HTML - LABEL_SERVER_DOWNTIME || Server Downtime
HTML - LABEL_SERVER_OCCUPIED || Server occupied
HTML - LABEL_SESSION_ENDED || Sessões Finalizadas
HTML - LABEL_SESSION_ENDED || Sessões Finalizadas
HTML - LABEL_SESSION_MEDIAN || Média de Sessões
HTML - LABEL_TIMES_KICKED || Vezes Kickado
HTML - LABEL_TOTAL_PLAYERS || Total Players
@ -242,7 +242,7 @@ HTML - TITLE_LAST_24_HOURS || Últimas 24 horas
HTML - TITLE_LAST_30_DAYS || Últimos 30 dias
HTML - TITLE_LAST_7_DAYS || Últimos 7 dias
HTML - TITLE_LAST_CONNECTED || Última Conexão
HTML - TITLE_LENGTH || Length
HTML - TITLE_LENGTH || Length
HTML - TITLE_MOST_PLAYED_WORLD || Most played World
HTML - TITLE_NETWORK || Network
HTML - TITLE_NETWORK_AS_NUMBERS || Network as Numbers

4
Plan/common/src/main/resources/assets/plan/locale/locale_TR.txt
View File

@ -162,7 +162,7 @@ HTML - LABEL_RELATIVE_JOIN_ACTIVITY || Relative Join Activity
HTML - LABEL_RETENTION || New Player Retention
HTML - LABEL_SERVER_DOWNTIME || Server Downtime
HTML - LABEL_SERVER_OCCUPIED || Server occupied
HTML - LABEL_SESSION_ENDED || Oturum Sona Erdi
HTML - LABEL_SESSION_ENDED || Oturum Sona Erdi
HTML - LABEL_SESSION_MEDIAN || Session Median
HTML - LABEL_TIMES_KICKED || Kere Atılmış
HTML - LABEL_TOTAL_PLAYERS || Total Players
@ -242,7 +242,7 @@ HTML - TITLE_LAST_24_HOURS || Son 24 saat
HTML - TITLE_LAST_30_DAYS || Son 30 gün
HTML - TITLE_LAST_7_DAYS || Son 7 gün
HTML - TITLE_LAST_CONNECTED || Son bağlantı
HTML - TITLE_LENGTH || Length
HTML - TITLE_LENGTH || Length
HTML - TITLE_MOST_PLAYED_WORLD || Most played World
HTML - TITLE_NETWORK || Network
HTML - TITLE_NETWORK_AS_NUMBERS || Network as Numbers

2
Plan/common/src/main/resources/assets/plan/web/js/sessionAccordion.js
View File

@ -57,7 +57,7 @@ function loadPlayerKills(json, error) {
$('#playerKillTable').replaceWith(createKillsTable(json.player_kills));
}
function loadPlayerDeaths(json, error) {
function loadPlayerdeaths(json, error) {
if (error) {
$('#playerDeathTable').replaceWith('<p>Failed to load player deaths: ' + error + '</p>');
return;

2
Plan/common/src/main/resources/assets/plan/web/player.html
View File

@ -757,7 +757,7 @@
loadSessionAccordion(json, error);
loadserverAccordion(json, error);
loadPlayerKills(json, error);
loadPlayerDeaths(json, error);
loadPlayerdeaths(json, error);
loadPvPPvEValues(json, error);
if (json) {
var series = {

6
Plan/common/src/test/java/utilities/mocks/Mocker.java
View File

@ -85,15 +85,15 @@ abstract class Mocker {
"web/vendor/jquery/jquery.min.js",
"web/vendor/fontawesome-free/css/all.min.css",
"web/vendor/fontawesome-free/webfonts/fa-brands-400.eot",
"web/vendor/fontawesome-free/webfonts/fa-brands-400.tff",
"web/vendor/fontawesome-free/webfonts/fa-brands-400.ttf",
"web/vendor/fontawesome-free/webfonts/fa-brands-400.woff",
"web/vendor/fontawesome-free/webfonts/fa-brands-400.woff2",
"web/vendor/fontawesome-free/webfonts/fa-regular-400.eot",
"web/vendor/fontawesome-free/webfonts/fa-regular-400.tff",
"web/vendor/fontawesome-free/webfonts/fa-regular-400.ttf",
"web/vendor/fontawesome-free/webfonts/fa-regular-400.woff",
"web/vendor/fontawesome-free/webfonts/fa-regular-400.woff2",
"web/vendor/fontawesome-free/webfonts/fa-solid-900.eot",
"web/vendor/fontawesome-free/webfonts/fa-solid-900.tff",
"web/vendor/fontawesome-free/webfonts/fa-solid-900.ttf",
"web/vendor/fontawesome-free/webfonts/fa-solid-900.woff",
"web/vendor/fontawesome-free/webfonts/fa-solid-900.woff2",
"web/vendor/fullcalendar/fullcalendar.min.js",