From d1b158a0fe510d325639e7307e5a2ff30464d894 Mon Sep 17 00:00:00 2001 From: Carlos <28845529+mesacarlos@users.noreply.github.com> Date: Sat, 30 May 2020 13:49:13 +0200 Subject: [PATCH] Solved bug with text encoding and changed default host to 0.0.0.0 --- client/index.html | 18 ++--- phrases.properties | 1 + phrases_cs.properties | 81 ++++++++++--------- phrases_de.properties | 81 ++++++++++--------- phrases_en.properties | 1 + phrases_es.properties | 1 + phrases_fr.properties | 81 ++++++++++--------- phrases_it.properties | 81 ++++++++++--------- phrases_nl.properties | 81 ++++++++++--------- phrases_pt.properties | 1 + phrases_ru.properties | 1 + phrases_zh.properties | 1 + plugin.yml | 2 +- pom.xml | 2 +- src/es/mesacarlos/webconsole/WebConsole.java | 2 +- .../webconsole/util/Internationalization.java | 15 ++++ .../webconsole/websocket/WSServer.java | 2 +- .../websocket/command/ExecCommand.java | 2 +- 18 files changed, 240 insertions(+), 214 deletions(-) diff --git a/client/index.html b/client/index.html index 3656175..f4b4616 100644 --- a/client/index.html +++ b/client/index.html @@ -248,7 +248,7 @@ @@ -258,15 +258,15 @@ - - + + - - - - - - + + + + + + diff --git a/phrases.properties b/phrases.properties index 14fa95e..046a378 100644 --- a/phrases.properties +++ b/phrases.properties @@ -13,6 +13,7 @@ forbidden-console = [WebConsole] {0} tried to run "{1}" while not logged in! closed-connection = [WebConsole] Closed connection and logged out from {0} error-on-connection = [WebConsole] Error occurred on connection {0}: {1} started-websocket = [WebConsole] WebSocket Server started successfully. +error-disconnected-client = [WebConsole] Attempted to send a message to a disconnected client. # CpuUsageCommand.java cpu-usage-message = Usage is {0}% diff --git a/phrases_cs.properties b/phrases_cs.properties index 95a9eaf..eea808b 100644 --- a/phrases_cs.properties +++ b/phrases_cs.properties @@ -1,41 +1,42 @@ -# WebConsole.java -boot-error = Stala se chyba při spouštění WebSocketového serveru. - -# WSServer.java -connection-resumed-message = Připojeno. Jste již přihlášeni, vítejte zpět! -connection-resumed-console = [WebConsole] Připojeno a obnoveno spojení z {0}. -connection-login-message = Připojení zahájeno, očekávám přihlášení. -connection-login-console = [WebConsole] Připojení z {0}, očekávám přihlášení . -unknown-command-message = Neznámý příkaz! -unknown-command-console = [WebConsole] Signál "{0}" nebyl zpracován, protože není platný. Je váš plugin/webová interface aktuálný? -forbidden-message = Nepovoleno -forbidden-console = [WebConsole] {0} se pokusil spustit "{1}" nepřihlášený! -closed-connection = [WebConsole] Ukončeno připojení a odhlášeno z {0}! -error-on-connection = [WebConsole] Nastala chyba u připojení {0}: {1} -started-websocket = [WebConsole] Websocketový server se úspěšně spustil. - -# CpuUsageCommand.java -cpu-usage-message = Využití je {0}% - -# ExecCommand.java -cmd-executed-console = [WebConsole] {0} spustil "{1}". - -# LogInCommand.java -login-sucessful-message = Jste přihlášeni. -login-sucessful-console = [WebConsole] Úspěšné přihlášení z {0} -login-failed-message = Špatné heslo, zkuste prosím znovu. -login-failed-console = [WebConsole] {0} se pokusil připojit se špatným heslem. - -# PlayersCommand.java -players-message = Je připojeno {0} hráčů z maxima {1} - -# RamUsageCommand.java -ram-usage-message = {0} volné, {1} použité, {2} maximální paměti - -# WebConsoleCommand.java -webconsole-version = WebConsole verze {0}. -webconsole-no-connections = Nejsou žádné WebConsole připojení. -webconsole-active-connections = Připojeno k WebConsole z: - -# ReadLogFileCommand.java +# WebConsole.java +boot-error = Stala se chyba při spouštění WebSocketového serveru. + +# WSServer.java +connection-resumed-message = Připojeno. Jste již přihlášeni, vítejte zpět! +connection-resumed-console = [WebConsole] Připojeno a obnoveno spojení z {0}. +connection-login-message = Připojení zahájeno, očekávám přihlášení. +connection-login-console = [WebConsole] Připojení z {0}, očekávám přihlášení . +unknown-command-message = Neznámý příkaz! +unknown-command-console = [WebConsole] Signál "{0}" nebyl zpracován, protože není platný. Je váš plugin/webová interface aktuálný? +forbidden-message = Nepovoleno +forbidden-console = [WebConsole] {0} se pokusil spustit "{1}" nepřihlášený! +closed-connection = [WebConsole] Ukončeno připojení a odhlášeno z {0}! +error-on-connection = [WebConsole] Nastala chyba u připojení {0}: {1} +started-websocket = [WebConsole] Websocketový server se úspěšně spustil. +error-disconnected-client = [WebConsole] Pokus o odeslání zprávy odpojenému klientovi. + +# CpuUsageCommand.java +cpu-usage-message = Využití je {0}% + +# ExecCommand.java +cmd-executed-console = [WebConsole] {0} spustil "{1}". + +# LogInCommand.java +login-sucessful-message = Jste přihlášeni. +login-sucessful-console = [WebConsole] Úspěšné přihlášení z {0} +login-failed-message = Špatné heslo, zkuste prosím znovu. +login-failed-console = [WebConsole] {0} se pokusil připojit se špatným heslem. + +# PlayersCommand.java +players-message = Je připojeno {0} hráčů z maxima {1} + +# RamUsageCommand.java +ram-usage-message = {0} volné, {1} použité, {2} maximální paměti + +# WebConsoleCommand.java +webconsole-version = WebConsole verze {0}. +webconsole-no-connections = Nejsou žádné WebConsole připojení. +webconsole-active-connections = Připojeno k WebConsole z: + +# ReadLogFileCommand.java log-read-error = Chyba při čtení souboru latest.log \ No newline at end of file diff --git a/phrases_de.properties b/phrases_de.properties index 116027f..e797802 100644 --- a/phrases_de.properties +++ b/phrases_de.properties @@ -1,41 +1,42 @@ -# WebConsole.java -boot-error = Ein Fehler ist aufgekommen beim Starten des WebSocket Server. - -# WSServer.java -connection-resumed-message = Verbunden. Bereits eingeloggt, willkommen zurück! -connection-resumed-console = [WebConsole] {0} hat sich Verbunden und ist bereits eingeloggt. -connection-login-message = Verbunden, warten auf den Login. -connection-login-console = [WebConsole] {0} hat sich verbunden, auf den Login wird gewartet. -unknown-command-message = Unbekannter Befehl. -unknown-command-console = [WebConsole] Der Command '{0}' existiert nicht. Ist dein Plugin/Webinterface auf dem aktuellsten Stand? -forbidden-message = Nicht erlaubt! Versuche erneut dich zu verbinden mit deinem Passwort! -forbidden-console = [WebConsole] {0} hat versucht "{1}" auszuführen, ohne eingeloggt zu sein. -closed-connection = [WebConsole] {0} hat seine Verbindung geschlossen und hat sich ausgeloggt. -error-on-connection = [WebConsole] Fehler beim verbinden von {0}: {1}. -started-websocket = [WebConsole] WebSocket Server wurde erfolgreich gestartet. - -# CpuUsageCommand.java -cpu-usage-message = Die CPU Auslastung liegt bei {0}%. - -# ExecCommand.java -cmd-executed-console = [WebConsole] {0} hat "{1}" ausgeführt. - -# LogInCommand.java -login-sucessful-message = Eingeloggt. -login-sucessful-console = [WebConsole] {0} hat sich erfolgreich eingeloggt! -login-failed-message = Falsches Passwort, versuch es nochmal! -login-failed-console = [WebConsole] {0} hat das Passwort falsch eingegeben - -# PlayersCommand.java -players-message = {0} von {1} Spieler sind verbunden. - -# RamUsageCommand.java -ram-usage-message = {0} frei, {1} benutzt, {2} maximal - -# WebConsoleCommand.java -webconsole-version = Die WebConsole Version ist {0}. -webconsole-no-connections = Aktuell ist niemand mit der WebConsole verbunden -webconsole-active-connections = Aktive Verbindugen von: - -# ReadLogFileCommand.java +# WebConsole.java +boot-error = Ein Fehler ist aufgekommen beim Starten des WebSocket Server. + +# WSServer.java +connection-resumed-message = Verbunden. Bereits eingeloggt, willkommen zurück! +connection-resumed-console = [WebConsole] {0} hat sich Verbunden und ist bereits eingeloggt. +connection-login-message = Verbunden, warten auf den Login. +connection-login-console = [WebConsole] {0} hat sich verbunden, auf den Login wird gewartet. +unknown-command-message = Unbekannter Befehl. +unknown-command-console = [WebConsole] Der Command '{0}' existiert nicht. Ist dein Plugin/Webinterface auf dem aktuellsten Stand? +forbidden-message = Nicht erlaubt! Versuche erneut dich zu verbinden mit deinem Passwort! +forbidden-console = [WebConsole] {0} hat versucht "{1}" auszuführen, ohne eingeloggt zu sein. +closed-connection = [WebConsole] {0} hat seine Verbindung geschlossen und hat sich ausgeloggt. +error-on-connection = [WebConsole] Fehler beim verbinden von {0}: {1}. +started-websocket = [WebConsole] WebSocket Server wurde erfolgreich gestartet. +error-disconnected-client = [WebConsole] Es wurde versucht, eine Nachricht an einen nicht verbundenen Client zu senden. + +# CpuUsageCommand.java +cpu-usage-message = Die CPU Auslastung liegt bei {0}%. + +# ExecCommand.java +cmd-executed-console = [WebConsole] {0} hat "{1}" ausgeführt. + +# LogInCommand.java +login-sucessful-message = Eingeloggt. +login-sucessful-console = [WebConsole] {0} hat sich erfolgreich eingeloggt! +login-failed-message = Falsches Passwort, versuch es nochmal! +login-failed-console = [WebConsole] {0} hat das Passwort falsch eingegeben + +# PlayersCommand.java +players-message = {0} von {1} Spieler sind verbunden. + +# RamUsageCommand.java +ram-usage-message = {0} frei, {1} benutzt, {2} maximal + +# WebConsoleCommand.java +webconsole-version = Die WebConsole Version ist {0}. +webconsole-no-connections = Aktuell ist niemand mit der WebConsole verbunden +webconsole-active-connections = Aktive Verbindugen von: + +# ReadLogFileCommand.java log-read-error = Fehler beim lesen der 'latest.log'-Logdatei \ No newline at end of file diff --git a/phrases_en.properties b/phrases_en.properties index 14fa95e..772e83e 100644 --- a/phrases_en.properties +++ b/phrases_en.properties @@ -13,6 +13,7 @@ forbidden-console = [WebConsole] {0} tried to run "{1}" while not logged in! closed-connection = [WebConsole] Closed connection and logged out from {0} error-on-connection = [WebConsole] Error occurred on connection {0}: {1} started-websocket = [WebConsole] WebSocket Server started successfully. +error-disconnected-client = [WebConsole] Attempted to send a message to a disconnected WebSocket client. # CpuUsageCommand.java cpu-usage-message = Usage is {0}% diff --git a/phrases_es.properties b/phrases_es.properties index 037dc40..c1f68bc 100644 --- a/phrases_es.properties +++ b/phrases_es.properties @@ -13,6 +13,7 @@ forbidden-console = [WebConsole] {0} intento ejecutar "{1}" sin tener una sesió closed-connection = [WebConsole] Sesión cerrada y desconectado desde {0} error-on-connection = [WebConsole] Ocurrió un error en la conexión con {0}: {1} started-websocket = [WebConsole] Servidor WebSocket iniciado con éxito. +error-disconnected-client = [WebConsole] Se intentó enviar un mensaje a un cliente WebSocket que estaba desconectado. # CpuUsageCommand.java cpu-usage-message = En uso {0}% diff --git a/phrases_fr.properties b/phrases_fr.properties index d919165..3874eed 100644 --- a/phrases_fr.properties +++ b/phrases_fr.properties @@ -1,41 +1,42 @@ -# WebConsole.java -boot-error = Une erreur s'est produite lors du démarrage de WebSocket Server. - -# WSServer.java -connection-resumed-message = Connecté. Déjà connecté, bienvenue à nouveau! -connection-resumed-console = [WebConsole] Session connectée et reprise à partir de {0} -connection-login-message = Connexion démarrée, connexion en attente -connection-login-console = [WebConsole] Connexion connectée et en attente depuis {0} -unknown-command-message = Commande inconnue -unknown-command-console = [WebConsole] Le signal "{0}" n'a pas été traité car il n'est pas valide. Votre plugin / interface web est-il à jour? -forbidden-message = Interdit -forbidden-console = [WebConsole] {0} a tenté d'exécuter "{1}" alors qu'il n'était pas connecté! -closed-connection = [WebConsole] Connexion fermée et déconnecté de {0} -error-on-connection = [WebConsole] Une erreur s'est produite lors de la connexion {0}: {1} -started-websocket = [WebConsole] WebSocket Server a démarré avec succès. - -# CpuUsageCommand.java -cpu-usage-message = L'utilisation est {0}% - -# ExecCommand.java -cmd-executed-console = [WebConsole] {0} a exécuté "{1}". - -# LogInCommand.java -login-sucessful-message = Connecté -login-sucessful-console = [WebConsole] Connexion réussie à partir de {0} -login-failed-message = Mot de passe incorrect, réessayez -login-failed-console = [WebConsole] Mot de passe incorrect lors de la connexion depuis {0} - -# PlayersCommand.java -players-message = Joueurs {0} connectés pour un maximum de {1} - -# RamUsageCommand.java -ram-usage-message = {0} gratuit, {1} utilisé, {2} mémoire maximale - -# WebConsoleCommand.java -webconsole-version = version WebConsole {0}. -webconsole-no-connections = Aucune connexion WebConsole n'est connectée maintenant. -webconsole-active-connections = Connecté à WebConsole depuis: - -# ReadLogFileCommand.java +# WebConsole.java +boot-error = Une erreur s'est produite lors du démarrage de WebSocket Server. + +# WSServer.java +connection-resumed-message = Connecté. Déjà connecté, bienvenue à nouveau! +connection-resumed-console = [WebConsole] Session connectée et reprise à partir de {0} +connection-login-message = Connexion démarrée, connexion en attente +connection-login-console = [WebConsole] Connexion connectée et en attente depuis {0} +unknown-command-message = Commande inconnue +unknown-command-console = [WebConsole] Le signal "{0}" n'a pas été traité car il n'est pas valide. Votre plugin / interface web est-il à jour? +forbidden-message = Interdit +forbidden-console = [WebConsole] {0} a tenté d'exécuter "{1}" alors qu'il n'était pas connecté! +closed-connection = [WebConsole] Connexion fermée et déconnecté de {0} +error-on-connection = [WebConsole] Une erreur s'est produite lors de la connexion {0}: {1} +started-websocket = [WebConsole] WebSocket Server a démarré avec succès. +error-disconnected-client = [WebConsole] Vous avez tenté d'envoyer un message à un client WebSocket déconnecté. + +# CpuUsageCommand.java +cpu-usage-message = L'utilisation est {0}% + +# ExecCommand.java +cmd-executed-console = [WebConsole] {0} a exécuté "{1}". + +# LogInCommand.java +login-sucessful-message = Connecté +login-sucessful-console = [WebConsole] Connexion réussie à partir de {0} +login-failed-message = Mot de passe incorrect, réessayez +login-failed-console = [WebConsole] Mot de passe incorrect lors de la connexion depuis {0} + +# PlayersCommand.java +players-message = Joueurs {0} connectés pour un maximum de {1} + +# RamUsageCommand.java +ram-usage-message = {0} gratuit, {1} utilisé, {2} mémoire maximale + +# WebConsoleCommand.java +webconsole-version = version WebConsole {0}. +webconsole-no-connections = Aucune connexion WebConsole n'est connectée maintenant. +webconsole-active-connections = Connecté à WebConsole depuis: + +# ReadLogFileCommand.java log-read-error = Erreur lors de la lecture du fichier latest.log \ No newline at end of file diff --git a/phrases_it.properties b/phrases_it.properties index b2571e4..337d2bd 100644 --- a/phrases_it.properties +++ b/phrases_it.properties @@ -1,41 +1,42 @@ -# WebConsole.java -boot-error = C''è stato un errore mentre avviavo WebConsole server. - -# WSServer.java -connection-resumed-message = Connesso. Login già fatto, Bentornato! -connection-resumed-console = [WebConsole] Connesso e sessione ripresa da {0} -connection-login-message = Connessione stabilita, attendo il login -connection-login-console = [WebConsole] Connesso e attendo login da {0} -unknown-command-message = Comando sconosciuto -unknown-command-console = [WebConsole] Il segnale "{0}" non è stato processato siccome non è valido. Il tuo plugin/web interface è aggiornato? -forbidden-message = Proibito -forbidden-console = [WebConsole] {0} ha tentato di avviare "{1}" mentre non aveva ancora effettuato il login! -closed-connection = [WebConsole] Connessione chiusa e disconnessione da {0} -error-on-connection = [WebConsole] Si è verificato un errore sulla connessione {0}: {1} -started-websocket = [WebConsole] WebSocket Server avviato correttamente. - -# CpuUsageCommand.java -cpu-usage-message = L''uso è {0}% - -# ExecCommand.java -cmd-executed-console = [WebConsole] {0} eseguito "{1}". - -# LogInCommand.java -login-sucessful-message = Accesso eseguito -login-sucessful-console = [WebConsole] Connessione stabilita correttamente da {0} -login-failed-message = Password scorretta, riprova -login-failed-console = [WebConsole] Password scorretta inserita da {0} - -# PlayersCommand.java -players-message = Connessi {0} players su un massimo di {1} - -# RamUsageCommand.java -ram-usage-message = {0} Libera, {1} Usata, {2} Memoria massima - -# WebConsoleCommand.java -webconsole-version = Versione WebConsole {0}. -webconsole-no-connections = Non è stata effettuata ancora nessuna connessione tramite WebConsole. -webconsole-active-connections = Connesso a WebConsole da: - -# ReadLogFileCommand.java +# WebConsole.java +boot-error = C''è stato un errore mentre avviavo WebConsole server. + +# WSServer.java +connection-resumed-message = Connesso. Login già fatto, Bentornato! +connection-resumed-console = [WebConsole] Connesso e sessione ripresa da {0} +connection-login-message = Connessione stabilita, attendo il login +connection-login-console = [WebConsole] Connesso e attendo login da {0} +unknown-command-message = Comando sconosciuto +unknown-command-console = [WebConsole] Il segnale "{0}" non è stato processato siccome non è valido. Il tuo plugin/web interface è aggiornato? +forbidden-message = Proibito +forbidden-console = [WebConsole] {0} ha tentato di avviare "{1}" mentre non aveva ancora effettuato il login! +closed-connection = [WebConsole] Connessione chiusa e disconnessione da {0} +error-on-connection = [WebConsole] Si è verificato un errore sulla connessione {0}: {1} +started-websocket = [WebConsole] WebSocket Server avviato correttamente. +error-disconnected-client = [WebConsole] Tentativo di inviare un messaggio a un client WebSocket disconnesso. + +# CpuUsageCommand.java +cpu-usage-message = L''uso è {0}% + +# ExecCommand.java +cmd-executed-console = [WebConsole] {0} eseguito "{1}". + +# LogInCommand.java +login-sucessful-message = Accesso eseguito +login-sucessful-console = [WebConsole] Connessione stabilita correttamente da {0} +login-failed-message = Password scorretta, riprova +login-failed-console = [WebConsole] Password scorretta inserita da {0} + +# PlayersCommand.java +players-message = Connessi {0} players su un massimo di {1} + +# RamUsageCommand.java +ram-usage-message = {0} Libera, {1} Usata, {2} Memoria massima + +# WebConsoleCommand.java +webconsole-version = Versione WebConsole {0}. +webconsole-no-connections = Non è stata effettuata ancora nessuna connessione tramite WebConsole. +webconsole-active-connections = Connesso a WebConsole da: + +# ReadLogFileCommand.java log-read-error = Errore metre tentavo di leggere latest.log \ No newline at end of file diff --git a/phrases_nl.properties b/phrases_nl.properties index dfb6792..e5a6279 100644 --- a/phrases_nl.properties +++ b/phrases_nl.properties @@ -1,41 +1,42 @@ -# WebConsole.java -boot-error = Er is een fout opgetreden bij het starten van WebSocket Server. - -# WSServer.java -connection-resumed-message = Verbonden. Al ingelogd, welkom terug! -connection-resumed-console = [WebConsole] Verbonden en hervatte sessie van {0} -connection-login-message = Verbinding gestart, wachtend op inloggen -connection-login-console = [WebConsole] Verbonden en wachtend op inloggen vanaf {0} -unknown-command-message = Onbekend commando -unknown-command-console = [WebConsole] Signaal "{0}" is niet verwerkt omdat het niet geldig is. Is uw plugin/web interface up-to-date? -forbidden-message = Verboden -forbidden-console = [WebConsole] {0} probeerde "{1}" uit te voeren zonder ingelogd te zijn! -closed-connection = [WebConsole] Verbinding verbroken en uitgelogd van {0} -error-on-connection = [WebConsole] Er is een fout opgetreden bij het verbinden van {0}: {1} -started-websocket = [WebConsole] De WebSocket Server is succesvol gestart. - -# CpuUsageCommand.java -cpu-usage-message = Verbruik is {0}% - -# ExecCommand.java -cmd-executed-console = [WebConsole] {0} voerde "{1}" uit. - -# LogInCommand.java -login-sucessful-message = Ingelogd -login-sucessful-console = [WebConsole] Successvol ingelogd van {0} -login-failed-message = Incorrect wachtwoord, probeer het opnieuw -login-failed-console = [WebConsole] Wachtwoord onjuist bij inloggen vanaf {0} - -# PlayersCommand.java -players-message = {0} spelers verbonden voor een maximum van {1} - -# RamUsageCommand.java -ram-usage-message = {0} ongebruikt, {1} gebruikt, {2} maximaal geheugen - -# WebConsoleCommand.java -webconsole-version = WebConsole versie {0}. -webconsole-no-connections = Er zijn nu geen ingelogde Web Console-verbindingen. -webconsole-active-connections = Verbonden aan WebConsole vanaf: - -# ReadLogFileCommand.java +# WebConsole.java +boot-error = Er is een fout opgetreden bij het starten van WebSocket Server. + +# WSServer.java +connection-resumed-message = Verbonden. Al ingelogd, welkom terug! +connection-resumed-console = [WebConsole] Verbonden en hervatte sessie van {0} +connection-login-message = Verbinding gestart, wachtend op inloggen +connection-login-console = [WebConsole] Verbonden en wachtend op inloggen vanaf {0} +unknown-command-message = Onbekend commando +unknown-command-console = [WebConsole] Signaal "{0}" is niet verwerkt omdat het niet geldig is. Is uw plugin/web interface up-to-date? +forbidden-message = Verboden +forbidden-console = [WebConsole] {0} probeerde "{1}" uit te voeren zonder ingelogd te zijn! +closed-connection = [WebConsole] Verbinding verbroken en uitgelogd van {0} +error-on-connection = [WebConsole] Er is een fout opgetreden bij het verbinden van {0}: {1} +started-websocket = [WebConsole] De WebSocket Server is succesvol gestart. +error-disconnected-client = [WebConsole] Poging om een bericht te sturen naar een niet-verbonden WebSocket-client. + +# CpuUsageCommand.java +cpu-usage-message = Verbruik is {0}% + +# ExecCommand.java +cmd-executed-console = [WebConsole] {0} voerde "{1}" uit. + +# LogInCommand.java +login-sucessful-message = Ingelogd +login-sucessful-console = [WebConsole] Successvol ingelogd van {0} +login-failed-message = Incorrect wachtwoord, probeer het opnieuw +login-failed-console = [WebConsole] Wachtwoord onjuist bij inloggen vanaf {0} + +# PlayersCommand.java +players-message = {0} spelers verbonden voor een maximum van {1} + +# RamUsageCommand.java +ram-usage-message = {0} ongebruikt, {1} gebruikt, {2} maximaal geheugen + +# WebConsoleCommand.java +webconsole-version = WebConsole versie {0}. +webconsole-no-connections = Er zijn nu geen ingelogde Web Console-verbindingen. +webconsole-active-connections = Verbonden aan WebConsole vanaf: + +# ReadLogFileCommand.java log-read-error = Er is een fout opgetreden bij het lezen van het bestand latest.log \ No newline at end of file diff --git a/phrases_pt.properties b/phrases_pt.properties index 5fd5215..692e55c 100644 --- a/phrases_pt.properties +++ b/phrases_pt.properties @@ -13,6 +13,7 @@ forbidden-console = [WebConsole] {0} tentou executar "{1}" mas não está autên closed-connection = [WebConsole] {0} foi desconectado. error-on-connection = [WebConsole] Houve um erro na conexão de {0}: {1} started-websocket = [WebConsole] WebSocket Server foi iniciado com sucesso. +error-disconnected-client = [WebConsole] Tentativa de enviar uma mensagem para um cliente WebSocket desconectado.. # CpuUsageCommand.java cpu-usage-message = Consumindo {0}% diff --git a/phrases_ru.properties b/phrases_ru.properties index 742535d..31267e5 100644 --- a/phrases_ru.properties +++ b/phrases_ru.properties @@ -13,6 +13,7 @@ forbidden-console = [WebConsole] {0} попытался запустить "{1}" closed-connection = [WebConsole] Соединение закрытое и выход из {0} error-on-connection = [WebConsole] Произошла ошибка при подключении к {0}: {1} started-websocket = [WebConsole] WebSocket Server успешно запущен. +error-disconnected-client = [WebConsole] Попытка отправить сообщение отключенному клиенту WebSocket. # CpuUsageCommand.java cpu-usage-message = Использование {0}% diff --git a/phrases_zh.properties b/phrases_zh.properties index f2db8b8..a66f11f 100644 --- a/phrases_zh.properties +++ b/phrases_zh.properties @@ -13,6 +13,7 @@ forbidden-console = [網站控制台] {0} 嘗試在未登錄的情況下運行 ' closed-connection = [網站控制台] 關閉連接並註銷 {0} error-on-connection = [網站控制台] 連接時出錯 {0}: {1} started-websocket = [網站控制台] 網站控制台 伺服器成功啟動。 +error-disconnected-client = [WebConsole] 尝试向断开连接的WebSocket客户端发送消息。 # CpuUsageCommand.java cpu-usage-message = 已使用 {0}% diff --git a/plugin.yml b/plugin.yml index 459814d..05ea86a 100644 --- a/plugin.yml +++ b/plugin.yml @@ -1,7 +1,7 @@ name: WebConsole main: es.mesacarlos.webconsole.WebConsole api-version: 1.13 -version: 1.5 +version: 1.6 description: WebSockets-based web console author: Carlos Mesa commands: diff --git a/pom.xml b/pom.xml index 220ed40..3354db7 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 WebConsole WebConsole - 1.5 + 1.6 src diff --git a/src/es/mesacarlos/webconsole/WebConsole.java b/src/es/mesacarlos/webconsole/WebConsole.java index b4218e4..1c9b2b2 100644 --- a/src/es/mesacarlos/webconsole/WebConsole.java +++ b/src/es/mesacarlos/webconsole/WebConsole.java @@ -74,7 +74,7 @@ public class WebConsole extends JavaPlugin { config.addDefault("KeyPassword", "keypassword"); // Connection config variables - config.addDefault("host", "localhost"); + config.addDefault("host", "0.0.0.0"); config.addDefault("port", 8080); config.addDefault("password", 1234); diff --git a/src/es/mesacarlos/webconsole/util/Internationalization.java b/src/es/mesacarlos/webconsole/util/Internationalization.java index b6fed31..7e09b37 100644 --- a/src/es/mesacarlos/webconsole/util/Internationalization.java +++ b/src/es/mesacarlos/webconsole/util/Internationalization.java @@ -49,4 +49,19 @@ public class Internationalization { return msg; } + /** + * getPhrase() method expects all params to be ISO-8859-1. + * This method will be used when a UTF-8 String is given and you need to use it as a parameter for the above mentioned function. + * + * @return The same String encoded ISO-8859-1 + */ + public static String utf8ToIso(String msg) { + try { + msg = new String(msg.getBytes("UTF-8"), "ISO-8859-1"); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } + return msg; + } + } \ No newline at end of file diff --git a/src/es/mesacarlos/webconsole/websocket/WSServer.java b/src/es/mesacarlos/webconsole/websocket/WSServer.java index a48e160..1473e37 100644 --- a/src/es/mesacarlos/webconsole/websocket/WSServer.java +++ b/src/es/mesacarlos/webconsole/websocket/WSServer.java @@ -111,7 +111,7 @@ public class WSServer extends WebSocketServer { try { conn.send(content.toJSON()); }catch(WebsocketNotConnectedException e) { - Bukkit.getLogger().warning("Tried to send message to a disconnected client."); + Bukkit.getLogger().warning(Internationalization.getPhrase("error-disconnected-client")); } } diff --git a/src/es/mesacarlos/webconsole/websocket/command/ExecCommand.java b/src/es/mesacarlos/webconsole/websocket/command/ExecCommand.java index ddb3204..98f0725 100644 --- a/src/es/mesacarlos/webconsole/websocket/command/ExecCommand.java +++ b/src/es/mesacarlos/webconsole/websocket/command/ExecCommand.java @@ -14,7 +14,7 @@ public class ExecCommand implements WSCommand { @Override public void execute(WSServer wsServer, WebSocket conn, String command) { - Bukkit.getLogger().info(Internationalization.getPhrase("cmd-executed-console", conn.getRemoteSocketAddress(), command)); + Bukkit.getLogger().info(Internationalization.getPhrase("cmd-executed-console", conn.getRemoteSocketAddress(), Internationalization.utf8ToIso(command))); ConsoleCommandSender sender = Bukkit.getServer().getConsoleSender(); try {