From 2142990758b0e99ba612ff6e7d66e648db979bab Mon Sep 17 00:00:00 2001 From: Fuzzlemann Date: Sun, 20 Aug 2017 13:51:38 +0200 Subject: [PATCH] Move the auto generation to the correct location (Customization.Plugins -> Plugins) Start using StrSubstitute with REPLACE variables --- Plan/localization/locale_DE.txt | 48 +++---- Plan/localization/locale_EN.txt | 120 +++++++++--------- Plan/localization/locale_FI.txt | 48 +++---- .../PluginConfigSectionHandler.java | 4 +- .../com/djrapitops/plan/locale/Locale.java | 30 ++--- .../plan/ui/html/DataRequestHandler.java | 1 + .../com/djrapitops/plan/ui/html/Html.java | 54 ++++---- .../plan/ui/webserver/WebServer.java | 3 +- .../plan/utilities/PlaceholderUtils.java | 72 +++++------ Plan/src/main/resources/locale_DE.txt | 30 ++--- Plan/src/main/resources/locale_FI.txt | 30 ++--- .../java/com/djrapitops/plan/ui/HtmlTest.java | 2 +- 12 files changed, 226 insertions(+), 216 deletions(-) diff --git a/Plan/localization/locale_DE.txt b/Plan/localization/locale_DE.txt index e7bbd18aa..715a6f9fd 100644 --- a/Plan/localization/locale_DE.txt +++ b/Plan/localization/locale_DE.txt @@ -2,19 +2,19 @@ ENABLED <> Player Analytics aktiviert. DISABLED <> Player Analytics deaktiviert. RELOAD_COMPLETE <> §a[Plan] Reload abgeschlossen. CACHE_SAVE <> Daten im Cache werden gespeichert... -CACHE_ADD <> REPLACE0 wurde zum Cache hinzugefügt. -CACHE_REMOVE <> REPLACE0 wurde aus dem Cache gelöscht. +CACHE_ADD <> ${0} wurde zum Cache hinzugefügt. +CACHE_REMOVE <> ${0} wurde aus dem Cache gelöscht. CONFIG_HEADER <> Plan Config | Mehr Informationen auf https://www.spigotmc.org/wiki/plan-configuration/ DB_INIT <> Datenbank Initialisierung... WEBSERVER_INIT <> Initialisiere Webserver... WEBSERVER_CLOSE <> Webserver wird heruntergefahren... -WEBSERVER_RUNNING <> Webserver läuft auf PORT REPLACE0 -DB_CONNECTION_FAIL <> REPLACE0-Datenbank Verbindung fehlgeschlagen: REPLACE1 -DB_ESTABLISHED <> REPLACE0-Datenbank Verbindung hergestellt. +WEBSERVER_RUNNING <> Webserver läuft auf PORT ${0} +DB_CONNECTION_FAIL <> ${0}-Datenbank Verbindung fehlgeschlagen: ${1} +DB_ESTABLISHED <> ${0}-Datenbank Verbindung hergestellt. DB_TYPE_DOES_NOT_EXIST <> Dieser Datenbank Typ existiert nicht. DB_FAILURE_DISABLE <> Datenbank Initialisierung fehlgeschlagen, deaktiviere Plan. NOTIFY_EMPTY_IP <> §e[Plan] IP in server.properties ist leer & Alternative ServerIP wird nicht benutzt, fehlerhafte Links werden ausgegeben! -VERSION_NEW_AVAILABLE <> Eine neue Version (REPLACE0) ist verfügbar auf https://www.spigotmc.org/resources/plan-player-analytics.32536/ +VERSION_NEW_AVAILABLE <> Eine neue Version (${0}) ist verfügbar auf https://www.spigotmc.org/resources/plan-player-analytics.32536/ VERSION_LATEST <> Du benutzt die neueste Version. VERSION_CHECK_ERROR <> Versionen konnten nicht abgeglichen werden. VERSION_FAIL <> Die neueste Versionsnummer konnte nicht abgerufen werden. @@ -25,7 +25,7 @@ GRABBING_DATA_MESSAGE <> »§2 Hole Daten ins Cache... DEM_UNKNOWN <> Nicht bekannt NOT_IN_TOWN <> Nicht in einem Dorf NOT_IN_FAC <> Nicht in einer Faction -COMMAND_TIMEOUT <> §c[Plan] REPLACE0 Befehl ausgetimed! Der Error befindest sich vermutlich in der Serverkonsole. +COMMAND_TIMEOUT <> §c[Plan] ${0} Befehl ausgetimed! Der Error befindest sich vermutlich in der Serverkonsole. ANALYSIS_START <> Analyse | Beginne die Analyse der Spieler Daten... ANALYSIS_BOOT_NOTIFY <> Analyse | Boot Analyse in 30 Sekunden... ANALYSIS_BOOT <> Analyse | Starte Boot Analyse... @@ -35,7 +35,7 @@ ANALYSIS_FAIL_NO_PLAYERS <> Analyse | Analyse fehlgeschlagen, keine bekannten Sp ANALYSIS_FAIL_NO_DATA <> Analyse | Analyse fehlgeschlagen, keine Daten in der Datenbank. ANALYSIS_BEGIN_ANALYSIS <> Analyse | Daten geholt, beginne mit der Analyse der Daten... ANALYSIS_COMPLETE <> Analyse | Analyse vollständig. -DATA_CORRUPTION_WARN <> Einige Daten könnten beschädigt sein: REPLACE0 +DATA_CORRUPTION_WARN <> Einige Daten könnten beschädigt sein: ${0} ERROR_NO_DATA_VIEW <> §eWebserver deaktiviert aber Alternative IP/PlanLite wird nicht benutzt, Daten können nicht angezeigt werden! ERROR_WEBSERVER_OFF_ANALYSIS <> §e[Plan] Dieser Befehl kann nur benutzt werden wenn der Webserver auf diesem Server läuft... ERROR_WEBSERVER_OFF_INSPECT <> §e[Plan] Dieser Befehl kann nur benutzt werden wenn Webserver/Planlite auf dem Server aktiviert ist. @@ -52,22 +52,22 @@ MANAGE_MOVE_SUCCESS <> §a[Plan] Alle Daten wurden erfolgreich verschoben! MANAGE_COPY_SUCCESS <> §a[Plan] Alle Daten wurden erfolgreich kopiert! MANAGE_PROCESS_FAIL <> §c[Plan] Irgendwas lief schief während die Daten verarbeitet wurden! MANAGE_CLEAR_SUCCESS <> §a[Plan] Alle Daten wurden erfolgreich gesäubert! -MANAGE_REMOVE_SUCCESS <> §f» §2Daten von §fREPLACE0§2 wurden aus dieser Datenbank entfernt §fREPLACE1§2. +MANAGE_REMOVE_SUCCESS <> §f» §2Daten von §f${0}§2 wurden aus dieser Datenbank entfernt §f${1}§2. MANAGE_IMPORTING <> §f» §2 Importiere Daten... MANAGE_SUCCESS <> §f» §2 Erfolgreich! CMD_ANALYZE_HEADER <> §f»§2 Player Analytics - Analyse Ergebnisse CMD_INSPECT_HEADER <> §f»§2 Player Analytics - Überprüfe die Ergebnisse: CMD_INFO_HEADER <> §f»§2 Player Analytics - Info -CMD_INFO_VERSION <> §7 •§2§2 Version: §7REPLACE0 +CMD_INFO_VERSION <> §7 •§2§2 Version: §7${0} CMD_SEARCH_HEADER <> §f»§2 Player Analytics - Suchergebnisse für: CMD_HELP_HEADER <> §f»§2 Player Analytics - Hilfe CMD_MANAGE_HELP_HEADER <> §f»§2 Player Analytics - Management Hilfe CMD_MANAGE_STATUS_HEADER <> §f»§2 Player Analytics - Datenbank Status -CMD_MANAGE_STATUS_ACTIVE_DB <> §7 •§2§2 Aktive Datenbank: §7REPLACE0 +CMD_MANAGE_STATUS_ACTIVE_DB <> §7 •§2§2 Aktive Datenbank: §7${0} CMD_CLICK_ME <> Klick Mich CMD_LINK <> §7 •§2 Link: §f -CMD_RESULTS_AVAILABLE <> §7 Die Ergebnisse werden für §fREPLACE0§7 Minuten erreichbar sein. -CMD_NO_RESULTS <> §7 •§2 Keine Ergebnisse für §7REPLACE0§2. +CMD_RESULTS_AVAILABLE <> §7 Die Ergebnisse werden für §f${0}§7 Minuten erreichbar sein. +CMD_NO_RESULTS <> §7 •§2 Keine Ergebnisse für §7${0}§2. CMD_MATCH <> §7 Übereinstimmender Spieler: §f CMD_USG_ANALYZE <> Zeige die Server Analyse CMD_USG_HELP <> Zeige die Befehlsliste. @@ -97,13 +97,13 @@ USE_PLAN <> Nutze /plan für Hilfe USE_MOVE <> Nutze /plan manage move [-a] USE_COMBINE <> Nutze /plan manage combine [-a] USE_IMPORT <> Nutze /plan manage import [-a] -WARN_REWRITE <> Daten in REPLACE0-Datenbank werden neu geschrieben! -WARN_OVERWRITE <> Daten in REPLACE0-Datenbank werden überschrieben! -WARN_OVERWRITE_SOME <> Einige Daten in REPLACE0-Datenbank werden überschrieben! -WARN_REMOVE <> Daten in REPLACE0-Datenbank werden entfernt! +WARN_REWRITE <> Daten in ${0}-Datenbank werden neu geschrieben! +WARN_OVERWRITE <> Daten in ${0}-Datenbank werden überschrieben! +WARN_OVERWRITE_SOME <> Einige Daten in ${0}-Datenbank werden überschrieben! +WARN_REMOVE <> Daten in ${0}-Datenbank werden entfernt! COMMAND_SENDER_NOT_PLAYER <> §c[Plan] Dieser Befehl kann nur als Spieler benutzt werden. -COMMAND_REQUIRES_ARGUMENTS <> §c[Plan] Dieser Befehl erfordert Argumente. REPLACE0 -COMMAND_ADD_CONFIRMATION_ARGUMENT <> §c[Plan] Füge -a hinzu um den Befehl zu bestätigen! REPLACE0 +COMMAND_REQUIRES_ARGUMENTS <> §c[Plan] Dieser Befehl erfordert Argumente. ${0} +COMMAND_ADD_CONFIRMATION_ARGUMENT <> §c[Plan] Füge -a hinzu um den Befehl zu bestätigen! ${0} COMMAND_REQUIRES_ARGUMENTS_ONE <> §c[Plan] Der Befehl benötigt ein Argument. COMMAND_NO_PERMISSION <> §c[Plan] Du hast nicht die benötigte Berechtigung. <<<<<>>>>> @@ -119,13 +119,13 @@ HIDDEN <> Versteckt (config) FACTION_NOT_FOUND <> Faction nicht gefunden FACTION_NO_LEADER <> Kein Anführer FACTION_NO_FACTIONS <> Keine Factions -WARPS <>
Warps: REPLACE0 -ACHIEVEMENTS <>
Errungenschaften: REPLACE0/REPLACE1 +WARPS <>
Warps: ${0} +ACHIEVEMENTS <>
Errungenschaften: ${0}/${1} JAILED <> | Eingesperrt MUTED <> | Stummgeschaltet -VOTES <>
Hat REPLACE0 mal gevoted -FACTION <>
Faction: REPLACE0 | Power: REPLACE1/REPLACE2 -TOWN <>
Dorf: REPLACE0 +VOTES <>
Hat ${0} mal gevoted +FACTION <>
Faction: ${0} | Power: ${1}/${2} +TOWN <>
Dorf: ${0} TOWN_NO_TOWNS <> Keine Dörfer GRAPH_BANNED <> Gesperrt GRAPH_UNKNOWN <> Unbekannt diff --git a/Plan/localization/locale_EN.txt b/Plan/localization/locale_EN.txt index 9c759ad4e..43efee632 100644 --- a/Plan/localization/locale_EN.txt +++ b/Plan/localization/locale_EN.txt @@ -1,31 +1,31 @@ ENABLED <> Player Analytics Enabled. DISABLED <> Player Analytics Disabled. -RELOAD_COMPLETE <> �a[Plan] Reload complete. +RELOAD_COMPLETE <> §a[Plan] Reload complete. CACHE_SAVE <> Saving cached data.. -CACHE_ADD <> Added REPLACE0 to Cache. -CACHE_REMOVE <> Cleared REPLACE0 from Cache. +CACHE_ADD <> Added ${0} to Cache. +CACHE_REMOVE <> Cleared ${0} from Cache. CONFIG_HEADER <> Plan Config | More info at https://www.spigotmc.org/wiki/plan-configuration/ DB_INIT <> Database init.. WEBSERVER_INIT <> Initializing Webserver.. WEBSERVER_CLOSE <> Shutting down Webserver.. -WEBSERVER_RUNNING <> Webserver running on PORT REPLACE0 -DB_CONNECTION_FAIL <> REPLACE0-Database Connection failed: REPLACE1 -DB_ESTABLISHED <> REPLACE0-database connection established. +WEBSERVER_RUNNING <> Webserver running on PORT ${0} +DB_CONNECTION_FAIL <> ${0}-Database Connection failed: ${1} +DB_ESTABLISHED <> ${0}-database connection established. DB_TYPE_DOES_NOT_EXIST <> That database type doesn't exist. DB_FAILURE_DISABLE <> Database initialization has failed, disabling Plan. -NOTIFY_EMPTY_IP <> �e[Plan] IP in server.properties is empty & AlternativeServerIP is not used, incorrect links will be given! -VERSION_NEW_AVAILABLE <> New Version (REPLACE0) is available at https://www.spigotmc.org/resources/plan-player-analytics.32536/ +NOTIFY_EMPTY_IP <> §e[Plan] IP in server.properties is empty & AlternativeServerIP is not used, incorrect links will be given! +VERSION_NEW_AVAILABLE <> New Version (${0}) is available at https://www.spigotmc.org/resources/plan-player-analytics.32536/ VERSION_LATEST <> You're running the latest version VERSION_CHECK_ERROR <> Failed to compare versions. VERSION_FAIL <> Failed to get newest version number. -USERNAME_NOT_VALID <> �c[Plan] This Player doesn't exist. -USERNAME_NOT_SEEN <> �c[Plan] This Player has not played on this server. -USERNAME_NOT_KNOWN <> �c[Plan] Player not found from the database. -GRABBING_DATA_MESSAGE <> ��2 Fetching data to cache.. +USERNAME_NOT_VALID <> §c[Plan] This Player doesn't exist. +USERNAME_NOT_SEEN <> §c[Plan] This Player has not played on this server. +USERNAME_NOT_KNOWN <> §c[Plan] Player not found from the database. +GRABBING_DATA_MESSAGE <> §2 Fetching data to cache.. DEM_UNKNOWN <> Not Known NOT_IN_TOWN <> Not in a town NOT_IN_FAC <> Not in a faction -COMMAND_TIMEOUT <> �c[Plan] REPLACE0 Command timed out! Error most likely on console. +COMMAND_TIMEOUT <> §c[Plan] ${0} Command timed out! Error most likely on console. ANALYSIS_START <> Analysis | Beginning analysis of user data.. ANALYSIS_BOOT_NOTIFY <> Analysis | Boot analysis in 30 seconds.. ANALYSIS_BOOT <> Analysis | Starting Boot Analysis.. @@ -35,40 +35,40 @@ ANALYSIS_FAIL_NO_PLAYERS <> Analysis | Analysis failed, no known players. ANALYSIS_FAIL_NO_DATA <> Analysis | Analysis failed, no data in the database. ANALYSIS_BEGIN_ANALYSIS <> Analysis | Data Fetched, beginning Analysis of data.. ANALYSIS_COMPLETE <> Analysis | Analysis Complete. -DATA_CORRUPTION_WARN <> Some data might be corrupted: REPLACE0 -ERROR_NO_DATA_VIEW <> �eWebserver disabled but Alternative IP/PlanLite not used, no way to view data! -ERROR_WEBSERVER_OFF_ANALYSIS <> �e[Plan] This command can be only used if the webserver is running on this server. -ERROR_WEBSERVER_OFF_INSPECT <> �e[Plan] This command can be only used if webserver/planlite is enabled on this server. -MANAGE_ERROR_INCORRECT_PLUGIN <> �c[Plan] Plugin not supported: -MANAGE_PROCESS_START <> ��7 Processing data.. -MANAGE_ERROR_PLUGIN_NOT_ENABLED <> �c[Plan] Plugin is not enabled: -MANAGE_ERROR_INCORRECT_DB <> �c[Plan] Incorrect database! (sqlite/mysql accepted): -MANAGE_ERROR_SAME_DB <> �c[Plan] Can't move to the same database! -MANAGE_DATABASE_FAILURE <> �c[Plan] One of the databases was not initialized properly. -MANAGE_DB_CONFIG_REMINDER <> �e[Plan] Remember to swap to the new database and reload plugin -MANAGE_ERROR_NO_PLAYERS <> �c[Plan] Database has no player data! -MANAGE_ERROR_BACKUP_FILE_NOT_FOUND <> �c[Plan] Backup file doesn't exist! -MANAGE_MOVE_SUCCESS <> �a[Plan] All data moved successfully! -MANAGE_COPY_SUCCESS <> �a[Plan] All data copied successfully! -MANAGE_PROCESS_FAIL <> �c[Plan] Something went wrong while processing the data! -MANAGE_CLEAR_SUCCESS <> �a[Plan] All data cleared successfully! -MANAGE_REMOVE_SUCCESS <> �f� �2Data of �fREPLACE0�2 was removed from Database �fREPLACE1�2. -MANAGE_IMPORTING <> �f� �2 Importing Data.. -MANAGE_SUCCESS <> �f� �2 Success! -CMD_ANALYZE_HEADER <> �f��2 Player Analytics - Analysis results -CMD_INSPECT_HEADER <> �f��2 Player Analytics - Inspect results: -CMD_INFO_HEADER <> �f��2 Player Analytics - Info -CMD_INFO_VERSION <> �7 ��2�2 Version: �7REPLACE0 -CMD_SEARCH_HEADER <> �f��2 Player Analytics - Search results for: -CMD_HELP_HEADER <> �f��2 Player Analytics - Help -CMD_MANAGE_HELP_HEADER <> �f��2 Player Analytics - Managment Help -CMD_MANAGE_STATUS_HEADER <> �f��2 Player Analytics - Database status -CMD_MANAGE_STATUS_ACTIVE_DB <> �7 ��2�2 Active Database: �7REPLACE0 +DATA_CORRUPTION_WARN <> Some data might be corrupted: ${0} +ERROR_NO_DATA_VIEW <> §eWebserver disabled but Alternative IP/PlanLite not used, no way to view data! +ERROR_WEBSERVER_OFF_ANALYSIS <> §e[Plan] This command can be only used if the webserver is running on this server. +ERROR_WEBSERVER_OFF_INSPECT <> §e[Plan] This command can be only used if webserver/planlite is enabled on this server. +MANAGE_ERROR_INCORRECT_PLUGIN <> §c[Plan] Plugin not supported: +MANAGE_PROCESS_START <> §§7 Processing data.. +MANAGE_ERROR_PLUGIN_NOT_ENABLED <> §c[Plan] Plugin is not enabled: +MANAGE_ERROR_INCORRECT_DB <> §c[Plan] Incorrect database! (sqlite/mysql accepted): +MANAGE_ERROR_SAME_DB <> §c[Plan] Can't move to the same database! +MANAGE_DATABASE_FAILURE <> §c[Plan] One of the databases was not initialized properly. +MANAGE_DB_CONFIG_REMINDER <> §e[Plan] Remember to swap to the new database and reload plugin +MANAGE_ERROR_NO_PLAYERS <> §c[Plan] Database has no player data! +MANAGE_ERROR_BACKUP_FILE_NOT_FOUND <> §c[Plan] Backup file doesn't exist! +MANAGE_MOVE_SUCCESS <> §a[Plan] All data moved successfully! +MANAGE_COPY_SUCCESS <> §a[Plan] All data copied successfully! +MANAGE_PROCESS_FAIL <> §c[Plan] Something went wrong while processing the data! +MANAGE_CLEAR_SUCCESS <> §a[Plan] All data cleared successfully! +MANAGE_REMOVE_SUCCESS <> §f§ §2Data of §f${0}§2 was removed from Database §f${1}§2. +MANAGE_IMPORTING <> §f§ §2 Importing Data.. +MANAGE_SUCCESS <> §f§ §2 Success! +CMD_ANALYZE_HEADER <> §f§§2 Player Analytics - Analysis results +CMD_INSPECT_HEADER <> §f§§2 Player Analytics - Inspect results: +CMD_INFO_HEADER <> §f§§2 Player Analytics - Info +CMD_INFO_VERSION <> §7 §§2§2 Version: §7${0} +CMD_SEARCH_HEADER <> §f§§2 Player Analytics - Search results for: +CMD_HELP_HEADER <> §f§§2 Player Analytics - Help +CMD_MANAGE_HELP_HEADER <> §f§§2 Player Analytics - Managment Help +CMD_MANAGE_STATUS_HEADER <> §f§§2 Player Analytics - Database status +CMD_MANAGE_STATUS_ACTIVE_DB <> §7 §§2§2 Active Database: §7${0} CMD_CLICK_ME <> Click Me -CMD_LINK <> �7 ��2 Link: �f -CMD_RESULTS_AVAILABLE <> �7 Results will be available for �fREPLACE0�7 minutes. -CMD_NO_RESULTS <> �7 ��2 No results for �7REPLACE0�2. -CMD_MATCH <> �7 Matching player: �f +CMD_LINK <> §7 §§2 Link: §f +CMD_RESULTS_AVAILABLE <> §7 Results will be available for §f${0}§7 minutes. +CMD_NO_RESULTS <> §7 §§2 No results for §7${0}§2. +CMD_MATCH <> §7 Matching player: §f CMD_USG_ANALYZE <> View the Server Analysis CMD_USG_HELP <> Show command list. CMD_USG_INFO <> View Version of Plan @@ -97,15 +97,15 @@ USE_PLAN <> Use /plan for help USE_MOVE <> Use /plan manage move [-a] USE_COMBINE <> Use /plan manage combine [-a] USE_IMPORT <> Use /plan manage import [-a] -WARN_REWRITE <> Data in REPLACE0-database will be rewritten! -WARN_OVERWRITE <> Data in REPLACE0-database will be overwritten! -WARN_OVERWRITE_SOME <> Some data in REPLACE0-database will be overwritten! -WARN_REMOVE <> Data in REPLACE0-database will be removed! -COMMAND_SENDER_NOT_PLAYER <> �c[Plan] This command can be only used as a player. -COMMAND_REQUIRES_ARGUMENTS <> �c[Plan] Command requires arguments. REPLACE0 -COMMAND_ADD_CONFIRMATION_ARGUMENT <> �c[Plan] Add -a to confirm execution! REPLACE0 -COMMAND_REQUIRES_ARGUMENTS_ONE <> �c[Plan] Command requires one argument. -COMMAND_NO_PERMISSION <> �c[Plan] You do not have the required permission. +WARN_REWRITE <> Data in ${0}-database will be rewritten! +WARN_OVERWRITE <> Data in ${0}-database will be overwritten! +WARN_OVERWRITE_SOME <> Some data in ${0}-database will be overwritten! +WARN_REMOVE <> Data in ${0}-database will be removed! +COMMAND_SENDER_NOT_PLAYER <> §c[Plan] This command can be only used as a player. +COMMAND_REQUIRES_ARGUMENTS <> §c[Plan] Command requires arguments. ${0} +COMMAND_ADD_CONFIRMATION_ARGUMENT <> §c[Plan] Add -a to confirm execution! ${0} +COMMAND_REQUIRES_ARGUMENTS_ONE <> §c[Plan] Command requires one argument. +COMMAND_NO_PERMISSION <> §c[Plan] You do not have the required permission. <<<<<>>>>> WARN_INACCURATE <>
Data might be inaccurate, player has just registered.
BANNED <> | Banned @@ -119,13 +119,13 @@ HIDDEN <> Hidden (config) FACTION_NOT_FOUND <> Faction not found FACTION_NO_LEADER <> No leader FACTION_NO_FACTIONS <> No Factions -WARPS <>
Warps: REPLACE0 -ACHIEVEMENTS <>
Achievements: REPLACE0/REPLACE1 +WARPS <>
Warps: ${0} +ACHIEVEMENTS <>
Achievements: ${0}/${1} JAILED <> | Jailed MUTED <> | Muted -VOTES <>
Has voted REPLACE0times -FACTION <>
Faction: REPLACE0 | Power: REPLACE1/REPLACE2 -TOWN <>
Town: REPLACE0 +VOTES <>
Has voted ${0}times +FACTION <>
Faction: ${0} | Power: ${1}/${2} +TOWN <>
Town: ${0} TOWN_NO_TOWNS <> No Towns GRAPH_BANNED <> Banned GRAPH_UNKNOWN <> Unknown diff --git a/Plan/localization/locale_FI.txt b/Plan/localization/locale_FI.txt index 229ba56e0..90c957989 100644 --- a/Plan/localization/locale_FI.txt +++ b/Plan/localization/locale_FI.txt @@ -2,19 +2,19 @@ ENABLED <> Player Analytics Käynnistetty. DISABLED <> Player Analytics Sammutettu. RELOAD_COMPLETE <> §a[Plan] Reload suoritettu. CACHE_SAVE <> Tallennetaan välimuistin tietoja.. -CACHE_ADD <> REPLACE0 lisätty välimuistiin. -CACHE_REMOVE <> REPLACE0 poistettu välimuistista. +CACHE_ADD <> ${0} lisätty välimuistiin. +CACHE_REMOVE <> ${0} poistettu välimuistista. CONFIG_HEADER <> Plan Config | More info at https://www.spigotmc.org/wiki/plan-configuration/ DB_INIT <> Tietokannan käynnistys.. WEBSERVER_INIT <> WebServerin käynnistys.. WEBSERVER_CLOSE <> Suljetaan WebServer.. -WEBSERVER_RUNNING <> Webserver puörii PORTILLA REPLACE0 -DB_CONNECTION_FAIL <> REPLACE0-Tietokantayhteys ei onnistunut: REPLACE1 -DB_ESTABLISHED <> REPLACE0-yhteys luotu. +WEBSERVER_RUNNING <> Webserver puörii PORTILLA ${0} +DB_CONNECTION_FAIL <> ${0}-Tietokantayhteys ei onnistunut: ${1} +DB_ESTABLISHED <> ${0}-yhteys luotu. DB_TYPE_DOES_NOT_EXIST <> Tietokantatyyppiä ei tueta. DB_FAILURE_DISABLE <> Tietokannan käynnistys epäonnistui, suljetaan Plan. NOTIFY_EMPTY_IP <> §e[Plan] IP server.properties-tiedostossa on tyhjä & AlternativeServerIP-asetusta ei käytetä, plugin antaa virheellisiä linkkejä! -VERSION_NEW_AVAILABLE <> Uusi versio (REPLACE0) on saatavilla: https://www.spigotmc.org/resources/plan-player-analytics.32536/ +VERSION_NEW_AVAILABLE <> Uusi versio (${0}) on saatavilla: https://www.spigotmc.org/resources/plan-player-analytics.32536/ VERSION_LATEST <> Käytät viimeisintä versiota VERSION_CHECK_ERROR <> Virhe vertaillessa versioita. VERSION_FAIL <> Virhe haettaessa versionumeroa. @@ -25,7 +25,7 @@ GRABBING_DATA_MESSAGE <> »§2 Haetaan tietoja välimuistiin.. DEM_UNKNOWN <> Ei tiedossa NOT_IN_TOWN <> Ei kylässä NOT_IN_FAC <> Ei killassa -COMMAND_TIMEOUT <> §c[Plan] REPLACE0 Komennon aikakatkaisu. Virhe tod.näk. konsolissa +COMMAND_TIMEOUT <> §c[Plan] ${0} Komennon aikakatkaisu. Virhe tod.näk. konsolissa ANALYSIS_START <> Analysis | Aloitetaan analyysi.. ANALYSIS_BOOT_NOTIFY <> Analysis | Käynnistyksen yhteinen analyysi 30 sekunnin kuluttua.. ANALYSIS_BOOT <> Analysis | Aloitetaan käynnistyksen yhteinen analyysi.. @@ -35,7 +35,7 @@ ANALYSIS_FAIL_NO_PLAYERS <> Analysis | Analyysi epäonnistui, ei pelaajia. ANALYSIS_FAIL_NO_DATA <> Analysis | Analyysi epäonnistui, ei tietoa tietokannassa. ANALYSIS_BEGIN_ANALYSIS <> Analysis | Tieto haettu, aloitetaan tiedon työstäminen.. ANALYSIS_COMPLETE <> Analysis | Analyysi valmis. -DATA_CORRUPTION_WARN <> Jonkun data voi olla korruptoitunut: REPLACE0 +DATA_CORRUPTION_WARN <> Jonkun data voi olla korruptoitunut: ${0} ERROR_NO_DATA_VIEW <> §eWebserver on poissa käytössä eikä Alternative IP ole käytössä, no way to view data! ERROR_WEBSERVER_OFF_ANALYSIS <> §e[Plan] Tätä komentoa voi käyttää vain jos Webserver pyörii serverillä. ERROR_WEBSERVER_OFF_INSPECT <> §e[Plan] Tätä komentoa voi käyttää vain jos Webserver pyörii serverillä. @@ -52,22 +52,22 @@ MANAGE_MOVE_SUCCESS <> §a[Plan] Kaikki tieto siirretty onnistuneesti! MANAGE_COPY_SUCCESS <> §a[Plan] Kaikki tieto kopioitu onnistuneesti! MANAGE_PROCESS_FAIL <> §c[Plan] Jokin meni pieleen työstäessä tietoa! MANAGE_CLEAR_SUCCESS <> §a[Plan] Kaikki tieto poistettu onnistuneesti! -MANAGE_REMOVE_SUCCESS <> §f» §2§fREPLACE0n§2 tiedot poistettiin §fREPLACE1§2-tietokannasta. +MANAGE_REMOVE_SUCCESS <> §f» §2§f${0}n§2 tiedot poistettiin §f${1}§2-tietokannasta. MANAGE_IMPORTING <> §f» §2 Tuodaan tietoa.. MANAGE_SUCCESS <> §f» §2 Onnistui! CMD_ANALYZE_HEADER <> §f»§2 Player Analytics - Analyysin tulokset CMD_INSPECT_HEADER <> §f»§2 Player Analytics - Inspect tulokset: CMD_INFO_HEADER <> §f»§2 Player Analytics - Info -CMD_INFO_VERSION <> §7 •§2§2 Versio: §7REPLACE0 +CMD_INFO_VERSION <> §7 •§2§2 Versio: §7${0} CMD_SEARCH_HEADER <> §f»§2 Player Analytics - Haun tulokset: CMD_HELP_HEADER <> §f»§2 Player Analytics - Apua CMD_MANAGE_HELP_HEADER <> §f»§2 Player Analytics - Managment-komennon apu CMD_MANAGE_STATUS_HEADER <> §f»§2 Player Analytics - Tietokannan tila -CMD_MANAGE_STATUS_ACTIVE_DB <> §7 •§2§2 Aktiivinen tietokanta: §7REPLACE0 +CMD_MANAGE_STATUS_ACTIVE_DB <> §7 •§2§2 Aktiivinen tietokanta: §7${0} CMD_CLICK_ME <> Klikkaa minua! CMD_LINK <> §7 •§2 Linkki: §f -CMD_RESULTS_AVAILABLE <> §7 Tulokset saatavilla §fREPLACE0§7 minuuttia. -CMD_NO_RESULTS <> §7 •§2 Ei tuloksia §7REPLACE0§2. +CMD_RESULTS_AVAILABLE <> §7 Tulokset saatavilla §f${0}§7 minuuttia. +CMD_NO_RESULTS <> §7 •§2 Ei tuloksia §7${0}§2. CMD_MATCH <> §7 Vastaava pelaaja: §f CMD_USG_ANALYZE <> Tarkastele analyysia CMD_USG_HELP <> Tarkastele komentoja. @@ -97,13 +97,13 @@ USE_PLAN <> Käytä /plan nähdäksesi apu USE_MOVE <> Käytä /plan manage move [-a] USE_COMBINE <> Käytä /plan manage combine [-a] USE_IMPORT <> Käytä /plan manage import [-a] -WARN_REWRITE <> Tiedot REPLACE0-tietokannassa uudelleenkirjoitetaan! -WARN_OVERWRITE <> Tiedot REPLACE0-tietokannassa ylikirjoitetaan! -WARN_OVERWRITE_SOME <> Osa tiedoista REPLACE0-tietokannassa ylikirjoitetaan! -WARN_REMOVE <> Tiedot REPLACE0-tietokannasta poistetaan! +WARN_REWRITE <> Tiedot ${0}-tietokannassa uudelleenkirjoitetaan! +WARN_OVERWRITE <> Tiedot ${0}-tietokannassa ylikirjoitetaan! +WARN_OVERWRITE_SOME <> Osa tiedoista ${0}-tietokannassa ylikirjoitetaan! +WARN_REMOVE <> Tiedot ${0}-tietokannasta poistetaan! COMMAND_SENDER_NOT_PLAYER <> §c[Plan] Tätä komentoa voi käyttää vain pelaaja. -COMMAND_REQUIRES_ARGUMENTS <> §c[Plan] Komento tarvii argumentteja. REPLACE0 -COMMAND_ADD_CONFIRMATION_ARGUMENT <> §c[Plan] Lisää -a vahvistaaksesi komennon ajo! REPLACE0 +COMMAND_REQUIRES_ARGUMENTS <> §c[Plan] Komento tarvii argumentteja. ${0} +COMMAND_ADD_CONFIRMATION_ARGUMENT <> §c[Plan] Lisää -a vahvistaaksesi komennon ajo! ${0} COMMAND_REQUIRES_ARGUMENTS_ONE <> §c[Plan] Komento tarvii yhden argumentin. COMMAND_NO_PERMISSION <> §c[Plan] Ei oo lupaa! <<<<<>>>>> @@ -119,13 +119,13 @@ HIDDEN <> Piilotettu (config) FACTION_NOT_FOUND <> Kiltaa ei löytynyt FACTION_NO_LEADER <> Ei johtajaa FACTION_NO_FACTIONS <> Ei kiltoja -WARPS <>
Warpit: REPLACE0 -ACHIEVEMENTS <>
Achievementit: REPLACE0/REPLACE1 +WARPS <>
Warpit: ${0} +ACHIEVEMENTS <>
Achievementit: ${0}/${1} JAILED <> | Vankilassa MUTED <> | Mutetettu -VOTES <>
On äänestänyt REPLACE0kertaa -FACTION <>
Kilta: REPLACE0 | Voima: REPLACE1/REPLACE2 -TOWN <>
Kylä: REPLACE0 +VOTES <>
On äänestänyt ${0}kertaa +FACTION <>
Kilta: ${0} | Voima: ${1}/${2} +TOWN <>
Kylä: ${0} TOWN_NO_TOWNS <> Ei kyliä GRAPH_BANNED <> Pannassa GRAPH_UNKNOWN <> Ei tiedossa diff --git a/Plan/src/main/java/com/djrapitops/plan/data/additional/PluginConfigSectionHandler.java b/Plan/src/main/java/com/djrapitops/plan/data/additional/PluginConfigSectionHandler.java index 6388ae57d..8e953c35f 100644 --- a/Plan/src/main/java/com/djrapitops/plan/data/additional/PluginConfigSectionHandler.java +++ b/Plan/src/main/java/com/djrapitops/plan/data/additional/PluginConfigSectionHandler.java @@ -32,7 +32,7 @@ public class PluginConfigSectionHandler { private ConfigurationSection getPluginsSection() { FileConfiguration config = plan.getConfig(); - return config.getConfigurationSection("Customization.Plugins"); + return config.getConfigurationSection("Plugins"); } public void createSection(PluginData dataSource) { @@ -44,7 +44,7 @@ public class PluginConfigSectionHandler { section.addDefault(pluginName + ".Data." + source, true); FileConfiguration config = plan.getConfig(); - config.set("Customization.Plugins", section); + config.set("Plugins", section); plan.saveConfig(); } diff --git a/Plan/src/main/java/com/djrapitops/plan/locale/Locale.java b/Plan/src/main/java/com/djrapitops/plan/locale/Locale.java index 52275b9cb..3c68ad131 100644 --- a/Plan/src/main/java/com/djrapitops/plan/locale/Locale.java +++ b/Plan/src/main/java/com/djrapitops/plan/locale/Locale.java @@ -124,9 +124,9 @@ public class Locale { add(Msg.ENABLED, "Player Analytics Enabled."); add(Msg.ENABLE_DB_INIT, "Database init.."); - add(Msg.ENABLE_DB_INFO, "REPLACE0-database connection established."); + add(Msg.ENABLE_DB_INFO, "${0}-database connection established."); add(Msg.ENABLE_WEBSERVER, "Initializing Webserver.."); - add(Msg.ENABLE_WEBSERVER_INFO, "Webserver running on PORT REPLACE0"); + add(Msg.ENABLE_WEBSERVER_INFO, "Webserver running on PORT ${0}"); add(Msg.ENABLE_BOOT_ANALYSIS_INFO, analysis + "Boot analysis in 30 seconds.."); add(Msg.ENABLE_BOOT_ANALYSIS_RUN_INFO, analysis + "Starting Boot Analysis.."); @@ -137,10 +137,10 @@ public class Locale { add(Msg.ENABLE_NOTIFY_DISABLED_DEATHLISTENER, yellow + "Death listener disabled, player & mob kills not recorded."); add(Msg.ENABLE_FAIL_WRONG_DB, "That database type doesn't exist."); - add(Msg.ENABLE_FAIL_DB, "REPLACE0-Database Connection failed: REPLACE1"); + add(Msg.ENABLE_FAIL_DB, "${0}-Database Connection failed: ${1}"); add(Msg.ENABLE_DB_FAIL_DISABLE_INFO, "Database initialization has failed, disabling Plan."); - add(Msg.RUN_WARN_QUEUE_SIZE, "Queue size is too small! (REPLACE0), change the setting to a higher number! (Currently REPLACE1)"); + add(Msg.RUN_WARN_QUEUE_SIZE, "Queue size is too small! (${0}), change the setting to a higher number! (Currently ${1})"); add(Msg.DISABLED, "Player Analytics Disabled."); add(Msg.DISABLE_CACHE_SAVE, "Saving cached data.."); @@ -149,9 +149,9 @@ public class Locale { add(Msg.ANALYSIS_START, analysis + "Beginning analysis of user data.."); add(Msg.ANALYSIS_FETCH_UUID, analysis + "Checking for available players.."); add(Msg.ANALYSIS_FETCH, analysis + "Fetching Data.."); - add(Msg.ANALYSIS_PHASE_START, analysis + "Data Fetched (REPLACE0 users, took REPLACE1ms), beginning Analysis of data.."); + add(Msg.ANALYSIS_PHASE_START, analysis + "Data Fetched (${0} users, took ${1}ms), beginning Analysis of data.."); add(Msg.ANALYSIS_3RD_PARTY, analysis + "Analyzing additional data sources (3rd party)"); - add(Msg.ANALYSIS_FINISHED, analysis + "Analysis Complete. (took REPLACE0ms) REPLACE1"); + add(Msg.ANALYSIS_FINISHED, analysis + "Analysis Complete. (took ${0}ms) ${1}"); add(Msg.ANALYSIS_FAIL_NO_PLAYERS, analysis + "Analysis failed, no known players."); add(Msg.ANALYSIS_FAIL_NO_DATA, analysis + "Analysis failed, no data in the database."); add(Msg.ANALYSIS_FAIL_FETCH_EXCEPTION, analysis + "Failed to fetch data for Analysis, Exception occurred."); @@ -164,7 +164,7 @@ public class Locale { add(Msg.MANAGE_INFO_COPY_SUCCESS, green + prefix + "All data copied successfully!"); add(Msg.MANAGE_INFO_MOVE_SUCCESS, green + prefix + "All data moved successfully!"); add(Msg.MANAGE_INFO_CLEAR_SUCCESS, green + prefix + "All data cleared successfully!"); - add(Msg.MANAGE_INFO_REMOVE_SUCCESS, cmdFooter + " " + mCol + "Data of " + tCol + "REPLACE0" + mCol + " was removed from Database " + tCol + "REPLACE1" + mCol + "."); + add(Msg.MANAGE_INFO_REMOVE_SUCCESS, cmdFooter + " " + mCol + "Data of " + tCol + "${0}" + mCol + " was removed from Database " + tCol + "${1}" + mCol + "."); add(Msg.MANAGE_FAIL_INCORRECT_PLUGIN, red + prefix + "Plugin not supported: "); add(Msg.MANAGE_FAIL_PLUGIN_NOT_ENABLED, red + prefix + "Plugin is not enabled: "); @@ -174,19 +174,19 @@ public class Locale { add(Msg.MANAGE_FAIL_NO_PLAYERS, red + prefix + "Database has no player data!"); add(Msg.MANAGE_FAIL_FILE_NOT_FOUND, red + prefix + "Backup file doesn't exist!"); - add(Msg.MANAGE_FAIL_CONFIRM, red + prefix + "Add -a to confirm execution! REPLACE0"); - add(Msg.MANAGE_NOTIFY_REWRITE, "Data in REPLACE0-database will be rewritten!"); - add(Msg.MANAGE_NOTIFY_OVERWRITE, "Data in REPLACE0-database will be overwritten!"); - add(Msg.MANAGE_NOTIFY_PARTIAL_OVERWRITE, "Some data in REPLACE0-database will be overwritten!"); - add(Msg.MANAGE_NOTIFY_REMOVE, "Data in REPLACE0-database will be removed!"); + add(Msg.MANAGE_FAIL_CONFIRM, red + prefix + "Add -a to confirm execution! ${0}"); + add(Msg.MANAGE_NOTIFY_REWRITE, "Data in ${0}-database will be rewritten!"); + add(Msg.MANAGE_NOTIFY_OVERWRITE, "Data in ${0}-database will be overwritten!"); + add(Msg.MANAGE_NOTIFY_PARTIAL_OVERWRITE, "Some data in ${0}-database will be overwritten!"); + add(Msg.MANAGE_NOTIFY_REMOVE, "Data in ${0}-database will be removed!"); - add(Msg.CMD_FAIL_REQ_ARGS, red + prefix + "Command requires arguments. REPLACE0"); + add(Msg.CMD_FAIL_REQ_ARGS, red + prefix + "Command requires arguments. ${0}"); add(Msg.CMD_FAIL_REQ_ONE_ARG, red + prefix + "Command requires one argument."); add(Msg.CMD_FAIL_NO_PERMISSION, red + prefix + "You do not have the required permission."); add(Msg.CMD_FAIL_USERNAME_NOT_VALID, red + prefix + "This Player doesn't exist."); add(Msg.CMD_FAIL_USERNAME_NOT_SEEN, red + prefix + "This Player has not played on this server."); add(Msg.CMD_FAIL_USERNAME_NOT_KNOWN, red + prefix + "Player not found from the database."); - add(Msg.CMD_FAIL_TIMEOUT, red + prefix + "REPLACE0 Command timed out! Check '/plan status' & console."); + add(Msg.CMD_FAIL_TIMEOUT, red + prefix + "${0} Command timed out! Check '/plan status' & console."); add(Msg.CMD_FAIL_NO_DATA_VIEW, yellow + "" + prefix + "No Way to view Data Available."); add(Msg.CMD_INFO_ANALYSIS_TEMP_DISABLE, yellow + "Analysis has been temporarily disabled due to expensive task, use /plan status for info."); @@ -195,7 +195,7 @@ public class Locale { add(Msg.CMD_INFO_CLICK_ME, "Click Me"); add(Msg.CMD_INFO_LINK, sCol + " • " + mCol + "Link: " + tCol); add(Msg.CMD_INFO_RESULTS, sCol + " Matching players: " + tCol); - add(Msg.CMD_INFO_NO_RESULTS, sCol + " • " + mCol + "No results for " + sCol + "REPLACE0" + mCol + "."); + add(Msg.CMD_INFO_NO_RESULTS, sCol + " • " + mCol + "No results for " + sCol + "${0}" + mCol + "."); add(Msg.CMD_INFO_SEARCHING, cmdFooter + mCol + "Searching.."); add(Msg.CMD_USG_ANALYZE, "View the Server Analysis"); diff --git a/Plan/src/main/java/com/djrapitops/plan/ui/html/DataRequestHandler.java b/Plan/src/main/java/com/djrapitops/plan/ui/html/DataRequestHandler.java index 6b2a475cd..1d153b4fa 100644 --- a/Plan/src/main/java/com/djrapitops/plan/ui/html/DataRequestHandler.java +++ b/Plan/src/main/java/com/djrapitops/plan/ui/html/DataRequestHandler.java @@ -51,6 +51,7 @@ public class DataRequestHandler { if (data == null) { return "

404 Data was not found in cache

"; } + return HtmlUtils.replacePlaceholders( HtmlUtils.getStringFromResource("player.html"), PlaceholderUtils.getInspectReplaceRules(data) diff --git a/Plan/src/main/java/com/djrapitops/plan/ui/html/Html.java b/Plan/src/main/java/com/djrapitops/plan/ui/html/Html.java index 0d916583a..162f40f5a 100644 --- a/Plan/src/main/java/com/djrapitops/plan/ui/html/Html.java +++ b/Plan/src/main/java/com/djrapitops/plan/ui/html/Html.java @@ -1,8 +1,11 @@ package main.java.com.djrapitops.plan.ui.html; import com.djrapitops.plugin.utilities.Verify; +import org.apache.commons.lang.text.StrSubstitutor; import java.io.Serializable; +import java.util.HashMap; +import java.util.Map; /** * @author Rsl1122 @@ -26,34 +29,34 @@ public enum Html { COLOR_E(""), COLOR_F(""), // - FONT_AWESOME_ICON(""), - MINOTAR_SMALL_IMG("\"REPLACE0\""), - SPAN("REPLACE0"), - BUTTON("REPLACE1"), + FONT_AWESOME_ICON(""), + MINOTAR_SMALL_IMG("\"${0}\""), + SPAN("${0}"), + BUTTON("${1}"), BUTTON_CLASS("class=\"button\""), - LINK("REPLACE1"), - LINK_EXTERNAL("REPLACE1"), + LINK("${1}"), + LINK_EXTERNAL("${1}"), LINK_CLASS("class=\"link\""), - IMG(""), - COLUMNS_DIV_WRAPPER("
REPLACE0
"), - COLUMN_DIV_WRAPPER("
REPLACE0
"), - HEADER("
REPLACE0
"), - PLUGIN_DATA_WRAPPER("
REPLACE0
"), + IMG(""), + COLUMNS_DIV_WRAPPER("
${0}
"), + COLUMN_DIV_WRAPPER("
${0}
"), + HEADER("
${0}
"), + PLUGIN_DATA_WRAPPER("
${0}
"), PLUGIN_CONTAINER_START("
"), // - TABLE_START_2(""), - TABLE_START_3("
REPLACE0REPLACE1
"), - TABLE_START_4("
REPLACE0REPLACE1REPLACE2
"), + TABLE_START_2("
REPLACE0REPLACE1REPLACE2REPLACE3
"), + TABLE_START_3("
${0}${1}
"), + TABLE_START_4("
${0}${1}${2}
"), TABLE_SESSIONS_START(TABLE_START_3.parse("Session Started", "Session Ended", "Session Length")), TABLE_KILLS_START(TABLE_START_3.parse("Date", "Killed", "With")), TABLE_FACTIONS_START(TABLE_START_4.parse(FONT_AWESOME_ICON.parse("flag") + " Faction", FONT_AWESOME_ICON.parse("bolt") + " Power", FONT_AWESOME_ICON.parse("map-o") + " Land", FONT_AWESOME_ICON.parse("user") + " Leader")), TABLE_TOWNS_START(TABLE_START_4.parse(FONT_AWESOME_ICON.parse("bank") + " Town", FONT_AWESOME_ICON.parse("users") + " Residents", FONT_AWESOME_ICON.parse("map-o") + " Land", FONT_AWESOME_ICON.parse("user") + " Mayor")), - TABLELINE_2(""), - TABLELINE_3(""), - TABLELINE_4(""), - TABLELINE_PLAYERS("" + ""), - TABLELINE_3_CUSTOMKEY(""), - TABLELINE_3_CUSTOMKEY_1(""), + TABLELINE_2(""), + TABLELINE_3(""), + TABLELINE_4(""), + TABLELINE_PLAYERS("" + ""), + TABLELINE_3_CUSTOMKEY(""), + TABLELINE_3_CUSTOMKEY_1(""), ERROR_TABLE_2(TABLELINE_2.parse("No data", "No data")), TABLE_END("
${0}${1}${2}${3}
REPLACE0REPLACE1
REPLACE0REPLACE1REPLACE2
REPLACE0REPLACE1REPLACE2REPLACE3
REPLACE0REPLACE1REPLACE3REPLACE4REPLACE6REPLACE8REPLACE9
REPLACE1REPLACE3REPLACE5
REPLACE1REPLACE2REPLACE3
${0}${1}
${0}${1}${2}
${0}${1}${2}${3}
${0}${1}${3}${4}${6}${8}${9}
${1}${3}${5}
${1}${2}${3}
"); // KILLDATA_NONE("No Kills"), @@ -76,10 +79,15 @@ public enum Html { */ public String parse(Serializable... p) { Verify.nullCheck(p); - String returnValue = this.html; + + Map replaceMap = new HashMap<>(); + for (int i = 0; i < p.length; i++) { - returnValue = returnValue.replace("REPLACE" + i, p[i].toString()); + replaceMap.put(String.valueOf(i), p[i].toString()); } - return returnValue; + + StrSubstitutor sub = new StrSubstitutor(replaceMap); + + return sub.replace(html); } } diff --git a/Plan/src/main/java/com/djrapitops/plan/ui/webserver/WebServer.java b/Plan/src/main/java/com/djrapitops/plan/ui/webserver/WebServer.java index 5cf819295..48a0b4325 100644 --- a/Plan/src/main/java/com/djrapitops/plan/ui/webserver/WebServer.java +++ b/Plan/src/main/java/com/djrapitops/plan/ui/webserver/WebServer.java @@ -26,6 +26,7 @@ import javax.net.ssl.*; import java.io.*; import java.net.InetSocketAddress; import java.net.URI; +import java.nio.charset.StandardCharsets; import java.nio.file.Paths; import java.security.*; import java.security.cert.Certificate; @@ -281,7 +282,7 @@ public class WebServer { } try { - return new String(bytes, "ISO-8859-1"); + return new String(bytes, StandardCharsets.ISO_8859_1); } catch (Exception e) { return null; } diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/PlaceholderUtils.java b/Plan/src/main/java/com/djrapitops/plan/utilities/PlaceholderUtils.java index 806399127..c8d2fb049 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/PlaceholderUtils.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/PlaceholderUtils.java @@ -42,14 +42,14 @@ public class PlaceholderUtils { public static Map getAnalysisReplaceRules(AnalysisData data) { HashMap replaceMap = new HashMap<>(); replaceMap.putAll(data.getReplaceMap()); - replaceMap.put("%plugins%", data.replacePluginsTabLayout()); + replaceMap.put("plugins", data.replacePluginsTabLayout()); - replaceMap.put("%refresh%", FormatUtils.formatTimeAmountDifference(data.getRefreshDate(), MiscUtils.getTime())); - replaceMap.put("%refreshlong%", String.valueOf(data.getRefreshDate())); + replaceMap.put("refresh", FormatUtils.formatTimeAmountDifference(data.getRefreshDate(), MiscUtils.getTime())); + replaceMap.put("refreshlong", String.valueOf(data.getRefreshDate())); - replaceMap.put("%servername%", Settings.SERVER_NAME.toString()); + replaceMap.put("servername", Settings.SERVER_NAME.toString()); - replaceMap.put("%timezone%", MiscUtils.getTimeZoneOffsetHours()); + replaceMap.put("timezone", MiscUtils.getTimeZoneOffsetHours()); // Html Theme colors String[] colors = new String[]{Settings.HCOLOR_MAIN.toString(), Settings.HCOLOR_MAIN_DARK.toString(), Settings.HCOLOR_SEC.toString(), Settings.HCOLOR_TER.toString(), Settings.HCOLOR_TER_DARK.toString()}; @@ -71,17 +71,17 @@ public class PlaceholderUtils { public static Map getInspectReplaceRules(UserData data) { HashMap replaceMap = new HashMap<>(); - replaceMap.put("%timezone%", MiscUtils.getTimeZoneOffsetHours()); + replaceMap.put("timezone", MiscUtils.getTimeZoneOffsetHours()); boolean showIPandUUID = Settings.SECURITY_IP_UUID.isTrue(); UUID uuid = data.getUuid(); - replaceMap.put("%uuid%", (showIPandUUID ? uuid.toString() : "Hidden (Config)")); - replaceMap.put("%lastseen%", FormatUtils.formatTimeStampYear(data.getLastPlayed())); - replaceMap.put("%logintimes%", data.getLoginTimes()); - replaceMap.put("%geoloc%", data.getGeolocation()); + replaceMap.put("uuid", (showIPandUUID ? uuid.toString() : "Hidden (Config)")); + replaceMap.put("lastseen", FormatUtils.formatTimeStampYear(data.getLastPlayed())); + replaceMap.put("logintimes", data.getLoginTimes()); + replaceMap.put("geoloc", data.getGeolocation()); long now = MiscUtils.getTime(); boolean isActive = AnalysisUtils.isActive(now, data.getLastPlayed(), data.getPlayTime(), data.getLoginTimes()); - replaceMap.put("%active%", isActive ? Locale.get(Msg.HTML_ACTIVE).parse() : Locale.get(Msg.HTML_INACTIVE).parse()); + replaceMap.put("active", isActive ? Locale.get(Msg.HTML_ACTIVE).parse() : Locale.get(Msg.HTML_INACTIVE).parse()); GamemodePart gmPart = new GamemodePart(); Map gmTimes = data.getGmTimes().getTimes(); String[] gms = GMTimesTable.getGMKeyArray(); @@ -94,32 +94,32 @@ public class PlaceholderUtils { gmPart.analyse(); replaceMap.putAll(gmPart.getReplaceMap()); - replaceMap.put("%ips%", showIPandUUID ? data.getIps().toString() : "Hidden (Config)"); - replaceMap.put("%nicknames%", HtmlUtils.removeXSS(HtmlUtils.swapColorsToSpan(data.getNicknames().toString()))); - replaceMap.put("%name%", data.getName()); - replaceMap.put("%registered%", FormatUtils.formatTimeStampYear(data.getRegistered())); - replaceMap.put("%timeskicked%", data.getTimesKicked()); - replaceMap.put("%playtime%", FormatUtils.formatTimeAmount(data.getPlayTime())); - replaceMap.put("%banned%", data.isBanned() ? Locale.get(Msg.HTML_BANNED).parse() : ""); - replaceMap.put("%op%", data.isOp() ? Locale.get(Msg.HTML_OP).parse() : ""); - replaceMap.put("%isonline%", data.isOnline() ? Locale.get(Msg.HTML_ONLINE).parse() : Locale.get(Msg.HTML_OFFLINE).parse()); - replaceMap.put("%deaths%", data.getDeaths()); - replaceMap.put("%playerkills%", data.getPlayerKills().size()); - replaceMap.put("%mobkills%", data.getMobKills()); - replaceMap.put("%sessionaverage%", FormatUtils.formatTimeAmount(MathUtils.averageLong(AnalysisUtils.transformSessionDataToLengths(data.getSessions())))); - replaceMap.put("%killstable%", KillsTableCreator.createKillsTable(data.getPlayerKills())); + replaceMap.put("ips", showIPandUUID ? data.getIps().toString() : "Hidden (Config)"); + replaceMap.put("nicknames", HtmlUtils.removeXSS(HtmlUtils.swapColorsToSpan(data.getNicknames().toString()))); + replaceMap.put("name", data.getName()); + replaceMap.put("registered", FormatUtils.formatTimeStampYear(data.getRegistered())); + replaceMap.put("timeskicked", data.getTimesKicked()); + replaceMap.put("playtime", FormatUtils.formatTimeAmount(data.getPlayTime())); + replaceMap.put("banned", data.isBanned() ? Locale.get(Msg.HTML_BANNED).parse() : ""); + replaceMap.put("op", data.isOp() ? Locale.get(Msg.HTML_OP).parse() : ""); + replaceMap.put("isonline", data.isOnline() ? Locale.get(Msg.HTML_ONLINE).parse() : Locale.get(Msg.HTML_OFFLINE).parse()); + replaceMap.put("deaths", data.getDeaths()); + replaceMap.put("playerkills", data.getPlayerKills().size()); + replaceMap.put("mobkills", data.getMobKills()); + replaceMap.put("sessionaverage", FormatUtils.formatTimeAmount(MathUtils.averageLong(AnalysisUtils.transformSessionDataToLengths(data.getSessions())))); + replaceMap.put("killstable", KillsTableCreator.createKillsTable(data.getPlayerKills())); Plan plugin = Plan.getInstance(); - replaceMap.put("%version%", plugin.getDescription().getVersion()); - replaceMap.put("%playersgraphcolor%", Settings.HCOLOR_ACT_ONL.toString()); + replaceMap.put("version", plugin.getDescription().getVersion()); + replaceMap.put("playersgraphcolor", Settings.HCOLOR_ACT_ONL.toString()); Set sessions = new HashSet<>(data.getSessions()); List lengths = AnalysisUtils.transformSessionDataToLengths(sessions); - replaceMap.put("%punchcardseries%", PunchCardGraphCreator.createDataSeries(sessions)); - replaceMap.put("%sessionlengthseries%", SessionLengthDistributionGraphCreator.createDataSeries(lengths)); - replaceMap.put("%playersonlineseries%", PlayerActivityGraphCreator.buildSeriesDataStringSessions(sessions)); + replaceMap.put("punchcardseries", PunchCardGraphCreator.createDataSeries(sessions)); + replaceMap.put("sessionlengthseries", SessionLengthDistributionGraphCreator.createDataSeries(lengths)); + replaceMap.put("playersonlineseries", PlayerActivityGraphCreator.buildSeriesDataStringSessions(sessions)); WorldTimes worldTimes = data.getWorldTimes(); - replaceMap.put("%worldseries%", WorldPieCreator.createSeriesData(worldTimes.getTimes())); - replaceMap.put("%worldtotal%", FormatUtils.formatTimeAmount(worldTimes.getTotal())); + replaceMap.put("worldseries", WorldPieCreator.createSeriesData(worldTimes.getTimes())); + replaceMap.put("worldtotal", FormatUtils.formatTimeAmount(worldTimes.getTotal())); String[] colors = new String[]{Settings.HCOLOR_MAIN.toString(), Settings.HCOLOR_MAIN_DARK.toString(), Settings.HCOLOR_SEC.toString(), Settings.HCOLOR_TER.toString(), Settings.HCOLOR_TER_DARK.toString()}; String[] defaultCols = new String[]{"348e0f", "267F00", "5cb239", "89c471", "5da341"}; @@ -129,13 +129,13 @@ public class PlaceholderUtils { } } long cacheTime = plugin.getInspectCache().getCacheTime(uuid); - replaceMap.put("%refresh%", FormatUtils.formatTimeAmountDifference(cacheTime, now)); - replaceMap.put("%refreshlong%", cacheTime); - replaceMap.put("%servername%", Settings.SERVER_NAME.toString()); + replaceMap.put("refresh", FormatUtils.formatTimeAmountDifference(cacheTime, now)); + replaceMap.put("refreshlong", cacheTime); + replaceMap.put("servername", Settings.SERVER_NAME.toString()); String pluginsTabHtml = plugin.getHookHandler().getPluginsTabLayoutForInspect(); Map additionalReplaceRules = plugin.getHookHandler().getAdditionalInspectReplaceRules(uuid); String replacedOnce = HtmlUtils.replacePlaceholders(pluginsTabHtml, additionalReplaceRules); - replaceMap.put("%plugins%", HtmlUtils.replacePlaceholders(replacedOnce, additionalReplaceRules)); + replaceMap.put("plugins", HtmlUtils.replacePlaceholders(replacedOnce, additionalReplaceRules)); return replaceMap; } } diff --git a/Plan/src/main/resources/locale_DE.txt b/Plan/src/main/resources/locale_DE.txt index 55faf3e2c..ce2f0b762 100644 --- a/Plan/src/main/resources/locale_DE.txt +++ b/Plan/src/main/resources/locale_DE.txt @@ -4,16 +4,16 @@ Analysis FAIL - No Data || Analyse | Analyse fehlgeschlagen, k Analysis FAIL - No Players || Analyse | Analyse fehlgeschlagen, keine bekannten Spieler. Analysis - Fetch Phase || Analyse | Hole Daten... Analysis - Fetch Phase Start || Analyse | Suche nach verfügbaren Spieler... -Analysis - Complete || Analyse | Analyse vollständig. (dauerte REPLACE0ms) REPLACE1 -Analysis - Begin Analysis || Analyse | Daten geholt (REPLACE0 Spieler, dauerte REPLACE1ms), beginne mit der Analyse der Daten... +Analysis - Complete || Analyse | Analyse vollständig. (dauerte ${0}ms) ${1} +Analysis - Begin Analysis || Analyse | Daten geholt (${0} Spieler, dauerte ${1}ms), beginne mit der Analyse der Daten... Analysis - Start || Analyse | Beginne die Analyse der Spieler Daten... >Constant - CMD Footer || §f» >Constant - List Ball || §7 •§2 Cmd FAIL - No Data View || §e[Plan] Dieser Befehl kann nur benutzt werden wenn der WebServer oder das TextUI auf dem Server aktiviert ist. Cmd FAIL - No Permission || §c[Plan] Du hast nicht die benötigte Berechtigung. -Cmd FAIL - Requires Arguments || §c[Plan] Dieser Befehl erfordert Argumente. REPLACE0 +Cmd FAIL - Requires Arguments || §c[Plan] Dieser Befehl erfordert Argumente. ${0} Cmd FAIL - Require only one Argument || §c[Plan] Der Befehl benötigt ein Argument. -Cmd FAIL - Timeout || §c[Plan] REPLACE0 Befehl ausgetimed! Mehr Infos unter '/plan status' und in der Serverkonsole. +Cmd FAIL - Timeout || §c[Plan] ${0} Befehl ausgetimed! Mehr Infos unter '/plan status' und in der Serverkonsole. Cmd FAIL - Unknown Username || §c[Plan] Der Spielername konnte in der Datenbank nicht gefunden werden. Cmd FAIL - Unseen Username || §c[Plan] Dieser Spieler war noch nie auf diesem Server. Cmd FAIL - Invalid Username || §c[Plan] Dieser Spieler existiert nicht. @@ -40,7 +40,7 @@ Analysis NOTIFY - Temporary Disable || §eAnalyse wurde temporär aufgrund Cmd - Click Me || Klick Mich Cmd - Fetch Data || §f»§2 Hole Daten in den Cache... Cmd - Link || §7 •§2 Link: §f -Cmd - No Results || §7 •§2 Keine Ergebnisse für §7REPLACE0§2. +Cmd - No Results || §7 •§2 Keine Ergebnisse für §7${0}§2. Cmd - Reload Success || §a[Plan] Reload abgeschlossen. Cmd - Results || §7 Übereinstimmender Spieler: §f Cmd - Searching || §f»§2Suchen... @@ -75,16 +75,16 @@ Enable || Player Analytics aktiviert. Enable - Boot Analysis 30s Notify || Analyse | Boot Analyse in 30 Sekunden... Enable - Boot Analysis Notify || Analyse | Starte Boot Analyse... Enable Db FAIL - Disable Info || Datenbank Initialisierung fehlgeschlagen, deaktiviere Plan. -Enable - Db Info || REPLACE0-Datenbank Verbindung hergestellt. +Enable - Db Info || ${0}-Datenbank Verbindung hergestellt. Enable - Db || Datenbank Initialisierung... -Enable FAIL-Db || REPLACE0-Datenbank Verbindung fehlgeschlagen: REPLACE1 +Enable FAIL-Db || ${0}-Datenbank Verbindung fehlgeschlagen: ${1} Enable FAIL - Wrong Db Type || Dieser Datenbank Typ existiert nicht. Enable Notify - ChatListener || §eChataufzeichnung deaktiviert, die Information der Nicknamen ist nicht akkurat. Enable Notify - Disabled CommandListener || §eBefehlsaufzeichnung deaktiviert. Enable Notify - Disabled DeathListener || §eTodesaufzeichnung deaktiviert, Spieler & Mob Kills werden nicht aufgezeichnet. Enable Notify - No data view || §eWebserver deaktiviert, aber es wird keine alternative IP benutzt, sodass Daten nicht angezeigt werden können! Enable - WebServer || Initialisiere Webserver... -Enable - WebServer Info || Webserver läuft auf PORT REPLACE0 +Enable - WebServer Info || Webserver läuft auf PORT ${0} Html - Active || Spieler ist aktiv Html - Banned || | Gesperrt Html - Inactive || Spieler ist inaktiv @@ -93,7 +93,7 @@ Html - Offline || | OfflineOnline Html - OP || , Operator (Op) Html - Table No Kills || Keine Kills -Manage FAIL - Confirm Action || §c[Plan] Füge -a hinzu um den Befehl zu bestätigen! REPLACE0 +Manage FAIL - Confirm Action || §c[Plan] Füge -a hinzu um den Befehl zu bestätigen! ${0} Manage FAIL - Faulty DB Connection || §c[Plan] Eine der Datenbanken wurde nicht richtig initialisiert. Manage FAIL - Backup File Not Found || §c[Plan] Sicherheitskopie existiert nicht! Manage FAIL - Incorrect DB || §c[Plan] Falsche Datenbank! (SQlite/MySQL wird unterstützt): @@ -107,11 +107,11 @@ Manage - Copy Success || §a[Plan] Alle Daten wurden erfolgr Manage - Process Fail || §c[Plan] Irgendwas lief schief während die Daten verarbeitet wurden! Manage - Import || §f» §2 Importiere Daten... Manage - Move Success || §a[Plan] Alle Daten wurden erfolgreich verschoben! -Manage - Remove Success || §f» §2Daten von §fREPLACE0§2 wurden aus dieser Datenbank entfernt §fREPLACE1§2. +Manage - Remove Success || §f» §2Daten von §f${0}§2 wurden aus dieser Datenbank entfernt §f${1}§2. Manage - Start || »§7 Verarbeite Daten... Manage - Success || §f» §2 Erfolgreich! -Manage NOTIFY - Overwrite || Daten in REPLACE0-Datenbank werden überschrieben! -Manage NOTIFY - Partial Overwrite || Einige Daten in REPLACE0-Datenbank werden überschrieben! -Manage NOTIFY - Remove || Daten in REPLACE0-Datenbank werden entfernt! -Manage NOTIFY - Rewrite || Daten in REPLACE0-Datenbank werden neu geschrieben! -WARN - Too Small Queue Size || Warteschlagengröße ist zu klein! (REPLACE0), änder diese Einstellung zu einer höheren! (Derzeit REPLACE1) +Manage NOTIFY - Overwrite || Daten in ${0}-Datenbank werden überschrieben! +Manage NOTIFY - Partial Overwrite || Einige Daten in ${0}-Datenbank werden überschrieben! +Manage NOTIFY - Remove || Daten in ${0}-Datenbank werden entfernt! +Manage NOTIFY - Rewrite || Daten in ${0}-Datenbank werden neu geschrieben! +WARN - Too Small Queue Size || Warteschlagengröße ist zu klein! (${0}), änder diese Einstellung zu einer höheren! (Derzeit ${1}) diff --git a/Plan/src/main/resources/locale_FI.txt b/Plan/src/main/resources/locale_FI.txt index fa175215e..15c7740a9 100644 --- a/Plan/src/main/resources/locale_FI.txt +++ b/Plan/src/main/resources/locale_FI.txt @@ -4,16 +4,16 @@ Analysis FAIL - No Data || Analyysi | Analyysi ei onnistunut, Analysis FAIL - No Players || Analyysi | Analyysi ei onnistunut, Ei tunnettuja pelaajia Analysis - Fetch Phase || Analyysi | Haetaan Dataa.. Analysis - Fetch Phase Start || Analyysi | Tarkistetaan saatavilla olevia pelaajia.. -Analysis - Complete || Analyysi | Analyysi Valmis. (meni REPLACE0ms) REPLACE1 -Analysis - Begin Analysis || Analyysi | Data Haettu (REPLACE0 käyttäjää, meni REPLACE1ms), aloitetaan Datan analysointi.. +Analysis - Complete || Analyysi | Analyysi Valmis. (meni ${0}ms) ${1} +Analysis - Begin Analysis || Analyysi | Data Haettu (${0} käyttäjää, meni ${1}ms), aloitetaan Datan analysointi.. Analysis - Start || Analyysi | Aloitetaan Analyysi.. >Constant - CMD Footer || §f» >Constant - List Ball || §7 •§2 Cmd FAIL - No Data View || §e[Plan] Dataa ei voida näyttää. Cmd FAIL - No Permission || §c[Plan] Sinulla ei ole lupaa tähän komentoon. -Cmd FAIL - Requires Arguments || §c[Plan] Komento tarvitsee argumentteja. REPLACE0 +Cmd FAIL - Requires Arguments || §c[Plan] Komento tarvitsee argumentteja. ${0} Cmd FAIL - Require only one Argument || §c[Plan] Komento tarvitsee yhden argumentin. -Cmd FAIL - Timeout || §c[Plan] REPLACE0 komento aikakatkaistu! Tarkista '/plan status' & konsoli. +Cmd FAIL - Timeout || §c[Plan] ${0} komento aikakatkaistu! Tarkista '/plan status' & konsoli. Cmd FAIL - Unknown Username || §c[Plan] Pelaajaa ei löytynyt tietokannasta Cmd FAIL - Unseen Username || §c[Plan] Pelaaja ei ole pelannut palvelimella. Cmd FAIL - Invalid Username || §c[Plan] Pelaajaa ei ole olemassa. @@ -40,7 +40,7 @@ Analysis NOTIFY - Temporary Disable || §eAnalyysi poistettu käytöstä t Cmd - Click Me || Klikkaa minua Cmd - Fetch Data || §f»§2 Haetaan tietoja välimuistiin.. Cmd - Link || §7 • §2Linkki: §f -Cmd - No Results || §7 • §2Ei tuloksia hakusanalle §7REPLACE0§2. +Cmd - No Results || §7 • §2Ei tuloksia hakusanalle §7${0}§2. Cmd - Reload Success || §a[Plan] Uudelleenkäynnistys Valmis. Cmd - Results || §7 Sopivat pelaajat: §f Cmd - Searching || §f»§2Haetaaan.. @@ -75,9 +75,9 @@ Enable || Player Analytics Enabled. Enable - Boot Analysis 30s Notify || Analyysi | Käynnistyksen yhteinen analyysi 30 sekunnin kuluttua.. Enable - Boot Analysis Notify || Analysis | Aloitetaan Käynnistyksen yhteinen analyysi.. Enable Db FAIL - Disable Info || Database initialization has failed, disabling Plan. -Enable - Db Info || REPLACE0-tietokantayhteys onnistui. +Enable - Db Info || ${0}-tietokantayhteys onnistui. Enable - Db || Tietokannan käynnistys.. -Enable FAIL-Db || REPLACE0-Database Connection failed: REPLACE1 +Enable FAIL-Db || ${0}-Database Connection failed: ${1} Enable FAIL - Wrong Db Type || Tietokantatyyppiä ei ole olemassa Enable Notify - ChatListener || §eViestien kuuntelu pois käytöstä, nimi tieto voi olla väärin. Enable Notify - Disabled CommandListener || §eKomentojen kuuntelu pois käytöstä. @@ -85,7 +85,7 @@ Enable Notify - Disabled DeathListener || §eKuolema kuuntelu pois käytöst Enable Notify-Empty IP || §eIP in server.properties is empty & AlternativeServerIP is not used, incorrect links will be given! Enable Notify - No data view || §eNetti Palvelin Poissa käytöstä, mutta Alternative IP/TextUI ei ole käytössä, dataa ei voi tarkastella! Enable - WebServer || Käynnistetään Netti Palvelin.. -Enable - WebServer Info || Netti Palvelin pyörii PORTILLA REPLACE0 +Enable - WebServer Info || Netti Palvelin pyörii PORTILLA ${0} Html - Active || Pelaaja on aktiivinen Html - Banned || | Pannassa Html - Inactive || Pelaaja ei ole aktiivinen @@ -94,7 +94,7 @@ Html - Offline || | OfflineOnline Html - OP || , Operaattori (Op) Html - Table No Kills || Ei tappoja -Manage FAIL - Confirm Action || §c[Plan] Lisää -a vahvistaaksesi! REPLACE0 +Manage FAIL - Confirm Action || §c[Plan] Lisää -a vahvistaaksesi! ${0} Manage FAIL - Faulty DB Connection || §c[Plan] Toinen tietokannoista ei käynnistynyt odotetusti. Manage FAIL - Backup File Not Found || §c[Plan] Varmuuskopiota ei ole olemassa! Manage FAIL - Incorrect DB || §c[Plan] Väärä tietokanta! (sqlite/mysql hyväksytään): @@ -108,11 +108,11 @@ Manage - Copy Success || §a[Plan] Kaikki tiedot kopioitu on Manage - Process Fail || §c[Plan] Jokin meni vikaan dataa käsitellessä! Manage - Import || §f» §2 Tuodaan Dataa.. Manage - Move Success || §a[Plan] Kaikki data siirretty onnistuneesti! -Manage - Remove Success || §f» §fREPLACE0:n§2 data poistettiin tietokannasta §fREPLACE1§2. +Manage - Remove Success || §f» §f${0}:n§2 data poistettiin tietokannasta §f${1}§2. Manage - Start || »§7 Käsitellään Dataa.. Manage - Success || §f» §2 Onnistui! -Manage NOTIFY - Overwrite || Tiedot REPLACE0-tietokannassa ylikirjoitetaan! -Manage NOTIFY - Partial Overwrite || Osa tiedoista REPLACE0-tietokannassa ylikirjoitetaan! -Manage NOTIFY - Remove || Tiedot REPLACE0-tietokannassa poistetaan! -Manage NOTIFY - Rewrite || Tiedot REPLACE0-tietokannassa uudelleenkirjoitetaan! -WARN - Too Small Queue Size || Queue size is too small! (REPLACE0), change the setting to a higher number! (Currently REPLACE1) +Manage NOTIFY - Overwrite || Tiedot ${0}-tietokannassa ylikirjoitetaan! +Manage NOTIFY - Partial Overwrite || Osa tiedoista ${0}-tietokannassa ylikirjoitetaan! +Manage NOTIFY - Remove || Tiedot ${0}-tietokannassa poistetaan! +Manage NOTIFY - Rewrite || Tiedot ${0}-tietokannassa uudelleenkirjoitetaan! +WARN - Too Small Queue Size || Queue size is too small! (${0}), change the setting to a higher number! (Currently ${1}) diff --git a/Plan/test/test/java/main/java/com/djrapitops/plan/ui/HtmlTest.java b/Plan/test/test/java/main/java/com/djrapitops/plan/ui/HtmlTest.java index 578b100a7..3d00ed075 100644 --- a/Plan/test/test/java/main/java/com/djrapitops/plan/ui/HtmlTest.java +++ b/Plan/test/test/java/main/java/com/djrapitops/plan/ui/HtmlTest.java @@ -28,7 +28,7 @@ public class HtmlTest { @Test public void testParseWithZeroArgs() { Html instance = Html.SPAN; - String expResult = "REPLACE0"; + String expResult = "${0}"; String result = instance.parse(); assertEquals(expResult, result); }