From d3e2d08b8b318500e09d473ec994f22aece7fa0c Mon Sep 17 00:00:00 2001 From: Carlos <28845529+mesacarlos@users.noreply.github.com> Date: Wed, 28 Aug 2019 16:36:10 +0200 Subject: [PATCH] Added chinese and changed encoding to UTF-8 --- phrases_es.properties | 32 ++++++------- phrases_pt.properties | 24 +++++----- phrases_ru.properties | 46 +++++++++---------- phrases_zh.properties | 38 +++++++++++++++ .../webconsole/util/Internationalization.java | 17 +++++++ 5 files changed, 106 insertions(+), 51 deletions(-) create mode 100644 phrases_zh.properties diff --git a/phrases_es.properties b/phrases_es.properties index 84ba5da..d1c74ae 100644 --- a/phrases_es.properties +++ b/phrases_es.properties @@ -1,38 +1,38 @@ # WebConsole.java -boot-error = Ocurri un error al intentar iniciar el servidor WebSocket +boot-error = Ocurrió un error al intentar iniciar el servidor WebSocket # WSServer.java -connection-resumed-message = Conectado. Ya habas iniciado sesin, bienvenido de vuelta! -connection-resumed-console = [WebConsole] Conectado y resumiendo sesin desde {0} -connection-login-message = Conexin iniciada, esperando login. +connection-resumed-message = Conectado. Ya habías iniciado sesión, bienvenido de vuelta! +connection-resumed-console = [WebConsole] Conectado y resumiendo sesión desde {0} +connection-login-message = Conexión iniciada, esperando login. connection-login-console = [WebConsole] Conectado y esperando login desde {0} unknown-command-message = Comando desconocido -unknown-command-console = [WebConsole] La seal "{0}" no se ha procesado porque no es vlida. Tienes la ultima versin del plugin y de la interfaz web? +unknown-command-console = [WebConsole] La señal "{0}" no se ha procesado porque no es válida. ¿Tienes la ultima versión del plugin y de la interfaz web? forbidden-message = Prohibido -forbidden-console = [WebConsole] {0} intento ejecutar "{1}" sin tener una sesin iniciada! -closed-connection = [WebConsole] Sesin cerrada y desconectado desde {0} -error-on-connection = [WebConsole] Ocurri un error en la conexin con {0}: {1} -started-websocket = [WebConsole] Servidor WebSocket iniciado con xito. +forbidden-console = [WebConsole] {0} intento ejecutar "{1}" sin tener una sesión iniciada! +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. # CpuUsageCommand.java cpu-usage-message = En uso {0}% # ExecCommand.java -cmd-executed-console = [WebConsole] {0} ejecut "{1}". +cmd-executed-console = [WebConsole] {0} ejecutó "{1}". #LogInCommand.java -login-sucessful-message = Sesin iniciada -login-sucessful-console = [WebConsole] Sesin iniciada con xito desde {0} -login-failed-message = Contraa incorrecta, intntalo de nuevo -login-failed-console = [WebConsole] Contrasea incorrecta al intentar iniciar sesin desde {0} +login-sucessful-message = Sesión iniciada +login-sucessful-console = [WebConsole] Sesión iniciada con éxito desde {0} +login-failed-message = Contraña incorrecta, inténtalo de nuevo +login-failed-console = [WebConsole] Contraseña incorrecta al intentar iniciar sesión desde {0} # PlayersCommand.java -players-message = Actualmente conectados {0} jugadores de un mximo de {1} +players-message = Actualmente conectados {0} jugadores de un máximo de {1} # RamUsageCommand.java ram-usage-message = Memoria: {0} libre, {1} usada, {2} maxima # WebConsoleCommand.java webconsole-version = WebConsole version {0}. -webconsole-no-connections = No hay ninguna conexin activa a WebConsole en este momento. +webconsole-no-connections = No hay ninguna conexión activa a WebConsole en este momento. webconsole-active-connections = Conectado a WebConsole desde: \ No newline at end of file diff --git a/phrases_pt.properties b/phrases_pt.properties index 80e6735..4f1120e 100644 --- a/phrases_pt.properties +++ b/phrases_pt.properties @@ -1,17 +1,17 @@ # WebConsole.java -boot-error = No foi possvel conectar-se ao WebSocket. +boot-error = Não foi possível conectar-se ao WebSocket. # WSServer.java -connection-resumed-message = Voc foi conectado, seja bem-vindo ! +connection-resumed-message = Você foi conectado, seja bem-vindo! connection-resumed-console = [WebConsole] {0} foi reconectado. -connection-login-message = Voc foi conectado, esperando autnticao -connection-login-console = [WebConsole] {0} foi conectado, aguardando autnticao. +connection-login-message = Você foi conectado, esperando autênticação +connection-login-console = [WebConsole] {0} foi conectado, aguardando autênticação. unknown-command-message = Comando desconhecido. -unknown-command-console = [WebConsole] "{0}" no pode ser executado pos no um comando vlido. Provavel que o plugin ou client esteja desatualizado. +unknown-command-console = [WebConsole] "{0}" não pode ser executado poís não é um comando válido. Provavel que o plugin ou client esteja desatualizado. forbidden-message = Acesso Negado -forbidden-console = [WebConsole] {0} tentou executar "{1}" mas no est autnticado! +forbidden-console = [WebConsole] {0} tentou executar "{1}" mas não está autênticado! closed-connection = [WebConsole] {0} foi desconectado. -error-on-connection = [WebConsole] Houve um erro na conexo de {0}: {1} +error-on-connection = [WebConsole] Houve um erro na conexão de {0}: {1} started-websocket = [WebConsole] WebSocket Server foi iniciado com sucesso. # CpuUsageCommand.java @@ -21,18 +21,18 @@ cpu-usage-message = Consumindo {0}% cmd-executed-console = [WebConsole] {0} executou "{1}". #LogInCommand.java -login-sucessful-message = Voc foi autnticado. +login-sucessful-message = Você foi autênticado. login-sucessful-console = [WebConsole] {0} acabou de se conectar. -login-failed-message = Senha incorreta, porfavor, contate algum responsvel. +login-failed-message = Senha incorreta, porfavor, contate algum responsável. login-failed-console = [WebConsole] {0} tentou conectar-se, mas falhou ao digitar a senha. # PlayersCommand.java players-message = Atualmente tem {0} jogador(es) de um total de {1} # RamUsageCommand.java -ram-usage-message = Disponvel: {0}, Consumo de RAM: {1} / {2} +ram-usage-message = Disponível: {0}, Consumo de RAM: {1} / {2} # WebConsoleCommand.java -webconsole-version = WebConsole verso {0}. -webconsole-no-connections = Atualmente no tem nenhum usurio conectado. +webconsole-version = WebConsole versão {0}. +webconsole-no-connections = Atualmente não tem nenhum usuário conectado. webconsole-active-connections = Atualmente temos: \ No newline at end of file diff --git a/phrases_ru.properties b/phrases_ru.properties index 9b95ab3..63de952 100644 --- a/phrases_ru.properties +++ b/phrases_ru.properties @@ -1,38 +1,38 @@ # WebConsole.java -boot-error = \u041F\u0440\u043E\u0438\u0437\u043E\u0448\u043B\u0430 \u043E\u0448\u0438\u0431\u043A\u0430 \u043F\u0440\u0438 \u0437\u0430\u043F\u0443\u0441\u043A\u0435 WebSocket Server. +boot-error = Произошла ошибка при запуске WebSocket Server. # WSServer.java -connection-resumed-message = \u041F\u043E\u0434\u043A\u043B\u044E\u0447\u0435\u043D\u043E. \u0414\u043E\u0431\u0440\u043E \u043F\u043E\u0436\u0430\u043B\u043E\u0432\u0430\u0442\u044C! -connection-resumed-console = [WebConsole] \u041F\u043E\u0434\u043A\u043B\u044E\u0447\u0435\u043D\u043D\u044B\u0439 \u0438 \u0432\u043E\u0437\u043E\u0431\u043D\u043E\u0432\u043B\u0435\u043D\u043D\u044B\u0439 \u0441\u0435\u0430\u043D\u0441 \u0441 {0} -connection-login-message = \u0421\u043E\u0435\u0434\u0438\u043D\u0435\u043D\u0438\u0435 \u0443\u0441\u0442\u0430\u043D\u043E\u0432\u043B\u0435\u043D\u043E, \u043E\u0436\u0438\u0434\u0430\u043D\u0438\u0435 \u0432\u0445\u043E\u0434\u0430 -connection-login-console = [WebConsole] \u041F\u043E\u0434\u043A\u043B\u044E\u0447\u0435\u043D \u0438 \u0436\u0434\u0435\u0442 \u0432\u0445\u043E\u0434\u0430 \u043E\u0442 {0} -unknown-command-message = \u041D\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043D\u0430\u044F \u043A\u043E\u043C\u0430\u043D\u0434\u0430 -unknown-command-console = [WebConsole] \u0421\u0438\u0433\u043D\u0430\u043B "{0}" \u043D\u0435 \u0431\u044B\u043B \u043E\u0431\u0440\u0430\u0431\u043E\u0442\u0430\u043D, \u043F\u043E\u0441\u043A\u043E\u043B\u044C\u043A\u0443 \u043E\u043D \u043D\u0435\u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043B\u0435\u043D. \u0412\u0430\u0448 \u043F\u043B\u0430\u0433\u0438\u043D / \u0432\u0435\u0431-\u0438\u043D\u0442\u0435\u0440\u0444\u0435\u0439\u0441 \u043E\u0431\u043D\u043E\u0432\u043B\u0435\u043D? -forbidden-message = \u0417\u0430\u043F\u0440\u0435\u0449\u0435\u043D\u043E -forbidden-console = [WebConsole] {0} \u043F\u043E\u043F\u044B\u0442\u0430\u043B\u0441\u044F \u0437\u0430\u043F\u0443\u0441\u0442\u0438\u0442\u044C "{1}", \u043F\u043E\u043A\u0430 \u043D\u0435 \u0432\u043E\u0448\u0435\u043B \u0432 \u0441\u0438\u0441\u0442\u0435\u043C\u0443! -closed-connection = [WebConsole] \u0421\u043E\u0435\u0434\u0438\u043D\u0435\u043D\u0438\u0435 \u0437\u0430\u043A\u0440\u044B\u0442\u043E\u0435 \u0438 \u0432\u044B\u0445\u043E\u0434 \u0438\u0437 {0} -error-on-connection = [WebConsole] \u041F\u0440\u043E\u0438\u0437\u043E\u0448\u043B\u0430 \u043E\u0448\u0438\u0431\u043A\u0430 \u043F\u0440\u0438 \u043F\u043E\u0434\u043A\u043B\u044E\u0447\u0435\u043D\u0438\u0438 \u043A {0}: {1} -started-websocket = [WebConsole] WebSocket Server \u0443\u0441\u043F\u0435\u0448\u043D\u043E \u0437\u0430\u043F\u0443\u0449\u0435\u043D. +connection-resumed-message = Подключено. Добро пожаловать! +connection-resumed-console = [WebConsole] Подключенный и возобновленный сеанс с {0} +connection-login-message = Соединение установлено, ожидание входа +connection-login-console = [WebConsole] Подключен и ждет входа от {0} +unknown-command-message = Неизвестная команда +unknown-command-console = [WebConsole] Сигнал "{0}" не был обработан, поскольку он недействителен. Ваш плагин / веб-интерфейс обновлен? +forbidden-message = Запрещено +forbidden-console = [WebConsole] {0} попытался запустить "{1}", пока не вошел в систему! +closed-connection = [WebConsole] Соединение закрытое и выход из {0} +error-on-connection = [WebConsole] Произошла ошибка при подключении к {0}: {1} +started-websocket = [WebConsole] WebSocket Server успешно запущен. # CpuUsageCommand.java -cpu-usage-message = \u0418\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u043D\u0438\u0435 {0}% +cpu-usage-message = Использование {0}% # ExecCommand.java -cmd-executed-console = [WebConsole] {0} \u0432\u044B\u043F\u043E\u043B\u043D\u0438\u043B "{1}". +cmd-executed-console = [WebConsole] {0} выполнил "{1}". #LogInCommand.java -login-sucessful-message = \u0412\u043E\u0439\u0442\u0438 \u0432 \u0441\u0438\u0441\u0442\u0435\u043C\u0443 -login-sucessful-console = [WebConsole] \u0423\u0441\u043F\u0435\u0448\u043D\u043E \u0432\u043E\u0448\u0435\u043B \u0432 \u0441\u0438\u0441\u0442\u0435\u043C\u0443 \u0441 {0} -login-failed-message = \u041D\u0435\u0432\u0435\u0440\u043D\u044B\u0439 \u043F\u0430\u0440\u043E\u043B\u044C, \u043F\u043E\u043F\u0440\u043E\u0431\u0443\u0439\u0442\u0435 \u0435\u0449\u0435 \u0440\u0430\u0437 -login-failed-console = [WebConsole] \u041D\u0435\u0432\u0435\u0440\u043D\u044B\u0439 \u043F\u0430\u0440\u043E\u043B\u044C \u043F\u0440\u0438 \u0432\u0445\u043E\u0434\u0435 \u0441 {0} +login-sucessful-message = Войти в систему +login-sucessful-console = [WebConsole] Успешно вошел в систему с {0} +login-failed-message = Неверный пароль, попробуйте еще раз +login-failed-console = [WebConsole] Неверный пароль при входе с {0} # PlayersCommand.java -players-message = \u041F\u043E\u0434\u043A\u043B\u044E\u0447\u0435\u043D\u043E {0} \u0438\u0433\u0440\u043E\u043A\u043E\u0432 \u0438\u0437 \u043C\u0430\u043A\u0441\u0438\u043C\u0443\u043C {1} +players-message = Подключено {0} игроков из максимум {1} # RamUsageCommand.java -ram-usage-message = {0} \u0441\u0432\u043E\u0431\u043E\u0434\u043D\u043E, {1} \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u0435\u0442\u0441\u044F, {2} \u043C\u0430\u043A\u0441. \u043F\u0430\u043C\u044F\u0442\u0438 +ram-usage-message = {0} свободно, {1} используется, {2} макс. памяти # WebConsoleCommand.java -webconsole-version = \u0412\u0435\u0440\u0441\u0438\u044F WebConsole {0}. -webconsole-no-connections = \u0412 \u043D\u0430\u0441\u0442\u043E\u044F\u0449\u0435\u0435 \u0432\u0440\u0435\u043C\u044F \u043D\u0435\u0442 \u043F\u043E\u0434\u043A\u043B\u044E\u0447\u0435\u043D\u0438\u0439 \u043A WebConsole. -webconsole-active-connections = \u041F\u043E\u0434\u043A\u043B\u044E\u0447\u0435\u043D \u043A \u0432\u0435\u0431-\u043A\u043E\u043D\u0441\u043E\u043B\u0438 \u0438\u0437 : \ No newline at end of file +webconsole-version = Версия WebConsole {0}. +webconsole-no-connections = В настоящее время нет подключений к WebConsole. +webconsole-active-connections = Подключен к веб-консоли из : \ No newline at end of file diff --git a/phrases_zh.properties b/phrases_zh.properties new file mode 100644 index 0000000..9ec0480 --- /dev/null +++ b/phrases_zh.properties @@ -0,0 +1,38 @@ +# WebConsole.java +boot-error = 啟動WebSocket服務器時出錯。 + +# WSServer.java +connection-resumed-message = 已經登錄，歡迎回來！ +connection-resumed-console = [網站控制台] 重新恢復連接 {0} +connection-login-message = 連接開始，等待登錄 +connection-login-console = [網站控制台] 已連接並等待登錄 {0} +unknown-command-message = 未知的命令 +unknown-command-console = [網站控制台] 信號 '{0}' 未被處理，因為是無效的。 您的插件/網頁界面是最新的嗎？ +forbidden-message = 被禁止 +forbidden-console = [網站控制台] {0} 嘗試在未登錄的情況下運行 '{1}' ! +closed-connection = [網站控制台] 關閉連接並註銷 {0} +error-on-connection = [網站控制台] 連接時出錯 {0}: {1} +started-websocket = [網站控制台] 網站控制台 伺服器成功啟動。 + +# CpuUsageCommand.java +cpu-usage-message = 已使用 {0}% + +# ExecCommand.java +cmd-executed-console = [網站控制台] {0} 執行 '{1}'. + +#LogInCommand.java +login-sucessful-message = 登錄 +login-sucessful-console = [網站控制台] 成功登錄 {0} +login-failed-message = 密碼不正確，請重試 +login-failed-console = [網站控制台] 登錄時密碼不正確 {0} + +# PlayersCommand.java +players-message = {0}玩家連接，最多{1} + +# RamUsageCommand.java +ram-usage-message = 空閒{0} , 已使用{1} , 最大內存{2} + +# WebConsoleCommand.java +webconsole-version = 網站控制台版本 {0}. +webconsole-no-connections = 現在沒有連接登錄網站控制台。 +webconsole-active-connections = 從以下位置連接到網站控制台： \ No newline at end of file diff --git a/src/com/mesacarlos/webconsole/util/Internationalization.java b/src/com/mesacarlos/webconsole/util/Internationalization.java index 3afd79c..9bb5757 100644 --- a/src/com/mesacarlos/webconsole/util/Internationalization.java +++ b/src/com/mesacarlos/webconsole/util/Internationalization.java @@ -1,5 +1,6 @@ package com.mesacarlos.webconsole.util; +import java.io.UnsupportedEncodingException; import java.text.MessageFormat; import java.util.Locale; import java.util.ResourceBundle; @@ -30,6 +31,22 @@ public class Internationalization { public static String getPhrase(String phrase, Object... params) { String msg = messages.getString(phrase); msg = MessageFormat.format(msg, params); + msg = correctEncoding(msg); return msg; } + + /** + * Java i18n uses ISO-8859-1 internally, so we need to correct all characters to UTF-8 + * @param msg Message to correct + * @return Message corrected + */ + private static String correctEncoding(String msg) { + try { + msg = new String(msg.getBytes("ISO-8859-1"), "UTF-8"); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } + return msg; + } + } \ No newline at end of file